From bde5d6253a5aa4b5bd33e3743cb81428b8a13a4e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 26 Apr 2017 17:05:23 -0500 Subject: [PATCH 001/131] Unorphans the blackbox --- code/controllers/admin.dm | 4 +- .../subsystem/blackbox.dm} | 0 code/controllers/subsystem/blackbox.dm.rej | 512 ++++++++++++++++++ code/controllers/subsystem/job.dm | 2 +- code/controllers/subsystem/mapping.dm | 2 +- code/controllers/subsystem/ping.dm | 16 +- code/controllers/subsystem/server_maint.dm | 39 +- .../controllers/subsystem/server_maint.dm.rej | 7 + code/datums/helper_datums/getrev.dm | 2 +- code/game/gamemodes/blob/blob_finish.dm | 6 +- code/game/gamemodes/changeling/changeling.dm | 8 +- .../gamemodes/changeling/changeling_power.dm | 4 +- .../gamemodes/changeling/evolution_menu.dm | 2 +- .../gamemodes/changeling/powers/absorb.dm | 4 +- .../gamemodes/changeling/powers/linglink.dm | 2 +- code/game/gamemodes/clock_cult/clock_cult.dm | 6 +- .../gamemodes/clock_cult/clock_scripture.dm | 2 +- code/game/gamemodes/cult/cult.dm | 22 +- code/game/gamemodes/cult/ritual.dm | 2 +- code/game/gamemodes/game_mode.dm | 12 +- code/game/gamemodes/game_mode.dm.rej | 18 + code/game/gamemodes/gang/gang.dm | 4 +- code/game/gamemodes/meteor/meteor.dm | 4 +- .../gamemodes/miniantags/monkey/monkey.dm | 8 +- code/game/gamemodes/nuclear/nuclear.dm | 20 +- .../gamemodes/nuclear/nuclear_challenge.dm | 2 +- code/game/gamemodes/revolution/revolution.dm | 4 +- code/game/gamemodes/traitor/traitor.dm | 8 +- code/game/gamemodes/wizard/raginmages.dm | 2 +- code/game/gamemodes/wizard/spellbook.dm | 14 +- code/game/gamemodes/wizard/wizard.dm | 10 +- code/game/machinery/computer/arcade.dm | 12 +- .../game/machinery/computer/communications.dm | 10 +- code/game/machinery/newscaster.dm | 6 +- .../machinery/telecomms/broadcasting.dm.rej | 33 ++ code/game/machinery/vending.dm.rej | 10 + code/game/mecha/mecha_construction_paths.dm | 14 +- code/game/objects/items/robot/robot_parts.dm | 4 +- .../objects/items/weapons/handcuffs.dm.rej | 31 ++ .../objects/items/weapons/holy_weapons.dm | 2 +- .../objects/items/weapons/storage/book.dm | 2 +- code/game/objects/structures/ai_core.dm | 2 +- .../turfs/simulated/floor/plating/asteroid.dm | 2 +- code/game/turfs/simulated/minerals.dm.rej | 19 + code/modules/admin/NewBan.dm | 2 +- code/modules/admin/admin.dm | 34 +- code/modules/admin/admin.dm.rej | 10 + code/modules/admin/admin_verbs.dm | 40 +- code/modules/admin/secrets.dm.rej | 291 ++++++++++ code/modules/admin/topic.dm | 28 +- code/modules/admin/topic.dm.rej | 10 + code/modules/admin/verbs/adminhelp.dm.rej | 10 + code/modules/admin/verbs/adminjump.dm | 12 +- code/modules/admin/verbs/adminjump.dm.rej | 16 + code/modules/admin/verbs/adminpm.dm | 4 +- code/modules/admin/verbs/adminsay.dm | 2 +- code/modules/admin/verbs/atmosdebug.dm | 4 +- code/modules/admin/verbs/deadsay.dm | 2 +- code/modules/admin/verbs/debug.dm | 24 +- code/modules/admin/verbs/debug.dm.rej | 28 + code/modules/admin/verbs/diagnostics.dm | 8 +- code/modules/admin/verbs/fps.dm | 2 +- code/modules/admin/verbs/getlogs.dm | 4 +- code/modules/admin/verbs/machine_upgrade.dm | 2 +- code/modules/admin/verbs/mapping.dm | 16 +- code/modules/admin/verbs/massmodvar.dm | 2 +- code/modules/admin/verbs/panicbunker.dm.rej | 8 + code/modules/admin/verbs/playsound.dm | 8 +- code/modules/admin/verbs/possess.dm | 6 +- code/modules/admin/verbs/pray.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 54 +- code/modules/admin/verbs/randomverbs.dm.rej | 46 ++ .../verbs/reestablish_db_connection.dm.rej | 15 + code/modules/assembly/holder.dm | 2 +- code/modules/cargo/exports.dm | 4 +- code/modules/client/preferences_toggles.dm | 50 +- code/modules/client/verbs/ooc.dm | 2 +- code/modules/crafting/craft.dm | 2 +- code/modules/events/_event.dm.rej | 17 + code/modules/food_and_drinks/food/snacks.dm | 4 +- .../kitchen_machinery/processor.dm | 2 +- code/modules/hydroponics/seeds.dm | 2 +- .../jobs/job_types/civilian_chaplain.dm | 4 +- code/modules/mining/aux_base.dm | 2 +- code/modules/mining/equipment.dm | 2 +- code/modules/mining/equipment.dm.rej | 26 + .../mining/lavaland/necropolis_chests.dm | 2 +- .../mining/lavaland/necropolis_chests.dm.rej | 28 + code/modules/mining/machine_vending.dm | 4 +- code/modules/mob/living/brain/MMI.dm | 2 +- code/modules/mob/living/carbon/human/death.dm | 2 +- .../mob/living/carbon/human/human_defense.dm | 4 +- .../modules/mob/living/silicon/robot/death.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../hostile/megafauna/megafauna.dm | 2 +- .../simple_animal/hostile/mining_mobs.dm | 12 +- .../mob/living/simple_animal/slime/powers.dm | 2 +- code/modules/power/cell.dm | 2 +- code/modules/power/singularity/generator.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- code/modules/projectiles/guns/medbeam.dm | 2 +- code/modules/reagents/chemistry/holder.dm | 2 +- .../chemistry/recipes/slime_extracts.dm.rej | 442 +++++++++++++++ code/modules/recycling/disposal-unit.dm | 2 +- code/modules/research/rdconsole.dm | 8 +- .../security_levels/keycard_authentication.dm | 4 +- code/modules/shuttle/arrivals.dm | 2 +- code/modules/shuttle/emergency.dm | 2 +- code/modules/shuttle/manipulator.dm | 4 +- code/modules/shuttle/shuttle.dm | 4 +- code/modules/shuttle/supply.dm | 2 +- code/modules/surgery/surgery.dm | 2 +- code/modules/uplink/uplink_item.dm.rej | 17 + code/world.dm.rej | 19 + tgstation.dme | 1 - tgstation.dme.rej | 17 + 116 files changed, 1980 insertions(+), 322 deletions(-) rename code/{orphaned_procs/statistics.dm => controllers/subsystem/blackbox.dm} (100%) create mode 100644 code/controllers/subsystem/blackbox.dm.rej create mode 100644 code/controllers/subsystem/server_maint.dm.rej create mode 100644 code/game/gamemodes/game_mode.dm.rej create mode 100644 code/game/machinery/telecomms/broadcasting.dm.rej create mode 100644 code/game/machinery/vending.dm.rej create mode 100644 code/game/objects/items/weapons/handcuffs.dm.rej create mode 100644 code/game/turfs/simulated/minerals.dm.rej create mode 100644 code/modules/admin/admin.dm.rej create mode 100644 code/modules/admin/secrets.dm.rej create mode 100644 code/modules/admin/topic.dm.rej create mode 100644 code/modules/admin/verbs/adminhelp.dm.rej create mode 100644 code/modules/admin/verbs/adminjump.dm.rej create mode 100644 code/modules/admin/verbs/debug.dm.rej create mode 100644 code/modules/admin/verbs/panicbunker.dm.rej create mode 100644 code/modules/admin/verbs/randomverbs.dm.rej create mode 100644 code/modules/admin/verbs/reestablish_db_connection.dm.rej create mode 100644 code/modules/events/_event.dm.rej create mode 100644 code/modules/mining/equipment.dm.rej create mode 100644 code/modules/mining/lavaland/necropolis_chests.dm.rej create mode 100644 code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej create mode 100644 code/modules/uplink/uplink_item.dm.rej create mode 100644 code/world.dm.rej create mode 100644 tgstation.dme.rej diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm index 99f6a148a4..06aa66fd33 100644 --- a/code/controllers/admin.dm +++ b/code/controllers/admin.dm @@ -43,9 +43,9 @@ switch(controller) if("Master") Recreate_MC() - feedback_add_details("admin_verb","Restart Master Controller") + SSblackbox.add_details("admin_verb","Restart Master Controller") if("Failsafe") new /datum/controller/failsafe() - feedback_add_details("admin_verb","Restart Failsafe Controller") + SSblackbox.add_details("admin_verb","Restart Failsafe Controller") message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.") diff --git a/code/orphaned_procs/statistics.dm b/code/controllers/subsystem/blackbox.dm similarity index 100% rename from code/orphaned_procs/statistics.dm rename to code/controllers/subsystem/blackbox.dm diff --git a/code/controllers/subsystem/blackbox.dm.rej b/code/controllers/subsystem/blackbox.dm.rej new file mode 100644 index 0000000000..79c407851f --- /dev/null +++ b/code/controllers/subsystem/blackbox.dm.rej @@ -0,0 +1,512 @@ +diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm (rejected hunks) +@@ -1,253 +1,257 @@ +-GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new) +- +-//the feedback datum; stores all feedback +-/datum/feedback +- var/list/messages = list() +- var/list/messages_admin = list() +- +- var/list/msg_common = list() +- var/list/msg_science = list() +- var/list/msg_command = list() +- var/list/msg_medical = list() +- var/list/msg_engineering = list() +- var/list/msg_security = list() +- var/list/msg_deathsquad = list() +- var/list/msg_syndicate = list() +- var/list/msg_service = list() +- var/list/msg_cargo = list() +- +- var/list/datum/feedback_variable/feedback = new() +- +-/datum/feedback/proc/find_feedback_datum(variable) +- for (var/datum/feedback_variable/FV in feedback) +- if (FV.get_variable() == variable) +- return FV +- var/datum/feedback_variable/FV = new(variable) +- feedback += FV +- return FV +- +-/datum/feedback/proc/get_round_feedback() +- return feedback +- +-/datum/feedback/proc/round_end_data_gathering() +- var/pda_msg_amt = 0 +- var/rc_msg_amt = 0 +- +- for (var/obj/machinery/message_server/MS in GLOB.message_servers) +- if (MS.pda_msgs.len > pda_msg_amt) +- pda_msg_amt = MS.pda_msgs.len +- if (MS.rc_msgs.len > rc_msg_amt) +- rc_msg_amt = MS.rc_msgs.len +- +- feedback_set_details("radio_usage","") +- +- feedback_add_details("radio_usage","COM-[msg_common.len]") +- feedback_add_details("radio_usage","SCI-[msg_science.len]") +- feedback_add_details("radio_usage","HEA-[msg_command.len]") +- feedback_add_details("radio_usage","MED-[msg_medical.len]") +- feedback_add_details("radio_usage","ENG-[msg_engineering.len]") +- feedback_add_details("radio_usage","SEC-[msg_security.len]") +- feedback_add_details("radio_usage","DTH-[msg_deathsquad.len]") +- feedback_add_details("radio_usage","SYN-[msg_syndicate.len]") +- feedback_add_details("radio_usage","SRV-[msg_service.len]") +- feedback_add_details("radio_usage","CAR-[msg_cargo.len]") +- feedback_add_details("radio_usage","OTH-[messages.len]") +- feedback_add_details("radio_usage","PDA-[pda_msg_amt]") +- feedback_add_details("radio_usage","RC-[rc_msg_amt]") +- +- feedback_set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set. +- +-//This proc is only to be called at round end. +-/datum/feedback/proc/save_all_data_to_sql() +- if (!feedback) return +- +- round_end_data_gathering() //round_end time logging and some other data processing +- if (!GLOB.dbcon.Connect()) return +- var/round_id +- +- var/DBQuery/query_feedback_max_id = GLOB.dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]") +- if(!query_feedback_max_id.Execute()) +- return +- while (query_feedback_max_id.NextRow()) +- round_id = query_feedback_max_id.item[1] +- +- if (!isnum(round_id)) +- round_id = text2num(round_id) +- round_id++ +- +- var/sqlrowlist = "" +- +- for (var/datum/feedback_variable/FV in feedback) +- if (sqlrowlist != "") +- sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error +- +- sqlrowlist += "(null, Now(), [round_id], \"[sanitizeSQL(FV.get_variable())]\", [FV.get_value()], \"[sanitizeSQL(FV.get_details())]\")" +- +- if (sqlrowlist == "") +- return +- +- var/DBQuery/query_feedback_save = GLOB.dbcon.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist) +- query_feedback_save.Execute() +- +- +-/proc/feedback_set(variable,value) +- if(!GLOB.blackbox) +- return +- +- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) +- +- if(!FV) +- return +- +- FV.set_value(value) +- +-/proc/feedback_inc(variable,value) +- if(!GLOB.blackbox) +- return +- +- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) +- +- if(!FV) +- return +- +- FV.inc(value) +- +-/proc/feedback_dec(variable,value) +- if(!GLOB.blackbox) +- return +- +- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) +- +- if(!FV) +- return +- +- FV.dec(value) +- +-/proc/feedback_set_details(variable,details) +- if(!GLOB.blackbox) +- return +- +- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) +- +- if(!FV) +- return +- +- FV.set_details(details) +- +-/proc/feedback_add_details(variable,details) +- if(!GLOB.blackbox) +- return +- +- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) +- +- if(!FV) +- return +- +- FV.add_details(details) +- +-//feedback variable datum, for storing all kinds of data +-/datum/feedback_variable +- var/variable +- var/value +- var/details +- +-/datum/feedback_variable/New(var/param_variable,var/param_value = 0) +- variable = param_variable +- value = param_value +- +-/datum/feedback_variable/proc/inc(num = 1) +- if (isnum(value)) +- value += num +- else +- value = text2num(value) +- if (isnum(value)) +- value += num +- else +- value = num +- +-/datum/feedback_variable/proc/dec(num = 1) +- if (isnum(value)) +- value -= num +- else +- value = text2num(value) +- if (isnum(value)) +- value -= num +- else +- value = -num +- +-/datum/feedback_variable/proc/set_value(num) +- if (isnum(num)) +- value = num +- +-/datum/feedback_variable/proc/get_value() +- if (!isnum(value)) +- return 0 +- return value +- +-/datum/feedback_variable/proc/get_variable() +- return variable +- +-/datum/feedback_variable/proc/set_details(text) +- if (istext(text)) +- details = text +- +-/datum/feedback_variable/proc/add_details(text) +- if (istext(text)) +- text = replacetext(text, " ", "_") +- if (!details) +- details = text +- else +- details += " [text]" +- +-/datum/feedback_variable/proc/get_details() +- return details +- +-/datum/feedback_variable/proc/get_parsed() +- return list(variable,value,details) +- +-//sql reporting procs +-/proc/sql_poll_population() +- if(!config.sql_enabled) +- return +- if(!GLOB.dbcon.Connect()) +- return +- var/playercount = 0 +- for(var/mob/M in GLOB.player_list) +- if(M.client) +- playercount += 1 +- var/admincount = GLOB.admins.len +- var/DBQuery/query_record_playercount = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')") +- query_record_playercount.Execute() +- +-/proc/sql_report_death(mob/living/L) +- if(!config.sql_enabled) +- return +- if(!GLOB.dbcon.Connect()) +- return +- if(!L || !L.key || !L.mind) +- return +- var/turf/T = get_turf(L) +- var/area/placeofdeath = get_area(T.loc) +- var/sqlname = sanitizeSQL(L.real_name) +- var/sqlkey = sanitizeSQL(L.ckey) +- var/sqljob = sanitizeSQL(L.mind.assigned_role) +- var/sqlspecial = sanitizeSQL(L.mind.special_role) +- var/sqlpod = sanitizeSQL(placeofdeath.name) +- var/laname +- var/lakey +- if(L.lastattacker && ismob(L.lastattacker)) +- var/mob/LA = L.lastattacker +- laname = sanitizeSQL(LA.real_name) +- lakey = sanitizeSQL(LA.key) +- var/sqlgender = sanitizeSQL(L.gender) +- var/sqlbrute = sanitizeSQL(L.getBruteLoss()) +- var/sqlfire = sanitizeSQL(L.getFireLoss()) +- var/sqlbrain = sanitizeSQL(L.getBrainLoss()) +- var/sqloxy = sanitizeSQL(L.getOxyLoss()) +- var/sqltox = sanitizeSQL(L.getStaminaLoss()) +- var/sqlclone = sanitizeSQL(L.getStaminaLoss()) +- var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) +- var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") +- var/map = sanitizeSQL(SSmapping.config.map_name) +- var/DBQuery/query_report_death = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')") +- query_report_death.Execute() ++SUBSYSTEM_DEF(blackbox) ++ name = "Blackbox" ++ wait = 6000 ++ flags = SS_NO_TICK_CHECK ++ ++ var/list/msg_common = list() ++ var/list/msg_science = list() ++ var/list/msg_command = list() ++ var/list/msg_medical = list() ++ var/list/msg_engineering = list() ++ var/list/msg_security = list() ++ var/list/msg_deathsquad = list() ++ var/list/msg_syndicate = list() ++ var/list/msg_service = list() ++ var/list/msg_cargo = list() ++ var/list/msg_other = list() ++ ++ var/list/feedback = list() //list of datum/feedback_variable ++ ++//poll population ++/datum/controller/subsystem/blackbox/fire() ++ if(!GLOB.dbcon.Connect()) ++ return ++ var/playercount = 0 ++ for(var/mob/M in GLOB.player_list) ++ if(M.client) ++ playercount += 1 ++ var/admincount = GLOB.admins.len ++ var/DBQuery/query_record_playercount = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')") ++ query_record_playercount.Execute() ++ ++/datum/controller/subsystem/blackbox/Recover() ++ msg_common = SSblackbox.msg_common ++ msg_science = SSblackbox.msg_science ++ msg_command = SSblackbox.msg_command ++ msg_medical = SSblackbox.msg_medical ++ msg_engineering = SSblackbox.msg_engineering ++ msg_security = SSblackbox.msg_security ++ msg_deathsquad = SSblackbox.msg_deathsquad ++ msg_syndicate = SSblackbox.msg_syndicate ++ msg_service = SSblackbox.msg_service ++ msg_cargo = SSblackbox.msg_cargo ++ msg_other = SSblackbox.msg_other ++ ++ feedback = SSblackbox.feedback ++ ++//no touchie ++/datum/controller/subsystem/blackbox/can_vv_get(var_name) ++ if(var_name == "feedback") ++ return FALSE ++ return ..() ++ ++/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value) ++ return FALSE ++ ++/datum/controller/subsystem/blackbox/Shutdown() ++ var/pda_msg_amt = 0 ++ var/rc_msg_amt = 0 ++ ++ for (var/obj/machinery/message_server/MS in GLOB.message_servers) ++ if (MS.pda_msgs.len > pda_msg_amt) ++ pda_msg_amt = MS.pda_msgs.len ++ if (MS.rc_msgs.len > rc_msg_amt) ++ rc_msg_amt = MS.rc_msgs.len ++ ++ set_details("radio_usage","") ++ ++ add_details("radio_usage","COM-[msg_common.len]") ++ add_details("radio_usage","SCI-[msg_science.len]") ++ add_details("radio_usage","HEA-[msg_command.len]") ++ add_details("radio_usage","MED-[msg_medical.len]") ++ add_details("radio_usage","ENG-[msg_engineering.len]") ++ add_details("radio_usage","SEC-[msg_security.len]") ++ add_details("radio_usage","DTH-[msg_deathsquad.len]") ++ add_details("radio_usage","SYN-[msg_syndicate.len]") ++ add_details("radio_usage","SRV-[msg_service.len]") ++ add_details("radio_usage","CAR-[msg_cargo.len]") ++ add_details("radio_usage","OTH-[msg_other.len]") ++ add_details("radio_usage","PDA-[pda_msg_amt]") ++ add_details("radio_usage","RC-[rc_msg_amt]") ++ ++ set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set. ++ ++ if (!GLOB.dbcon.Connect()) ++ return ++ ++ var/round_id ++ ++ var/DBQuery/query_feedback_max_id = GLOB.dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]") ++ if(!query_feedback_max_id.Execute()) ++ return ++ while (query_feedback_max_id.NextRow()) ++ round_id = query_feedback_max_id.item[1] ++ ++ if (!isnum(round_id)) ++ round_id = text2num(round_id) ++ round_id++ ++ ++ var/sqlrowlist = "" ++ ++ for (var/datum/feedback_variable/FV in feedback) ++ if (sqlrowlist != "") ++ sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error ++ ++ sqlrowlist += "(null, Now(), [round_id], \"[sanitizeSQL(FV.get_variable())]\", [FV.get_value()], \"[sanitizeSQL(FV.get_details())]\")" ++ ++ if (sqlrowlist == "") ++ return ++ ++ var/DBQuery/query_feedback_save = GLOB.dbcon.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist) ++ query_feedback_save.Execute() ++ ++/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq) ++ switch(freq) ++ if(1459) ++ msg_common += blackbox_msg ++ if(1351) ++ msg_science += blackbox_msg ++ if(1353) ++ msg_command += blackbox_msg ++ if(1355) ++ msg_medical += blackbox_msg ++ if(1357) ++ msg_engineering += blackbox_msg ++ if(1359) ++ msg_security += blackbox_msg ++ if(1441) ++ msg_deathsquad += blackbox_msg ++ if(1213) ++ msg_syndicate += blackbox_msg ++ if(1349) ++ msg_service += blackbox_msg ++ if(1347) ++ msg_cargo += blackbox_msg ++ else ++ msg_other += blackbox_msg ++ ++/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable) ++ for(var/datum/feedback_variable/FV in feedback) ++ if(FV.get_variable() == variable) ++ return FV ++ ++ var/datum/feedback_variable/FV = new(variable) ++ feedback += FV ++ return FV ++ ++/datum/controller/subsystem/blackbox/proc/set_val(variable, value) ++ var/datum/feedback_variable/FV = find_feedback_datum(variable) ++ FV.set_value(value) ++ ++/datum/controller/subsystem/blackbox/proc/inc(variable, value) ++ var/datum/feedback_variable/FV = find_feedback_datum(variable) ++ FV.inc(value) ++ ++/datum/controller/subsystem/blackbox/proc/dec(variable,value) ++ var/datum/feedback_variable/FV = find_feedback_datum(variable) ++ FV.dec(value) ++ ++/datum/controller/subsystem/blackbox/proc/set_details(variable,details) ++ var/datum/feedback_variable/FV = find_feedback_datum(variable) ++ FV.set_details(details) ++ ++/datum/controller/subsystem/blackbox/proc/add_details(variable,details) ++ var/datum/feedback_variable/FV = find_feedback_datum(variable) ++ FV.add_details(details) ++ ++/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L) ++ if(!GLOB.dbcon.Connect()) ++ return ++ if(!L || !L.key || !L.mind) ++ return ++ var/turf/T = get_turf(L) ++ var/area/placeofdeath = get_area(T.loc) ++ var/sqlname = sanitizeSQL(L.real_name) ++ var/sqlkey = sanitizeSQL(L.ckey) ++ var/sqljob = sanitizeSQL(L.mind.assigned_role) ++ var/sqlspecial = sanitizeSQL(L.mind.special_role) ++ var/sqlpod = sanitizeSQL(placeofdeath.name) ++ var/laname ++ var/lakey ++ if(L.lastattacker && ismob(L.lastattacker)) ++ var/mob/LA = L.lastattacker ++ laname = sanitizeSQL(LA.real_name) ++ lakey = sanitizeSQL(LA.key) ++ var/sqlgender = sanitizeSQL(L.gender) ++ var/sqlbrute = sanitizeSQL(L.getBruteLoss()) ++ var/sqlfire = sanitizeSQL(L.getFireLoss()) ++ var/sqlbrain = sanitizeSQL(L.getBrainLoss()) ++ var/sqloxy = sanitizeSQL(L.getOxyLoss()) ++ var/sqltox = sanitizeSQL(L.getStaminaLoss()) ++ var/sqlclone = sanitizeSQL(L.getStaminaLoss()) ++ var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) ++ var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") ++ var/map = sanitizeSQL(SSmapping.config.map_name) ++ var/DBQuery/query_report_death = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')") ++ query_report_death.Execute() ++ ++ ++//feedback variable datum, for storing all kinds of data ++/datum/feedback_variable ++ var/variable ++ var/value ++ var/details ++ ++/datum/feedback_variable/New(param_variable, param_value = 0) ++ variable = param_variable ++ value = param_value ++ ++/datum/feedback_variable/proc/inc(num = 1) ++ if (isnum(value)) ++ value += num ++ else ++ value = text2num(value) ++ if (isnum(value)) ++ value += num ++ else ++ value = num ++ ++/datum/feedback_variable/proc/dec(num = 1) ++ if (isnum(value)) ++ value -= num ++ else ++ value = text2num(value) ++ if (isnum(value)) ++ value -= num ++ else ++ value = -num ++ ++/datum/feedback_variable/proc/set_value(num) ++ if (isnum(num)) ++ value = num ++ ++/datum/feedback_variable/proc/get_value() ++ if (!isnum(value)) ++ return 0 ++ return value ++ ++/datum/feedback_variable/proc/get_variable() ++ return variable ++ ++/datum/feedback_variable/proc/set_details(text) ++ if (istext(text)) ++ details = text ++ ++/datum/feedback_variable/proc/add_details(text) ++ if (istext(text)) ++ text = replacetext(text, " ", "_") ++ if (!details) ++ details = text ++ else ++ details += " [text]" ++ ++/datum/feedback_variable/proc/get_details() ++ return details ++ ++/datum/feedback_variable/proc/get_parsed() ++ return list(variable,value,details) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 137bd2a2c1..a3255b73e4 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -483,7 +483,7 @@ SUBSYSTEM_DEF(job) else level4++ //not selected tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|-" - feedback_add_details("job_preferences",tmp_str) + SSblackbox.add_details("job_preferences",tmp_str) /datum/controller/subsystem/job/proc/PopcapReached() if(config.hard_popcap || config.extreme_popcap) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 1499bc5029..d73d417f5f 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -116,7 +116,7 @@ SUBSYSTEM_DEF(mapping) INIT_ANNOUNCE("Loading [config.map_name]...") TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION) INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!") - feedback_add_details("map_name", config.map_name) + SSblackbox.add_details("map_name", config.map_name) if(config.minetype != "lavaland") INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!") diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm index 0829766174..a6b444c4e7 100644 --- a/code/controllers/subsystem/ping.dm +++ b/code/controllers/subsystem/ping.dm @@ -3,14 +3,20 @@ SUBSYSTEM_DEF(ping) name = "Ping" wait = 6 - flags = SS_NO_INIT|SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY + flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY priority = 10 var/list/currentrun +/datum/controller/subsystem/ping/Initialize() + if (config.hub) + world.visibility = 1 + ..() + /datum/controller/subsystem/ping/fire(resumed = FALSE) if (!resumed) src.currentrun = GLOB.clients.Copy() + var/round_started = Master.round_started var/list/currentrun = src.currentrun while (length(currentrun)) var/client/C = currentrun[currentrun.len] @@ -19,7 +25,15 @@ SUBSYSTEM_DEF(ping) if (MC_TICK_CHECK) return continue + + if(round_started && C.is_afk(INACTIVITY_KICK)) + if(!istype(C.mob, /mob/dead)) + log_access("AFK: [key_name(C)]") + to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.") + qdel(C) + winset(C, null, "command=.update_ping+[world.time+world.tick_lag*world.tick_usage/100]") + if (MC_TICK_CHECK) //one day, when ss13 has 1000 people per server, you guys are gonna be glad I added this tick check return diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index 3ef088b328..9c730e92b1 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -1,23 +1,38 @@ +#define PING_BUFFER_TIME 25 + SUBSYSTEM_DEF(server_maint) name = "Server Tasks" - wait = 6000 - flags = SS_NO_TICK_CHECK + wait = 6 + flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY + priority = 10 + var/list/currentrun /datum/controller/subsystem/server_maint/Initialize(timeofday) if (config.hub) world.visibility = 1 ..() -/datum/controller/subsystem/server_maint/fire() - //handle kicking inactive players - if(config.kick_inactive) - for(var/client/C in GLOB.clients) - if(C.is_afk(config.afk_period)) - var/cmob = C.mob - if(!(istype(cmob, /mob/dead/observer) || (istype(cmob, /mob/dead) && C.holder))) +/datum/controller/subsystem/server_maint/fire(resumed = FALSE) + if (!resumed) + src.currentrun = GLOB.clients.Copy() + + var/round_started = Master.round_started + var/list/currentrun = src.currentrun + while (length(currentrun)) + var/client/C = currentrun[currentrun.len] + currentrun.len-- + + if(config.kick_inactive) + if(round_started && C.is_afk(INACTIVITY_KICK)) + if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") - to_chat(C, "You have been inactive for more than [config.afk_period / 600] minutes and have been disconnected.") + to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.") qdel(C) - if(config.sql_enabled) - sql_poll_population() + if (!(!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1))) + winset(C, null, "command=.update_ping+[world.time+world.tick_lag*world.tick_usage/100]") + + if (MC_TICK_CHECK) //one day, when ss13 has 1000 people per server, you guys are gonna be glad I added this tick check + return + +#undef PING_BUFFER_TIME diff --git a/code/controllers/subsystem/server_maint.dm.rej b/code/controllers/subsystem/server_maint.dm.rej new file mode 100644 index 0000000000..f759db5330 --- /dev/null +++ b/code/controllers/subsystem/server_maint.dm.rej @@ -0,0 +1,7 @@ +diff a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm (rejected hunks) +@@ -18,5 +18,3 @@ SUBSYSTEM_DEF(server_maint) + to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.") + qdel(C) + +- if(config.sql_enabled) +- sql_poll_population() diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index f1b5d3a973..526f64cee7 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -25,7 +25,7 @@ for(var/line in testmerge) if(line) log_world("Test merge active of PR #[line]") - feedback_add_details("testmerged_prs","[line]") + SSblackbox.add_details("testmerged_prs","[line]") log_world("Based off master commit [parentcommit]") else log_world(parentcommit) diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index a5fc5e339a..47e2ce6a14 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -20,7 +20,7 @@ if(round_converted) //So badmin blobs later don't step on the dead natural blobs metaphorical toes ..() if(blobwincount <= GLOB.blobs_legit.len) - feedback_set_details("round_end_result","win - blob took over") + SSblackbox.set_details("round_end_result","win - blob took over") to_chat(world, "The blob has taken over the station!") to_chat(world, "The entire station was eaten by the Blob!") log_game("Blob mode completed with a blob victory.") @@ -28,7 +28,7 @@ SSticker.news_report = BLOB_WIN else if(station_was_nuked) - feedback_set_details("round_end_result","halfwin - nuke") + SSblackbox.set_details("round_end_result","halfwin - nuke") to_chat(world, "Partial Win: The station has been destroyed!") to_chat(world, "Directive 7-12 has been successfully carried out, preventing the Blob from spreading.") log_game("Blob mode completed with a tie (station destroyed).") @@ -36,7 +36,7 @@ SSticker.news_report = BLOB_NUKE else if(!GLOB.blob_cores.len) - feedback_set_details("round_end_result","loss - blob eliminated") + SSblackbox.set_details("round_end_result","loss - blob eliminated") to_chat(world, "The staff has won!") to_chat(world, "The alien organism has been eradicated from the station!") log_game("Blob mode completed with a crew victory.") diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index fc39f2222e..9d281b5f2f 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -254,19 +254,19 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w for(var/datum/objective/objective in changeling.objectives) if(objective.check_completion()) text += "
Objective #[count]: [objective.explanation_text] Success!" - feedback_add_details("changeling_objective","[objective.type]|SUCCESS") + SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS") else text += "
Objective #[count]: [objective.explanation_text] Fail." - feedback_add_details("changeling_objective","[objective.type]|FAIL") + SSblackbox.add_details("changeling_objective","[objective.type]|FAIL") changelingwin = 0 count++ if(changelingwin) text += "
The changeling was successful!" - feedback_add_details("changeling_success","SUCCESS") + SSblackbox.add_details("changeling_success","SUCCESS") else text += "
The changeling has failed." - feedback_add_details("changeling_success","FAIL") + SSblackbox.add_details("changeling_success","FAIL") text += "
" to_chat(world, text) diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index 1673e59f49..67eb216d58 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -21,7 +21,7 @@ /obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec) if(!is_respec) - feedback_add_details("changeling_power_purchase",name) + SSblackbox.add_details("changeling_power_purchase",name) /obj/effect/proc_holder/changeling/proc/on_refund(mob/user) return @@ -37,7 +37,7 @@ return var/datum/changeling/c = user.mind.changeling if(sting_action(user, target)) - feedback_add_details("changeling_powers",name) + SSblackbox.add_details("changeling_powers",name) sting_feedback(user, target) take_chemical_cost(c) diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index db1405537f..fdfec9e270 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -68,7 +68,7 @@ mind.changeling.purchasedpowers+=S S.on_purchase(src, is_respec) if(is_respec) - feedback_add_details("changeling_power_purchase","Readapt") + SSblackbox.add_details("changeling_power_purchase","Readapt") var/mob/living/carbon/C = src //only carbons have dna now, so we have to typecaste if(ishuman(C)) diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 0f1fb93071..6a52ab9312 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -42,13 +42,13 @@ to_chat(target, "You feel a sharp stabbing pain!") target.take_overall_damage(40) - feedback_add_details("changeling_powers","Absorb DNA|[i]") + SSblackbox.add_details("changeling_powers","Absorb DNA|[i]") if(!do_mob(user, target, 150)) to_chat(user, "Our absorption of [target] has been interrupted!") changeling.isabsorbing = 0 return - feedback_add_details("changeling_powers","Absorb DNA|4") + SSblackbox.add_details("changeling_powers","Absorb DNA|4") user.visible_message("[user] sucks the fluids from [target]!", "We have absorbed [target].") to_chat(target, "You are absorbed by the changeling!") diff --git a/code/game/gamemodes/changeling/powers/linglink.dm b/code/game/gamemodes/changeling/powers/linglink.dm index 5a64d551b5..fc4b91b650 100644 --- a/code/game/gamemodes/changeling/powers/linglink.dm +++ b/code/game/gamemodes/changeling/powers/linglink.dm @@ -56,7 +56,7 @@ to_chat(target, "You can now communicate in the changeling hivemind, say \":g message\" to communicate!") target.reagents.add_reagent("salbutamol", 40) // So they don't choke to death while you interrogate them sleep(1800) - feedback_add_details("changeling_powers","Hivemind Link|[i]") + SSblackbox.add_details("changeling_powers","Hivemind Link|[i]") if(!do_mob(user, target, 20)) to_chat(user, "Our link with [target] has ended!") changeling.islinking = 0 diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 670e08e7a2..deb5ad7e1a 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -194,7 +194,7 @@ Credit where due: var/datum/game_mode/clockwork_cult/C = SSticker.mode if(C.check_clockwork_victory()) text += "Ratvar's servants have succeeded in fulfilling His goals!" - feedback_set_details("round_end_result", "win - servants completed their objective (summon ratvar)") + SSblackbox.set_details("round_end_result", "win - servants completed their objective (summon ratvar)") else var/half_victory = FALSE var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = locate() in GLOB.all_clockwork_objects @@ -203,10 +203,10 @@ Credit where due: if(half_victory) text += "The crew escaped before Ratvar could rise, but the gateway \ was successfully constructed!" - feedback_set_details("round_end_result", "halfwin - servants constructed the gateway but their objective was not completed (summon ratvar)") + SSblackbox.set_details("round_end_result", "halfwin - servants constructed the gateway but their objective was not completed (summon ratvar)") else text += "Ratvar's servants have failed!" - feedback_set_details("round_end_result", "loss - servants failed their objective (summon ratvar)") + SSblackbox.set_details("round_end_result", "loss - servants failed their objective (summon ratvar)") text += "
The servants' objective was:
[CLOCKCULT_OBJECTIVE]" text += "
Ratvar's servants had [GLOB.clockwork_caches] Tinkerer's Caches." text += "
Construction Value(CV) was: [GLOB.clockwork_construction_value]" diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm index 8e688f30aa..e8f1e8dbbc 100644 --- a/code/game/gamemodes/clock_cult/clock_scripture.dm +++ b/code/game/gamemodes/clock_cult/clock_scripture.dm @@ -86,7 +86,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or else successful = TRUE if(slab && !slab.no_cost && !GLOB.ratvar_awakens) //if the slab exists and isn't debug and ratvar isn't up, log the scripture as being used - feedback_add_details("clockcult_scripture_recited", name) + SSblackbox.add_details("clockcult_scripture_recited", name) if(slab) slab.busy = null qdel(src) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 65dcb863eb..f3832a830b 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -218,12 +218,12 @@ /datum/game_mode/cult/declare_completion() if(!check_cult_victory()) - feedback_set_details("round_end_result","win - cult win") - feedback_set("round_end_result",acolytes_survived) + SSblackbox.set_details("round_end_result","win - cult win") + SSblackbox.set_val("round_end_result",acolytes_survived) to_chat(world, "The cult has succeeded! Nar-sie has snuffed out another torch in the void!") else - feedback_set_details("round_end_result","loss - staff stopped the cult") - feedback_set("round_end_result",acolytes_survived) + SSblackbox.set_details("round_end_result","loss - staff stopped the cult") + SSblackbox.set_val("round_end_result",acolytes_survived) to_chat(world, "The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!") var/text = "" @@ -236,31 +236,31 @@ if("survive") if(!check_survive()) explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. ([acolytes_survived] escaped) Success!" - feedback_add_details("cult_objective","cult_survive|SUCCESS|[acolytes_needed]") + SSblackbox.add_details("cult_objective","cult_survive|SUCCESS|[acolytes_needed]") SSticker.news_report = CULT_ESCAPE else explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. ([acolytes_survived] escaped) Fail." - feedback_add_details("cult_objective","cult_survive|FAIL|[acolytes_needed]") + SSblackbox.add_details("cult_objective","cult_survive|FAIL|[acolytes_needed]") SSticker.news_report = CULT_FAILURE if("sacrifice") if(sacrifice_target) if(sacrifice_target in GLOB.sacrificed) explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. Success!" - feedback_add_details("cult_objective","cult_sacrifice|SUCCESS") + SSblackbox.add_details("cult_objective","cult_sacrifice|SUCCESS") else if(sacrifice_target && sacrifice_target.current) explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. Fail." - feedback_add_details("cult_objective","cult_sacrifice|FAIL") + SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL") else explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. Fail (Gibbed)." - feedback_add_details("cult_objective","cult_sacrifice|FAIL|GIBBED") + SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL|GIBBED") if("eldergod") if(!eldergod) explanation = "Summon Nar-Sie. Success!" - feedback_add_details("cult_objective","cult_narsie|SUCCESS") + SSblackbox.add_details("cult_objective","cult_narsie|SUCCESS") SSticker.news_report = CULT_SUMMON else explanation = "Summon Nar-Sie. Fail." - feedback_add_details("cult_objective","cult_narsie|FAIL") + SSblackbox.add_details("cult_objective","cult_narsie|FAIL") SSticker.news_report = CULT_FAILURE text += "
Objective #[obj_count]: [explanation]" diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 2ed6840c91..843d16592a 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -247,7 +247,7 @@ This file contains the arcane tome files. var/obj/effect/rune/R = new rune_to_scribe(Turf, chosen_keyword) R.add_mob_blood(user) to_chat(user, "The [lowertext(R.cultist_name)] rune [R.cultist_desc]") - feedback_add_details("cult_runes_scribed", R.cultist_name) + SSblackbox.add_details("cult_runes_scribed", R.cultist_name) /obj/item/weapon/tome/proc/check_rune_turf(turf/T, mob/user) var/area/A = get_area(T) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 2564d1b262..44d1121f45 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -246,17 +246,17 @@ ghosts++ if(clients > 0) - feedback_set("round_end_clients",clients) + SSblackbox.set_val("round_end_clients",clients) if(ghosts > 0) - feedback_set("round_end_ghosts",ghosts) + SSblackbox.set_val("round_end_ghosts",ghosts) if(surviving_humans > 0) - feedback_set("survived_human",surviving_humans) + SSblackbox.set_val("survived_human",surviving_humans) if(surviving_total > 0) - feedback_set("survived_total",surviving_total) + SSblackbox.set_val("survived_total",surviving_total) if(escaped_humans > 0) - feedback_set("escaped_human",escaped_humans) + SSblackbox.set_val("escaped_human",escaped_humans) if(escaped_total > 0) - feedback_set("escaped_total",escaped_total) + SSblackbox.set_val("escaped_total",escaped_total) send2irc("Server", "Round just ended.") return 0 diff --git a/code/game/gamemodes/game_mode.dm.rej b/code/game/gamemodes/game_mode.dm.rej new file mode 100644 index 0000000000..2ee380eecf --- /dev/null +++ b/code/game/gamemodes/game_mode.dm.rej @@ -0,0 +1,18 @@ +diff a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm (rejected hunks) +@@ -81,12 +81,12 @@ + spawn (ROUNDSTART_LOGOUT_REPORT_TIME) + display_roundstart_logout_report() + +- feedback_set_details("round_start","[time2text(world.realtime)]") ++ SSblackbox.set_details("round_start","[time2text(world.realtime)]") + if(SSticker && SSticker.mode) +- feedback_set_details("game_mode","[SSticker.mode]") ++ SSblackbox.set_details("game_mode","[SSticker.mode]") + if(GLOB.revdata.commit) +- feedback_set_details("revision","[GLOB.revdata.commit]") +- feedback_set_details("server_ip","[world.internet_address]:[world.port]") ++ SSblackbox.set_details("revision","[GLOB.revdata.commit]") ++ SSblackbox.set_details("server_ip","[world.internet_address]:[world.port]") + if(report) + spawn (rand(waittime_l, waittime_h)) + send_intercept(0) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 22ca4b2298..9c31edf55f 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -260,12 +260,12 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue"," return if(!winner) to_chat(world, "The station was [station_was_nuked ? "destroyed!" : "evacuated before a gang could claim it! The station wins!"]
") - feedback_set_details("round_end_result","loss - gangs failed takeover") + SSblackbox.set_details("round_end_result","loss - gangs failed takeover") SSticker.news_report = GANG_LOSS else to_chat(world, "The [winner.name] Gang successfully performed a hostile takeover of the station!
") - feedback_set_details("round_end_result","win - gang domination complete") + SSblackbox.set_details("round_end_result","win - gang domination complete") SSticker.news_report = GANG_TAKEOVER diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index e1a2ddf78f..400b38309b 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -50,8 +50,8 @@ else to_chat(world, "Nobody survived the meteor storm!") - feedback_set_details("round_end_result","end - evacuation") - feedback_set("round_end_result",survivors) + SSblackbox.set_details("round_end_result","end - evacuation") + SSblackbox.set_val("round_end_result",survivors) ..() return 1 diff --git a/code/game/gamemodes/miniantags/monkey/monkey.dm b/code/game/gamemodes/miniantags/monkey/monkey.dm index ecb15bc221..f9ea8dcc2c 100644 --- a/code/game/gamemodes/miniantags/monkey/monkey.dm +++ b/code/game/gamemodes/miniantags/monkey/monkey.dm @@ -107,10 +107,10 @@ /datum/game_mode/monkey/declare_completion() if(check_monkey_victory()) - feedback_set_details("round_end_result","win - monkey win") - feedback_set("round_end_result",escaped_monkeys) + SSblackbox.set_details("round_end_result","win - monkey win") + SSblackbox.set_val("round_end_result",escaped_monkeys) to_chat(world, "The monkeys have overthrown their captors! Eeek eeeek!!") else - feedback_set_details("round_end_result","loss - staff stopped the monkeys") - feedback_set("round_end_result",escaped_monkeys) + SSblackbox.set_details("round_end_result","loss - staff stopped the monkeys") + SSblackbox.set_val("round_end_result",escaped_monkeys) to_chat(world, "The staff managed to contain the monkey infestation!") diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index d4d788e049..b12dcc3bcc 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -199,70 +199,70 @@ if(nuke_off_station == NUKE_SYNDICATE_BASE) - feedback_set_details("round_end_result","loss - syndicate nuked - disk secured") + SSblackbox.set_details("round_end_result","loss - syndicate nuked - disk secured") to_chat(world, "Humiliating Syndicate Defeat") to_chat(world, "The crew of [station_name()] gave [syndicate_name()] operatives back their bomb! The syndicate base was destroyed! Next time, don't lose the nuke!") SSticker.news_report = NUKE_SYNDICATE_BASE else if(!disk_rescued && station_was_nuked && !syndies_didnt_escape) - feedback_set_details("round_end_result","win - syndicate nuke") + SSblackbox.set_details("round_end_result","win - syndicate nuke") to_chat(world, "Syndicate Major Victory!") to_chat(world, "[syndicate_name()] operatives have destroyed [station_name()]!") SSticker.news_report = STATION_NUKED else if (!disk_rescued && station_was_nuked && syndies_didnt_escape) - feedback_set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time") + SSblackbox.set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time") to_chat(world, "Total Annihilation") to_chat(world, "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!") SSticker.news_report = STATION_NUKED else if (!disk_rescued && !station_was_nuked && nuke_off_station && !syndies_didnt_escape) - feedback_set_details("round_end_result","halfwin - blew wrong station") + SSblackbox.set_details("round_end_result","halfwin - blew wrong station") to_chat(world, "Crew Minor Victory") to_chat(world, "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't do that!") SSticker.news_report = NUKE_MISS else if (!disk_rescued && !station_was_nuked && nuke_off_station && syndies_didnt_escape) - feedback_set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time") + SSblackbox.set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time") to_chat(world, "[syndicate_name()] operatives have earned Darwin Award!") to_chat(world, "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't do that!") SSticker.news_report = NUKE_MISS else if ((disk_rescued || SSshuttle.emergency.mode != SHUTTLE_ENDGAME) && are_operatives_dead()) - feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") + SSblackbox.set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") to_chat(world, "Crew Major Victory!") to_chat(world, "The Research Staff has saved the disk and killed the [syndicate_name()] Operatives") SSticker.news_report = OPERATIVES_KILLED else if (disk_rescued) - feedback_set_details("round_end_result","loss - evacuation - disk secured") + SSblackbox.set_details("round_end_result","loss - evacuation - disk secured") to_chat(world, "Crew Major Victory") to_chat(world, "The Research Staff has saved the disk and stopped the [syndicate_name()] Operatives!") SSticker.news_report = OPERATIVES_KILLED else if (!disk_rescued && are_operatives_dead()) - feedback_set_details("round_end_result","halfwin - evacuation - disk not secured") + SSblackbox.set_details("round_end_result","halfwin - evacuation - disk not secured") to_chat(world, "Neutral Victory!") to_chat(world, "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!") SSticker.news_report = OPERATIVE_SKIRMISH else if (!disk_rescued && crew_evacuated) - feedback_set_details("round_end_result","halfwin - detonation averted") + SSblackbox.set_details("round_end_result","halfwin - detonation averted") to_chat(world, "Syndicate Minor Victory!") to_chat(world, "[syndicate_name()] operatives survived the assault but did not achieve the destruction of [station_name()]. Next time, don't lose the disk!") SSticker.news_report = OPERATIVE_SKIRMISH else if (!disk_rescued && !crew_evacuated) - feedback_set_details("round_end_result","halfwin - interrupted") + SSblackbox.set_details("round_end_result","halfwin - interrupted") to_chat(world, "Neutral Victory") to_chat(world, "Round was mysteriously interrupted!") diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 3e47aa517d..cad958ee64 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -57,7 +57,7 @@ U.hidden_uplink.telecrystals = CHALLENGE_TELECRYSTALS U.hidden_uplink.set_gamemode(/datum/game_mode/nuclear) config.shuttle_refuel_delay = max(config.shuttle_refuel_delay, CHALLENGE_SHUTTLE_DELAY) - feedback_set("nuclear_challenge_mode",1) + SSblackbox.set_val("nuclear_challenge_mode",1) qdel(src) /obj/item/device/nuclear_challenge/proc/check_allowed(mob/living/user) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 634c68e89a..7a31d1f3cd 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -345,13 +345,13 @@ ////////////////////////////////////////////////////////////////////// /datum/game_mode/revolution/declare_completion() if(finished == 1) - feedback_set_details("round_end_result","win - heads killed") + SSblackbox.set_details("round_end_result","win - heads killed") to_chat(world, "The heads of staff were killed or exiled! The revolutionaries win!") SSticker.news_report = REVS_WIN else if(finished == 2) - feedback_set_details("round_end_result","loss - rev heads killed") + SSblackbox.set_details("round_end_result","loss - rev heads killed") to_chat(world, "The heads of staff managed to stop the revolution!") SSticker.news_report = REVS_LOSE diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index c26945801b..c748484c1b 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -260,10 +260,10 @@ for(var/datum/objective/objective in traitor.objectives) if(objective.check_completion()) objectives += "
Objective #[count]: [objective.explanation_text] Success!" - feedback_add_details("traitor_objective","[objective.type]|SUCCESS") + SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS") else objectives += "
Objective #[count]: [objective.explanation_text] Fail." - feedback_add_details("traitor_objective","[objective.type]|FAIL") + SSblackbox.add_details("traitor_objective","[objective.type]|FAIL") traitorwin = 0 count++ @@ -283,10 +283,10 @@ if(traitorwin) text += "
The [special_role_text] was successful!" - feedback_add_details("traitor_success","SUCCESS") + SSblackbox.add_details("traitor_success","SUCCESS") else text += "
The [special_role_text] has failed!" - feedback_add_details("traitor_success","FAIL") + SSblackbox.add_details("traitor_success","FAIL") text += "
" diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 01eb8a52c4..1eb51a95b4 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -132,7 +132,7 @@ /datum/game_mode/wizard/raginmages/declare_completion() if(finished) - feedback_set_details("round_end_result","loss - wizard killed") + SSblackbox.set_details("round_end_result","loss - wizard killed") to_chat(world, "The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!") ..(1) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index e9e1a95e73..8541fd154c 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -57,10 +57,10 @@ aspell.name = "Instant [aspell.name]" if(aspell.spell_level >= aspell.level_max) to_chat(user, "This spell cannot be strengthened any further.") - feedback_add_details("wizard_spell_improved", "[name]|[aspell.level]") + SSblackbox.add_details("wizard_spell_improved", "[name]|[aspell.level]") return 1 //No same spell found - just learn it - feedback_add_details("wizard_spell_learned", name) + SSblackbox.add_details("wizard_spell_learned", name) user.mind.AddSpell(S) to_chat(user, "You have learned [S.name].") return 1 @@ -266,7 +266,7 @@ /datum/spellbook_entry/item/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) new item_path(get_turf(user)) - feedback_add_details("wizard_spell_learned", name) + SSblackbox.add_details("wizard_spell_learned", name) return 1 /datum/spellbook_entry/item/GetInfo() @@ -465,7 +465,7 @@ return TRUE /datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/weapon/spellbook/book) - feedback_add_details("wizard_spell_learned", name) + SSblackbox.add_details("wizard_spell_learned", name) new /datum/round_event/wizard/ghost() active = TRUE to_chat(user, "You have cast summon ghosts!") @@ -482,7 +482,7 @@ return (SSticker.mode.name != "ragin' mages" && !config.no_summon_guns) /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) - feedback_add_details("wizard_spell_learned", name) + SSblackbox.add_details("wizard_spell_learned", name) rightandwrong(0, user, 25) active = 1 playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1) @@ -499,7 +499,7 @@ return (SSticker.mode.name != "ragin' mages" && !config.no_summon_magic) /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) - feedback_add_details("wizard_spell_learned", name) + SSblackbox.add_details("wizard_spell_learned", name) rightandwrong(1, user, 25) active = 1 playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1) @@ -517,7 +517,7 @@ return (SSticker.mode.name != "ragin' mages" && !config.no_summon_events) /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) - feedback_add_details("wizard_spell_learned", name) + SSblackbox.add_details("wizard_spell_learned", name) summonevents() times++ playsound(get_turf(user), 'sound/magic/CastSummon.ogg', 50, 1) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 34d148f03c..35bccb692a 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -176,7 +176,7 @@ /datum/game_mode/wizard/declare_completion() if(finished) - feedback_set_details("round_end_result","loss - wizard killed") + SSblackbox.set_details("round_end_result","loss - wizard killed") to_chat(world, "The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!") SSticker.news_report = WIZARD_KILLED @@ -208,19 +208,19 @@ for(var/datum/objective/objective in wizard.objectives) if(objective.check_completion()) text += "
Objective #[count]: [objective.explanation_text] Success!" - feedback_add_details("wizard_objective","[objective.type]|SUCCESS") + SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS") else text += "
Objective #[count]: [objective.explanation_text] Fail." - feedback_add_details("wizard_objective","[objective.type]|FAIL") + SSblackbox.add_details("wizard_objective","[objective.type]|FAIL") wizardwin = 0 count++ if(wizard.current && wizard.current.stat!=2 && wizardwin) text += "
The wizard was successful!" - feedback_add_details("wizard_success","SUCCESS") + SSblackbox.add_details("wizard_success","SUCCESS") else text += "
The wizard has failed!" - feedback_add_details("wizard_success","FAIL") + SSblackbox.add_details("wizard_success","FAIL") if(wizard.spell_list.len>0) text += "
[wizard.name] used the following spells: " var/i = 1 diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 514cf590af..643282ab4a 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -234,7 +234,7 @@ playsound(loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10) if(emagged) - feedback_inc("arcade_win_emagged") + SSblackbox.inc("arcade_win_emagged") new /obj/effect/spawner/newbomb/timer/syndicate(loc) new /obj/item/clothing/head/collectable/petehat(loc) message_admins("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.") @@ -242,7 +242,7 @@ Reset() emagged = 0 else - feedback_inc("arcade_win_normal") + SSblackbox.inc("arcade_win_normal") prizevend() else if (emagged && (turtle >= 4)) @@ -264,10 +264,10 @@ temp = "You have been drained! GAME OVER" playsound(loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10) if(emagged) - feedback_inc("arcade_loss_mana_emagged") + SSblackbox.inc("arcade_loss_mana_emagged") usr.gib() else - feedback_inc("arcade_loss_mana_normal") + SSblackbox.inc("arcade_loss_mana_normal") else if ((enemy_hp <= 10) && (enemy_mp > 4)) temp = "[enemy_name] heals for 4 health!" @@ -286,10 +286,10 @@ temp = "You have been crushed! GAME OVER" playsound(loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10) if(emagged) - feedback_inc("arcade_loss_hp_emagged") + SSblackbox.inc("arcade_loss_hp_emagged") usr.gib() else - feedback_inc("arcade_loss_hp_normal") + SSblackbox.inc("arcade_loss_hp_normal") blocked = FALSE return diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 5af4f9c281..c9a448fc7b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -115,9 +115,9 @@ message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") switch(GLOB.security_level) if(SEC_LEVEL_GREEN) - feedback_inc("alert_comms_green",1) + SSblackbox.inc("alert_comms_green",1) if(SEC_LEVEL_BLUE) - feedback_inc("alert_comms_blue",1) + SSblackbox.inc("alert_comms_blue",1) tmp_alertlevel = 0 else to_chat(usr, "You are not authorized to do this!") @@ -176,7 +176,7 @@ SSshuttle.points -= S.credit_cost minor_announce("[usr.name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase") message_admins("[key_name_admin(usr)] purchased [S.name].") - feedback_add_details("shuttle_purchase", S.name) + SSblackbox.add_details("shuttle_purchase", S.name) else to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.") else @@ -368,9 +368,9 @@ message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") switch(GLOB.security_level) if(SEC_LEVEL_GREEN) - feedback_inc("alert_comms_green",1) + SSblackbox.inc("alert_comms_green",1) if(SEC_LEVEL_BLUE) - feedback_inc("alert_comms_blue",1) + SSblackbox.inc("alert_comms_blue",1) tmp_alertlevel = 0 src.aistate = STATE_DEFAULT if("ai-changeseclevel") diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index a50a2973fc..7c3251a1be 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -535,7 +535,7 @@ GLOBAL_LIST_EMPTY(allCasters) if(choice=="Confirm") scan_user(usr) GLOB.news_network.CreateFeedChannel(channel_name, scanned_user, c_locked) - feedback_inc("newscaster_channels",1) + SSblackbox.inc("newscaster_channels",1) screen=5 updateUsrDialog() else if(href_list["set_channel_receiving"]) @@ -558,7 +558,7 @@ GLOBAL_LIST_EMPTY(allCasters) screen=6 else GLOB.news_network.SubmitArticle("[parsepencode(msg, usr, SIGNFONT)]", scanned_user, channel_name, photo, 0, allow_comments) - feedback_inc("newscaster_stories",1) + SSblackbox.inc("newscaster_stories",1) screen=4 msg = "" updateUsrDialog() @@ -850,7 +850,7 @@ GLOBAL_LIST_EMPTY(allCasters) return /obj/machinery/newscaster/proc/print_paper() - feedback_inc("newscaster_newspapers_printed",1) + SSblackbox.inc("newscaster_newspapers_printed",1) var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels) NEWSPAPER.news_content += FC diff --git a/code/game/machinery/telecomms/broadcasting.dm.rej b/code/game/machinery/telecomms/broadcasting.dm.rej new file mode 100644 index 0000000000..7033970bd3 --- /dev/null +++ b/code/game/machinery/telecomms/broadcasting.dm.rej @@ -0,0 +1,33 @@ +diff a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm (rejected hunks) +@@ -142,30 +142,7 @@ + // --- This following recording is intended for research and feedback in the use of department radio channels --- + + var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]" +- if(istype(GLOB.blackbox)) +- switch(freq) +- if(1459) +- GLOB.blackbox.msg_common += blackbox_msg +- if(1351) +- GLOB.blackbox.msg_science += blackbox_msg +- if(1353) +- GLOB.blackbox.msg_command += blackbox_msg +- if(1355) +- GLOB.blackbox.msg_medical += blackbox_msg +- if(1357) +- GLOB.blackbox.msg_engineering += blackbox_msg +- if(1359) +- GLOB.blackbox.msg_security += blackbox_msg +- if(1441) +- GLOB.blackbox.msg_deathsquad += blackbox_msg +- if(1213) +- GLOB.blackbox.msg_syndicate += blackbox_msg +- if(1349) +- GLOB.blackbox.msg_service += blackbox_msg +- if(1347) +- GLOB.blackbox.msg_cargo += blackbox_msg +- else +- GLOB.blackbox.messages += blackbox_msg ++ SSblackbox.LogBroadcast(blackbox_msg, freq) + + spawn(50) + qdel(virt) diff --git a/code/game/machinery/vending.dm.rej b/code/game/machinery/vending.dm.rej new file mode 100644 index 0000000000..a487eb51a1 --- /dev/null +++ b/code/game/machinery/vending.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm (rejected hunks) +@@ -528,7 +528,7 @@ + if(icon_vend) //Show the vending animation if needed + flick(icon_vend,src) + new R.product_path(get_turf(src)) +- feedback_add_details("vending_machine_usage","[R.product_path]|[src.type]") ++ SSblackbox.add_details("vending_machine_usage","[R.product_path]|[src.type]") + vend_ready = 1 + return + diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index b065de37ca..be6e85448b 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -277,7 +277,7 @@ /datum/construction/reversible/mecha/ripley/spawn_result() ..() - feedback_inc("mecha_ripley_created",1) + SSblackbox.inc("mecha_ripley_created",1) return @@ -564,7 +564,7 @@ var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) M.CheckParts(holder.contents) qdel(holder) - feedback_inc("mecha_gygax_created",1) + SSblackbox.inc("mecha_gygax_created",1) return /datum/construction/mecha/firefighter_chassis @@ -786,7 +786,7 @@ /datum/construction/reversible/mecha/firefighter/spawn_result() ..() - feedback_inc("mecha_firefighter_created",1) + SSblackbox.inc("mecha_firefighter_created",1) return @@ -864,7 +864,7 @@ /datum/construction/mecha/honker/spawn_result() ..() - feedback_inc("mecha_honker_created",1) + SSblackbox.inc("mecha_honker_created",1) return /datum/construction/mecha/durand_chassis @@ -1149,7 +1149,7 @@ var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) M.CheckParts(holder.contents) qdel(holder) - feedback_inc("mecha_durand_created",1) + SSblackbox.inc("mecha_durand_created",1) return //PHAZON @@ -1481,7 +1481,7 @@ var/obj/mecha/combat/gygax/M = new result(get_turf(holder)) M.CheckParts(holder.contents) qdel(holder) - feedback_inc("mecha_phazon_created",1) + SSblackbox.inc("mecha_phazon_created",1) return //ODYSSEUS @@ -1692,5 +1692,5 @@ /datum/construction/reversible/mecha/odysseus/spawn_result() ..() - feedback_inc("mecha_odysseus_created",1) + SSblackbox.inc("mecha_odysseus_created",1) return diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 1028ca1429..1f923ddd5e 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -58,7 +58,7 @@ if(src.l_arm && src.r_arm) if(src.l_leg && src.r_leg) if(src.chest && src.head) - feedback_inc("cyborg_frames_built",1) + SSblackbox.inc("cyborg_frames_built",1) return 1 return 0 @@ -235,7 +235,7 @@ O.mmi = W //and give the real mmi to the borg. O.updatename() - feedback_inc("cyborg_birth",1) + SSblackbox.inc("cyborg_birth",1) forceMove(O) O.robot_suit = src diff --git a/code/game/objects/items/weapons/handcuffs.dm.rej b/code/game/objects/items/weapons/handcuffs.dm.rej new file mode 100644 index 0000000000..cfc1658267 --- /dev/null +++ b/code/game/objects/items/weapons/handcuffs.dm.rej @@ -0,0 +1,31 @@ +diff a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm (rejected hunks) +@@ -46,9 +46,9 @@ + apply_cuffs(C,user) + to_chat(user, "You handcuff [C].") + if(istype(src, /obj/item/weapon/restraints/handcuffs/cable)) +- feedback_add_details("handcuffs","C") ++ SSblackbox.add_details("handcuffs","C") + else +- feedback_add_details("handcuffs","H") ++ SSblackbox.add_details("handcuffs","H") + + add_logs(user, C, "handcuffed") + else +@@ -278,7 +278,7 @@ + C.legcuffed = src + src.loc = C + C.update_inv_legcuffed() +- feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart. ++ SSblackbox.add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart. + else if(isanimal(L)) + var/mob/living/simple_animal/SA = L + if(SA.mob_size > MOB_SIZE_TINY) +@@ -341,7 +341,7 @@ + C.legcuffed = src + src.loc = C + C.update_inv_legcuffed() +- feedback_add_details("handcuffs","B") ++ SSblackbox.add_details("handcuffs","B") + to_chat(C, "\The [src] ensnares you!") + C.Weaken(weaken) + diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 571aece4c3..aa720f1979 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -39,7 +39,7 @@ SSreligion.holy_weapon_type = holy_weapon.type - feedback_set_details("chaplain_weapon","[choice]") + SSblackbox.set_details("chaplain_weapon","[choice]") if(holy_weapon) holy_weapon.reskinned = TRUE diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm index 83805d969a..7775b3692a 100644 --- a/code/game/objects/items/weapons/storage/book.dm +++ b/code/game/objects/items/weapons/storage/book.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", SSreligion.bible_icon_state = B.icon_state SSreligion.bible_item_state = B.item_state - feedback_set_details("religion_book","[biblename]") + SSblackbox.set_details("religion_book","[biblename]") usr << browse(null, "window=editicon") /obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/human/H, mob/living/user) diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 3cf35daa03..7820031700 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -180,7 +180,7 @@ var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(loc, laws, brain.brainmob) if(brain.force_replace_ai_name) A.fully_replace_character_name(A.name, brain.replacement_ai_name()) - feedback_inc("cyborg_ais_created",1) + SSblackbox.inc("cyborg_ais_created",1) qdel(src) else state = AI_READY_CORE diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index a17fcf2ca8..f4a3403ee5 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -63,7 +63,7 @@ if(istype(src, /turf/open/floor/plating/asteroid)) to_chat(user, "You dig a hole.") gets_dug() - feedback_add_details("pick_used_mining","[W.type]") + SSblackbox.add_details("pick_used_mining","[W.type]") if(istype(W,/obj/item/weapon/storage/bag/ore)) var/obj/item/weapon/storage/bag/ore/S = W diff --git a/code/game/turfs/simulated/minerals.dm.rej b/code/game/turfs/simulated/minerals.dm.rej new file mode 100644 index 0000000000..2ac5181cc8 --- /dev/null +++ b/code/game/turfs/simulated/minerals.dm.rej @@ -0,0 +1,19 @@ +diff a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm (rejected hunks) +@@ -64,7 +64,7 @@ + if(ismineralturf(src)) + to_chat(user, "You finish cutting into the rock.") + gets_drilled(user) +- feedback_add_details("pick_used_mining","[P.type]") ++ SSblackbox.add_details("pick_used_mining","[P.type]") + else + return attack_hand(user) + return +@@ -74,7 +74,7 @@ + var/i + for (i=0;i[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:\n \t [message]") log_admin("Announce: [key_name(usr)] : [message]") - feedback_add_details("admin_verb","Announce") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Announce") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/set_admin_notice() set category = "Special Verbs" @@ -471,7 +471,7 @@ message_admins("[key_name(usr)] set the admin notice.") log_admin("[key_name(usr)] set the admin notice:\n[new_admin_notice]") to_chat(world, "Admin Notice:\n \t [new_admin_notice]") - feedback_add_details("admin_verb","Set Admin Notice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Set Admin Notice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! GLOB.admin_notice = new_admin_notice return @@ -482,7 +482,7 @@ toggle_ooc() log_admin("[key_name(usr)] toggled OOC.") message_admins("[key_name_admin(usr)] toggled OOC.") - feedback_add_details("admin_toggle","Toggle OOC|[GLOB.ooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle OOC|[GLOB.ooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleoocdead() set category = "Server" @@ -492,7 +492,7 @@ log_admin("[key_name(usr)] toggled OOC.") message_admins("[key_name_admin(usr)] toggled Dead OOC.") - feedback_add_details("admin_toggle","Toggle Dead OOC|[GLOB.dooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Dead OOC|[GLOB.dooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/startnow() set category = "Server" @@ -507,7 +507,7 @@ started as soon as possible.)" message_admins("\ [usr.key] has started the game.[msg]") - feedback_add_details("admin_verb","Start Now") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Start Now") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return 1 else to_chat(usr, "Error: Start Now: Game has already started.") @@ -526,7 +526,7 @@ log_admin("[key_name(usr)] toggled new player game entering.") message_admins("[key_name_admin(usr)] toggled new player game entering.") world.update_status() - feedback_add_details("admin_toggle","Toggle Entering|[GLOB.enter_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Entering|[GLOB.enter_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleAI() set category = "Server" @@ -539,7 +539,7 @@ to_chat(world, "The AI job is chooseable now.") log_admin("[key_name(usr)] toggled AI allowed.") world.update_status() - feedback_add_details("admin_toggle","Toggle AI|[config.allow_ai]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle AI|[config.allow_ai]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleaban() set category = "Server" @@ -553,7 +553,7 @@ message_admins("[key_name_admin(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].") log_admin("[key_name(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].") world.update_status() - feedback_add_details("admin_toggle","Toggle Respawn|[GLOB.abandon_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Respawn|[GLOB.abandon_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/delay() set category = "Server" @@ -572,7 +572,7 @@ to_chat(world, "The game will start in [newtime] seconds.") world << 'sound/ai/attention.ogg' log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.") - feedback_add_details("admin_verb","Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/unprison(mob/M in GLOB.mob_list) set category = "Admin" @@ -583,7 +583,7 @@ log_admin("[key_name(usr)] has unprisoned [key_name(M)]") else alert("[M.name] is not prisoned.") - feedback_add_details("admin_verb","Unprison") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Unprison") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ////////////////////////////////////////////////////////////////////////////////////////////////ADMIN HELPER PROCS @@ -624,7 +624,7 @@ A.admin_spawned = TRUE log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])") - feedback_add_details("admin_verb","Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/show_traitor_panel(mob/M in GLOB.mob_list) @@ -640,7 +640,7 @@ return M.mind.edit_memory() - feedback_add_details("admin_verb","Traitor Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Traitor Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggletintedweldhelmets() @@ -654,7 +654,7 @@ to_chat(world, "The tinted_weldhelh has been disabled!") log_admin("[key_name(usr)] toggled tinted_weldhelh.") message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.") - feedback_add_details("admin_toggle","Toggle Tinted Welding Helmets|[GLOB.tinted_weldhelh]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Tinted Welding Helmets|[GLOB.tinted_weldhelh]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleguests() set category = "Server" @@ -667,7 +667,7 @@ to_chat(world, "Guests may now enter the game.") log_admin("[key_name(usr)] toggled guests game entering [GLOB.guests_allowed?"":"dis"]allowed.") message_admins("[key_name_admin(usr)] toggled guests game entering [GLOB.guests_allowed?"":"dis"]allowed.") - feedback_add_details("admin_toggle","Toggle Guests|[GLOB.guests_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Guests|[GLOB.guests_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/output_ai_laws() var/ai_number = 0 @@ -796,7 +796,7 @@ message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].") log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].") - feedback_add_details("admin_verb","Ghost Drag Control") + SSblackbox.add_details("admin_verb","Ghost Drag Control") tomob.ckey = frommob.ckey qdel(frommob) diff --git a/code/modules/admin/admin.dm.rej b/code/modules/admin/admin.dm.rej new file mode 100644 index 0000000000..58a209fb70 --- /dev/null +++ b/code/modules/admin/admin.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm (rejected hunks) +@@ -419,7 +419,7 @@ + return + if(confirm == "Yes") + SSticker.delay_end = 0 +- feedback_add_details("admin_verb","Hard Restart") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Hard Restart") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + world.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10) + + /datum/admins/proc/end_round() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 22045b99ff..ba1cdd679e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -331,7 +331,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) verbs += /client/proc/show_verbs to_chat(src, "Most of your adminverbs have been hidden.") - feedback_add_details("admin_verb","Hide Most Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Hide Most Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/hide_verbs() @@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) verbs += /client/proc/show_verbs to_chat(src, "Almost all of your adminverbs have been hidden.") - feedback_add_details("admin_verb","Hide All Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Hide All Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/show_verbs() @@ -353,7 +353,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) add_admin_verbs() to_chat(src, "All of your adminverbs are now visible.") - feedback_add_details("admin_verb","Show Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -373,7 +373,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) message_admins("[key_name_admin(usr)] re-entered corpse") ghost.can_reenter_corpse = 1 //force re-entering even when otherwise not possible ghost.reenter_corpse() - feedback_add_details("admin_verb","Admin Reenter") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Admin Reenter") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else if(isnewplayer(mob)) to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.") else @@ -384,7 +384,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) body.ghostize(1) if(body && !body.key) body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus - feedback_add_details("admin_verb","Admin Ghost") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Admin Ghost") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/invisimin() @@ -404,7 +404,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) set category = "Admin" if(holder) holder.player_panel_new() - feedback_add_details("admin_verb","Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/check_antagonists() set name = "Check Antagonists" @@ -414,7 +414,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) log_admin("[key_name(usr)] checked antagonists.") //for tsar~ if(!isobserver(usr)) message_admins("[key_name_admin(usr)] checked antagonists.") - feedback_add_details("admin_verb","Check Antagonists") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Check Antagonists") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/unban_panel() set name = "Unban Panel" @@ -424,21 +424,21 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) holder.unbanpanel() else holder.DB_ban_panel() - feedback_add_details("admin_verb","Unban Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Unban Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/game_panel() set name = "Game Panel" set category = "Admin" if(holder) holder.Game() - feedback_add_details("admin_verb","Game Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Game Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/secrets() set name = "Secrets" set category = "Admin" if (holder) holder.Secrets() - feedback_add_details("admin_verb","Secrets Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Secrets Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/findStealthKey(txt) @@ -486,7 +486,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) mob.mouse_opacity = 0 log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]") message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]") - feedback_add_details("admin_verb","Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/drop_bomb() set category = "Special Verbs" @@ -528,7 +528,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, TRUE, TRUE) message_admins("[ADMIN_LOOKUPFLW(usr)] creating an admin explosion at [epicenter.loc].") log_admin("[key_name(usr)] created an admin explosion at [epicenter.loc].") - feedback_add_details("admin_verb","Drop Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Drop Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/drop_dynex_bomb() set category = "Special Verbs" @@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) dyn_explosion(epicenter, ex_power) message_admins("[ADMIN_LOOKUPFLW(usr)] creating an admin explosion at [epicenter.loc].") log_admin("[key_name(usr)] created an admin explosion at [epicenter.loc].") - feedback_add_details("admin_verb","Drop Dynamic Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Drop Dynamic Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/get_dynex_range() set category = "Debug" @@ -586,7 +586,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) if(!S) return - feedback_add_details("admin_verb","Give Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Give Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].") message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].") @@ -608,7 +608,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) T.mind.RemoveSpell(S) log_admin("[key_name(usr)] removed the spell [S] from [key_name(T)].") message_admins("[key_name_admin(usr)] removed the spell [S] from [key_name(T)].") - feedback_add_details("admin_verb","Remove Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Remove Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/give_disease(mob/T in GLOB.mob_list) set category = "Fun" @@ -617,7 +617,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in SSdisease.diseases if(!D) return T.ForceContractDisease(new D) - feedback_add_details("admin_verb","Give Disease") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Give Disease") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].") @@ -631,13 +631,13 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) O.say(message) log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z] say \"[message]\"") message_admins("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. say \"[message]\"") - feedback_add_details("admin_verb","Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/togglebuildmodeself() set name = "Toggle Build Mode Self" set category = "Special Verbs" if(src.mob) togglebuildmode(src.mob) - feedback_add_details("admin_verb","Toggle Build Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Toggle Build Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_log_hrefs() set name = "Toggle href logging" @@ -679,7 +679,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) to_chat(src, "You are now a normal player.") log_admin("[src] deadmined themself.") message_admins("[src] deadmined themself.") - feedback_add_details("admin_verb","Deadmin") + SSblackbox.add_details("admin_verb","Deadmin") /client/proc/readmin() set name = "Readmin" @@ -697,7 +697,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) to_chat(src, "You are now an admin.") message_admins("[src] re-adminned themselves.") log_admin("[src] re-adminned themselves.") - feedback_add_details("admin_verb","Readmin") + SSblackbox.add_details("admin_verb","Readmin") /client/proc/populate_world(amount = 50 as num) set name = "Populate World" diff --git a/code/modules/admin/secrets.dm.rej b/code/modules/admin/secrets.dm.rej new file mode 100644 index 0000000000..5cf52e0fb0 --- /dev/null +++ b/code/modules/admin/secrets.dm.rej @@ -0,0 +1,291 @@ +diff a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm (rejected hunks) +@@ -197,8 +197,8 @@ + if("moveminingshuttle") + if(!check_rights(R_ADMIN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","ShM") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","ShM") + if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away")) + message_admins("[key_name_admin(usr)] moved mining shuttle") + log_admin("[key_name(usr)] moved the mining shuttle") +@@ -206,8 +206,8 @@ + if("movelaborshuttle") + if(!check_rights(R_ADMIN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","ShL") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","ShL") + if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away")) + message_admins("[key_name_admin(usr)] moved labor shuttle") + log_admin("[key_name(usr)] moved the labor shuttle") +@@ -215,8 +215,8 @@ + if("moveferry") + if(!check_rights(R_ADMIN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","ShF") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","ShF") + if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away")) + message_admins("[key_name_admin(usr)] moved the centcom ferry") + log_admin("[key_name(usr)] moved the centcom ferry") +@@ -228,8 +228,8 @@ + if(A) + var/new_perma = !A.perma_docked + A.perma_docked = new_perma +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","ShA[new_perma ? "s" : "g"]") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","ShA[new_perma ? "s" : "g"]") + message_admins("[key_name_admin(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle") + log_admin("[key_name(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle") + else +@@ -279,8 +279,8 @@ + if("monkey") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","M") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","M") + for(var/mob/living/carbon/human/H in GLOB.mob_list) + spawn(0) + H.monkeyize() +@@ -300,8 +300,8 @@ + if("corgi") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","M") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","M") + for(var/mob/living/carbon/human/H in GLOB.mob_list) + spawn(0) + H.corgize() +@@ -311,14 +311,14 @@ + if(!check_rights(R_FUN)) + return + usr.client.triple_ai() +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","TriAI") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","TriAI") + + if("power") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","P") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","P") + log_admin("[key_name(usr)] made all areas powered", 1) + message_admins("[key_name_admin(usr)] made all areas powered") + power_restore() +@@ -326,8 +326,8 @@ + if("unpower") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","UP") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","UP") + log_admin("[key_name(usr)] made all areas unpowered", 1) + message_admins("[key_name_admin(usr)] made all areas unpowered") + power_failure() +@@ -335,8 +335,8 @@ + if("quickpower") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","QP") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","QP") + log_admin("[key_name(usr)] made all SMESs powered", 1) + message_admins("[key_name_admin(usr)] made all SMESs powered") + power_restore_quick() +@@ -350,8 +350,8 @@ + var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN) + if(!objective) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","TA([objective])") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","TA([objective])") + for(var/mob/living/carbon/human/H in GLOB.player_list) + if(H.stat == 2 || !H.client || !H.mind) continue + if(is_special_character(H)) continue +@@ -383,8 +383,8 @@ + if("changebombcap") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","BC") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","BC") + + var/newBombCap = input(usr,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) as num|null + if (newBombCap < 4) +@@ -404,16 +404,16 @@ + if("lightsout") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","LO") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","LO") + message_admins("[key_name_admin(usr)] has broke a lot of lights") + E = new /datum/round_event/electrical_storm{lightsoutAmount = 2}() + + if("blackout") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","BO") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","BO") + message_admins("[key_name_admin(usr)] broke all lights") + for(var/obj/machinery/light/L in GLOB.machines) + L.break_light_tube() +@@ -429,8 +429,8 @@ + + if(animetype == "Cancel" || droptype == "Cancel") + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","CC") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","CC") + message_admins("[key_name_admin(usr)] made everything kawaii.") + for(var/mob/living/carbon/human/H in GLOB.mob_list) + H << sound('sound/AI/animes.ogg') +@@ -460,8 +460,8 @@ + if("whiteout") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","WO") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","WO") + message_admins("[key_name_admin(usr)] fixed all lights") + for(var/obj/machinery/light/L in GLOB.machines) + L.fix() +@@ -472,8 +472,8 @@ + if("virus") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","V") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","V") + switch(alert("Do you want this to be a random disease or do you have something in mind?",,"Make Your Own","Random","Choose")) + if("Make Your Own") + AdminCreateVirus(usr.client) +@@ -488,8 +488,8 @@ + if("retardify") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","RET") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","RET") + for(var/mob/living/carbon/human/H in GLOB.player_list) + to_chat(H, "You suddenly feel stupid.") + H.setBrainLoss(60) +@@ -498,8 +498,8 @@ + if("eagles")//SCRAW + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","EgL") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","EgL") + for(var/obj/machinery/door/airlock/W in GLOB.machines) + if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison)) + W.req_access = list() +@@ -509,8 +509,8 @@ + if("guns") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","SG") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","SG") + var/survivor_probability = 0 + switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!")) + if("Some Antags") +@@ -523,8 +523,8 @@ + if("magic") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","SM") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","SM") + var/survivor_probability = 0 + switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!")) + if("Some Antags") +@@ -540,15 +540,15 @@ + if(!SSevents.wizardmode) + if(alert("Do you want to toggle summon events on?",,"Yes","No") == "Yes") + summonevents() +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","SE") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","SE") + + else + switch(alert("What would you like to do?",,"Intensify Summon Events","Turn Off Summon Events","Nothing")) + if("Intensify Summon Events") + summonevents() +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","SE") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","SE") + if("Turn Off Summon Events") + SSevents.toggleWizardmode() + SSevents.resetFrequency() +@@ -556,8 +556,8 @@ + if("dorf") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","DF") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","DF") + for(var/mob/living/carbon/human/B in GLOB.mob_list) + B.facial_hair_style = "Dward Beard" + B.update_hair() +@@ -566,8 +566,8 @@ + if("onlyone") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","OO") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","OO") + usr.client.only_one() + send_to_playing_players('sound/misc/highlander.ogg') + // message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)") +@@ -575,16 +575,16 @@ + if("delayed_onlyone") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","OO") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","OO") + usr.client.only_one_delayed() + send_to_playing_players('sound/misc/highlander_delayed.ogg') + + if("onlyme") + if(!check_rights(R_FUN)) + return +- feedback_inc("admin_secrets_fun_used",1) +- feedback_add_details("admin_secrets_fun_used","OM") ++ SSblackbox.inc("admin_secrets_fun_used",1) ++ SSblackbox.add_details("admin_secrets_fun_used","OM") + only_me() + + if("maint_access_brig") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index dd32085681..5d46c1d409 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -498,7 +498,7 @@ GLOB.Banlist["minutes"] << minutes GLOB.Banlist["bannedby"] << usr.ckey GLOB.Banlist.cd = "/base" - feedback_inc("ban_edit",1) + SSblackbox.inc("ban_edit",1) unbanpanel() /////////////////////////////////////new ban stuff @@ -520,7 +520,7 @@ if("Yes") ban_unban_log_save("[key_name(usr)] removed [key_name(M)]'s appearance ban.") log_admin_private("[key_name(usr)] removed [key_name(M)]'s appearance ban.") - feedback_inc("ban_appearance_unban", 1) + SSblackbox.inc("ban_appearance_unban", 1) DB_ban_unban(M.ckey, BANTYPE_ANY_JOB, "appearance") if(M.client) jobban_buildcache(M.client) @@ -539,7 +539,7 @@ jobban_buildcache(M.client) ban_unban_log_save("[key_name(usr)] appearance banned [key_name(M)]. reason: [reason]") log_admin_private("[key_name(usr)] appearance banned [key_name(M)]. \nReason: [reason]") - feedback_inc("ban_appearance",1) + SSblackbox.inc("ban_appearance",1) create_message("note", M.ckey, null, "Appearance banned - [reason]", null, null, 0, 0) message_admins("[key_name_admin(usr)] appearance banned [key_name_admin(M)].") to_chat(M, "You have been appearance banned by [usr.client.ckey].") @@ -924,8 +924,8 @@ jobban_buildcache(M.client) ban_unban_log_save("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes. reason: [reason]") log_admin_private("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes.") - feedback_inc("ban_job_tmp",1) - feedback_add_details("ban_job_tmp","- [job]") + SSblackbox.inc("ban_job_tmp",1) + SSblackbox.add_details("ban_job_tmp","- [job]") if(!msg) msg = job else @@ -949,8 +949,8 @@ jobban_buildcache(M.client) ban_unban_log_save("[key_name(usr)] perma-jobbanned [key_name(M)] from [job]. reason: [reason]") log_admin_private("[key_name(usr)] perma-banned [key_name(M)] from [job]") - feedback_inc("ban_job",1) - feedback_add_details("ban_job","- [job]") + SSblackbox.inc("ban_job",1) + SSblackbox.add_details("ban_job","- [job]") if(!msg) msg = job else @@ -980,8 +980,8 @@ DB_ban_unban(M.ckey, BANTYPE_ANY_JOB, job) if(M.client) jobban_buildcache(M.client) - feedback_inc("ban_job_unban",1) - feedback_add_details("ban_job_unban","- [job]") + SSblackbox.inc("ban_job_unban",1) + SSblackbox.add_details("ban_job_unban","- [job]") if(!msg) msg = job else @@ -1116,8 +1116,8 @@ ban_unban_log_save("[key_name(usr)] has banned [key_name(M)]. - Reason: [reason] - This will be removed in [mins] minutes.") to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason]") to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") - feedback_inc("ban_tmp",1) - feedback_inc("ban_tmp_mins",mins) + SSblackbox.inc("ban_tmp",1) + SSblackbox.inc("ban_tmp_mins",mins) if(config.banappeals) to_chat(M, "To try to resolve this matter head to [config.banappeals]") else @@ -1687,7 +1687,7 @@ log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)].") message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)].") - feedback_inc("admin_cookies_spawned",1) + SSblackbox.inc("admin_cookies_spawned",1) to_chat(H, "Your prayers have been answered!! You received the best cookie!") H << 'sound/effects/pray_chaplain.ogg' @@ -1987,7 +1987,7 @@ var/choice = alert("Please confirm Feed channel creation.","Network Channel Handler","Confirm","Cancel") if(choice=="Confirm") GLOB.news_network.CreateFeedChannel(src.admincaster_feed_channel.channel_name, src.admin_signature, src.admincaster_feed_channel.locked, 1) - feedback_inc("newscaster_channels",1) + SSblackbox.inc("newscaster_channels",1) log_admin("[key_name(usr)] created command feed channel: [src.admincaster_feed_channel.channel_name]!") src.admincaster_screen=5 src.access_news_network() @@ -2010,7 +2010,7 @@ src.admincaster_screen = 6 else GLOB.news_network.SubmitArticle(src.admincaster_feed_message.returnBody(-1), src.admin_signature, src.admincaster_feed_channel.channel_name, null, 1) - feedback_inc("newscaster_stories",1) + SSblackbox.inc("newscaster_stories",1) src.admincaster_screen=4 for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters) diff --git a/code/modules/admin/topic.dm.rej b/code/modules/admin/topic.dm.rej new file mode 100644 index 0000000000..5cbae46c98 --- /dev/null +++ b/code/modules/admin/topic.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm (rejected hunks) +@@ -1175,7 +1175,7 @@ + ban_unban_log_save("[key_name(usr)] has permabanned [key_name(M)]. - Reason: [reason] - This is a permanent ban.") + log_admin_private("[key_name(usr)] has banned [key_name_admin(M)].\nReason: [reason]\nThis is a permanent ban.") + message_admins("[key_name_admin(usr)] has banned [key_name_admin(M)].\nReason: [reason]\nThis is a permanent ban.") +- feedback_inc("ban_perma",1) ++ SSblackbox.inc("ban_perma",1) + qdel(M.client) + if("Cancel") + return diff --git a/code/modules/admin/verbs/adminhelp.dm.rej b/code/modules/admin/verbs/adminhelp.dm.rej new file mode 100644 index 0000000000..047041a5fc --- /dev/null +++ b/code/modules/admin/verbs/adminhelp.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm (rejected hunks) +@@ -127,7 +127,7 @@ + log_admin_private("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins who have +BAN.") + if(admin_number_present <= 0) + to_chat(src, "No active admins are online, your adminhelp was sent to the admin irc.") +- feedback_add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + return + + /proc/get_admin_counts(requiredflags = R_BAN) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index e02b71a4d4..7a6167a986 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -23,7 +23,7 @@ usr.forceMove(T) log_admin("[key_name(usr)] jumped to [A]") message_admins("[key_name_admin(usr)] jumped to [A]") - feedback_add_details("admin_verb","Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/jumptoturf(turf/T in world) set name = "Jump to Turf" @@ -35,7 +35,7 @@ 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]") usr.loc = T - feedback_add_details("admin_verb","Jump To Turf") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Turf") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/jumptomob(mob/M in GLOB.mob_list) @@ -52,7 +52,7 @@ var/mob/A = src.mob var/turf/T = get_turf(M) if(T && isturf(T)) - feedback_add_details("admin_verb","Jump To Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! A.forceMove(M.loc) else to_chat(A, "This mob is not located in the game world.") @@ -70,7 +70,7 @@ A.x = tx A.y = ty A.z = tz - feedback_add_details("admin_verb","Jump To Coordiate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Coordiate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]") /client/proc/jumptokey() @@ -94,7 +94,7 @@ usr.forceMove(M.loc) - feedback_add_details("admin_verb","Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/Getmob(mob/M in GLOB.mob_list) set category = "Admin" @@ -138,7 +138,7 @@ if(M) M.forceMove(get_turf(usr)) usr.loc = M.loc - feedback_add_details("admin_verb","Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/sendmob(mob/M in sortmobs()) set category = "Admin" diff --git a/code/modules/admin/verbs/adminjump.dm.rej b/code/modules/admin/verbs/adminjump.dm.rej new file mode 100644 index 0000000000..d5eeea0944 --- /dev/null +++ b/code/modules/admin/verbs/adminjump.dm.rej @@ -0,0 +1,16 @@ +diff a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm (rejected hunks) +@@ -107,7 +107,7 @@ + log_admin("[key_name(usr)] teleported [key_name(M)]") + message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]") + M.forceMove(get_turf(usr)) +- feedback_add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + /client/proc/Getkey() + set category = "Admin" +@@ -149,4 +149,4 @@ + message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]") + else + to_chat(src, "Failed to move mob to a valid location.") +- feedback_add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 5c76df805a..df59c1a7bb 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -11,7 +11,7 @@ if( !ismob(M) || !M.client ) return cmd_admin_pm(M.client,null) - feedback_add_details("admin_verb","Admin PM Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Admin PM Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //shows a list of clients we could send PMs to, then forwards our choice to cmd_admin_pm /client/proc/cmd_admin_pm_panel() @@ -33,7 +33,7 @@ targets["(No Mob) - [T]"] = T var/target = input(src,"To whom shall we send a message?","Admin PM",null) as null|anything in sortList(targets) cmd_admin_pm(targets[target],null) - feedback_add_details("admin_verb","Admin PM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Admin PM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_ahelp_reply(whom) if(prefs.muted & MUTE_ADMINHELP) diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index fff294e800..173b90edca 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -18,5 +18,5 @@ msg = "ADMIN: [key_name(usr, 1)]: [msg]" to_chat(GLOB.admins, msg) - feedback_add_details("admin_verb","Asay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Asay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index 03017f494e..9a16414132 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -4,7 +4,7 @@ if(!src.holder) to_chat(src, "Only administrators may use this command.") return - feedback_add_details("admin_verb","Check Plumbing") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Check Plumbing") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //all plumbing - yes, some things might get stated twice, doesn't matter. for (var/obj/machinery/atmospherics/plumbing in GLOB.machines) @@ -27,7 +27,7 @@ if(!src.holder) to_chat(src, "Only administrators may use this command.") return - feedback_add_details("admin_verb","Check Power") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Check Power") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! for (var/datum/powernet/PN in GLOB.powernets) if (!PN.nodes || !PN.nodes.len) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 8703784fc6..37af9e8601 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -29,4 +29,4 @@ if (M.stat == DEAD || (M.client && M.client.holder && (M.client.prefs.chat_toggles & CHAT_DEAD))) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above M.show_message(rendered, 2) - feedback_add_details("admin_verb","Dsay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file + SSblackbox.add_details("admin_verb","Dsay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 54be219a48..38b0052eaf 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -13,7 +13,7 @@ message_admins("[key_name(src)] toggled debugging on.") log_admin("[key_name(src)] toggled debugging on.") - feedback_add_details("admin_verb","Toggle Debug Two") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Toggle Debug Two") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -201,7 +201,7 @@ GLOBAL_PROTECT(AdminProcCall) t+= "[env_gases[id][GAS_META][META_GAS_NAME]] : [env_gases[id][MOLES]]\n" to_chat(usr, t) - feedback_add_details("admin_verb","Air Status In Location") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Air Status In Location") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list) set category = "Fun" @@ -283,7 +283,7 @@ GLOBAL_PROTECT(AdminProcCall) for(var/datum/paiCandidate/candidate in SSpai.candidates) if(candidate.key == choice.key) SSpai.candidates.Remove(candidate) - feedback_add_details("admin_verb","Make pAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Make pAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_alienize(mob/M in GLOB.mob_list) set category = "Fun" @@ -296,7 +296,7 @@ GLOBAL_PROTECT(AdminProcCall) log_admin("[key_name(src)] has alienized [M.key].") spawn(0) M:Alienize() - feedback_add_details("admin_verb","Make Alien") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Make Alien") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] made [key_name(M)] into an alien.") message_admins("[key_name_admin(usr)] made [key_name(M)] into an alien.") else @@ -313,7 +313,7 @@ GLOBAL_PROTECT(AdminProcCall) log_admin("[key_name(src)] has slimeized [M.key].") spawn(0) M:slimeize() - feedback_add_details("admin_verb","Make Slime") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Make Slime") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] made [key_name(M)] into a slime.") message_admins("[key_name_admin(usr)] made [key_name(M)] into a slime.") else @@ -402,7 +402,7 @@ GLOBAL_PROTECT(AdminProcCall) CHECK_TICK log_admin("[key_name(src)] has deleted all ([counter]) instances of [hsbitem].") message_admins("[key_name_admin(src)] has deleted all ([counter]) instances of [hsbitem].", 0) - feedback_add_details("admin_verb","Delete All") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Delete All") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_debug_make_powernets() @@ -411,7 +411,7 @@ GLOBAL_PROTECT(AdminProcCall) SSmachines.makepowernets() log_admin("[key_name(src)] has remade the powernet. makepowernets() called.") message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0) - feedback_add_details("admin_verb","Make Powernets") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Make Powernets") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_grantfullaccess(mob/M in GLOB.mob_list) set category = "Admin" @@ -449,7 +449,7 @@ GLOBAL_PROTECT(AdminProcCall) else alert("Invalid mob") - feedback_add_details("admin_verb","Grant Full Access") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Grant Full Access") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(src)] has granted [M.key] full access.") message_admins("[key_name_admin(usr)] has granted [M.key] full access.") @@ -470,7 +470,7 @@ GLOBAL_PROTECT(AdminProcCall) M.ckey = src.ckey if( isobserver(adminmob) ) qdel(adminmob) - feedback_add_details("admin_verb","Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_areatest() set category = "Mapping" @@ -605,7 +605,7 @@ GLOBAL_PROTECT(AdminProcCall) if(isnull(custom)) return - feedback_add_details("admin_verb","Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! for (var/obj/item/I in M.get_equipped_items()) qdel(I) switch(dresscode) @@ -770,7 +770,7 @@ GLOBAL_PROTECT(AdminProcCall) return SSshuttle.clear_transit = TRUE message_admins("[key_name_admin(src)] cleared dynamic transit space.") - feedback_add_details("admin_verb","Clear Dynamic Transit") // If... + SSblackbox.add_details("admin_verb","Clear Dynamic Transit") // If... log_admin("[key_name(src)] cleared dynamic transit space.") @@ -807,5 +807,5 @@ GLOBAL_PROTECT(AdminProcCall) SSevents.scheduled = world.time message_admins("[key_name_admin(src)] pumped a random event.") - feedback_add_details("admin_verb","Pump Random Event") + SSblackbox.add_details("admin_verb","Pump Random Event") log_admin("[key_name(src)] pumped a random event.") \ No newline at end of file diff --git a/code/modules/admin/verbs/debug.dm.rej b/code/modules/admin/verbs/debug.dm.rej new file mode 100644 index 0000000000..5849ad1f2c --- /dev/null +++ b/code/modules/admin/verbs/debug.dm.rej @@ -0,0 +1,28 @@ +diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm (rejected hunks) +@@ -79,7 +79,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that + . = get_callproc_returnval(returnval, procname) + if(.) + to_chat(usr, .) +- feedback_add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + /client/proc/callproc_datum(datum/A as null|area|mob|obj|turf) + set category = "Debug" +@@ -104,7 +104,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that + return + log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") + message_admins("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") +- feedback_add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + var/returnval = call(A,procname)(arglist(lst)) // Pass the lst as an argument list to the proc + . = get_callproc_returnval(returnval,procname) +@@ -758,7 +758,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that + GLOB.medals_enabled = !GLOB.medals_enabled + + message_admins("[key_name_admin(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") +- feedback_add_details("admin_verb","Toggle Medal Disable") // If... ++ SSblackbox.add_details("admin_verb","Toggle Medal Disable") // If... + log_admin("[key_name(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") + + /client/proc/view_runtimes() diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 26bfe6883b..15b619f653 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -16,7 +16,7 @@ to_chat(usr, "@[target.x],[target.y]: [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]") for(var/id in GM_gases) to_chat(usr, "[GM_gases[id][GAS_META][META_GAS_NAME]]: [GM_gases[id][MOLES]]") - feedback_add_details("admin_verb","Show Air Status") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Air Status") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/fix_next_move() set category = "Debug" @@ -46,7 +46,7 @@ message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!") message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!") message_admins("world.time = [world.time]") - feedback_add_details("admin_verb","Unfreeze Everyone") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Unfreeze Everyone") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/radio_report() @@ -84,7 +84,7 @@ output += "    [device]
" usr << browse(output,"window=radioreport") - feedback_add_details("admin_verb","Show Radio Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Radio Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/reload_admins() set name = "Reload Admins" @@ -98,5 +98,5 @@ return load_admins() - feedback_add_details("admin_verb","Reload All Admins") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Reload All Admins") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! message_admins("[key_name_admin(usr)] manually reloaded admins") diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm index 7ec0569807..6f77ee7e50 100644 --- a/code/modules/admin/verbs/fps.dm +++ b/code/modules/admin/verbs/fps.dm @@ -19,6 +19,6 @@ var/msg = "[key_name(src)] has modified world.fps to [new_fps]" log_admin(msg, 0) message_admins(msg, 0) - feedback_add_details("admin_toggle","Set Server FPS|[new_fps]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Set Server FPS|[new_fps]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! world.fps = new_fps diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index c4db5305d4..7624a9443e 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -90,7 +90,7 @@ else to_chat(src, "Server log not found, try using .getserverlog.") return - feedback_add_details("admin_verb","Show Server Log") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Server Log") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return //Shows today's attack log @@ -104,5 +104,5 @@ else to_chat(src, "Server attack log not found, try using .getserverlog.") return - feedback_add_details("admin_verb","Show Server Attack log") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Server Attack log") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return diff --git a/code/modules/admin/verbs/machine_upgrade.dm b/code/modules/admin/verbs/machine_upgrade.dm index 340130bb75..9a22623bfe 100644 --- a/code/modules/admin/verbs/machine_upgrade.dm +++ b/code/modules/admin/verbs/machine_upgrade.dm @@ -7,4 +7,4 @@ P.rating = new_rating M.RefreshParts() - feedback_add_details("admin_toggle","Machine Upgrade|[new_rating]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Machine Upgrade|[new_rating]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 9b8948cd13..66d04a4159 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -81,7 +81,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( seen[T]++ for(var/turf/T in seen) T.maptext = "[seen[T]]" - feedback_add_details("admin_verb","Show Camera Range") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Camera Range") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( output += "" usr << browse(output,"window=airreport;size=1000x500") - feedback_add_details("admin_verb","Show Camera Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Camera Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/intercom_view() set category = "Mapping" @@ -144,7 +144,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T) if (!(F in view(7,I.loc))) qdel(F) - feedback_add_details("admin_verb","Show Intercom Range") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Intercom Range") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_show_at_list() set category = "Mapping" @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( usr << browse(dat, "window=at_list") - feedback_add_details("admin_verb","Show Roundstart Active Turfs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Show Roundstart Active Turfs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/enable_debug_verbs() set category = "Debug" @@ -169,14 +169,14 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( return verbs -= /client/proc/enable_debug_verbs verbs.Add(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_mapping) - feedback_add_details("admin_verb","Enable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Enable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/disable_debug_verbs() set category = "Debug" set name = "Debug verbs - Disable" verbs.Remove(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_mapping) verbs += /client/proc/enable_debug_verbs - feedback_add_details("admin_verb", "Disable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb", "Disable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/count_objects_on_z_level() set category = "Mapping" @@ -219,7 +219,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( to_chat(world, line)*/ to_chat(world, "There are [count] objects of type [type_path] on z-level [num_level]") - feedback_add_details("admin_verb","Count Objects Zlevel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Count Objects Zlevel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/count_objects_all() set category = "Mapping" @@ -246,7 +246,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( to_chat(world, line)*/ to_chat(world, "There are [count] objects of type [type_path] in the game world") - feedback_add_details("admin_verb","Count Objects All") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Count Objects All") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //This proc is intended to detect lag problems relating to communication procs diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index 3423f9ebd9..eace5e471d 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -12,7 +12,7 @@ method = vv_subtype_prompt(A.type) src.massmodify_variables(A, var_name, method) - feedback_add_details("admin_verb","Mass Edit Variables") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Mass Edit Variables") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/massmodify_variables(datum/O, var_name = "", method = 0) if(!check_rights(R_VAREDIT)) diff --git a/code/modules/admin/verbs/panicbunker.dm.rej b/code/modules/admin/verbs/panicbunker.dm.rej new file mode 100644 index 0000000000..5a4748cc3a --- /dev/null +++ b/code/modules/admin/verbs/panicbunker.dm.rej @@ -0,0 +1,8 @@ +diff a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm (rejected hunks) +@@ -11,5 +11,5 @@ + message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"enabled":"disabled")].") + if (config.panic_bunker && (!GLOB.dbcon || !GLOB.dbcon.IsConnected())) + message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.") +- feedback_add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //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 cb2d0553b1..019fda5a23 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -25,7 +25,7 @@ if(M.client.prefs.toggles & SOUND_MIDI) M << admin_sound - feedback_add_details("admin_verb","Play Global Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Play Global Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/play_local_sound(S as sound) @@ -37,7 +37,7 @@ log_admin("[key_name(src)] played a local sound [S]") message_admins("[key_name_admin(src)] played a local sound [S]") playsound(get_turf(src.mob), S, 50, 0, 0) - feedback_add_details("admin_verb","Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/set_round_end_sound(S as sound) set category = "Fun" @@ -52,7 +52,7 @@ log_admin("[key_name(src)] set the round end sound to [S]") message_admins("[key_name_admin(src)] set the round end sound to [S]") - feedback_add_details("admin_verb","Set Round End Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Set Round End Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/stop_sounds() set category = "Debug" @@ -65,4 +65,4 @@ for(var/mob/M in GLOB.player_list) if(M.client) M << sound(null) - feedback_add_details("admin_verb","Stop All Playing Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Stop All Playing Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index a7039512f7..86408df8a7 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -23,7 +23,7 @@ usr.name = O.name usr.client.eye = O usr.control_object = O - feedback_add_details("admin_verb","Possess Object") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Possess Object") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /proc/release(obj/O in world) set name = "Release Obj" @@ -41,7 +41,7 @@ usr.loc = O.loc usr.client.eye = usr usr.control_object = null - feedback_add_details("admin_verb","Release Object") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Release Object") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /proc/givetestverbs(mob/M in GLOB.mob_list) set desc = "Give this guy possess/release verbs" @@ -49,4 +49,4 @@ set name = "Give Possessing Verbs" M.verbs += /proc/possess M.verbs += /proc/release - feedback_add_details("admin_verb","Give Possessing Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Give Possessing Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 39f31183a2..5a1caafc43 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -43,7 +43,7 @@ C << 'sound/effects/pray.ogg' to_chat(usr, "Your prayers have been received by the gods.") - feedback_add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]") /proc/Centcomm_announce(text , mob/Sender) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index b447c2a745..6e77b8daf8 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -62,7 +62,7 @@ to_chat(world, "[msg]") log_admin("GlobalNarrate: [key_name(usr)] : [msg]") message_admins("[key_name_admin(usr)] Sent a global narrate") - feedback_add_details("admin_verb","Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_direct_narrate(mob/M) set category = "Special Verbs" @@ -110,7 +110,7 @@ log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]") message_admins(" LocalNarrate: [key_name_admin(usr)] at ([get_area(A)]): [msg]
") - feedback_add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list) set category = "Special Verbs" @@ -187,7 +187,7 @@ message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(whom)] from [mute_string].") if(C) to_chat(C, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.") - feedback_add_details("admin_toggle","Auto Mute [feedback_string]|1") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Auto Mute [feedback_string]|1") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return if(P.muted & mute_type) @@ -201,7 +201,7 @@ message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(whom)] from [mute_string].") if(C) to_chat(C, "You have been [muteunmute] from [mute_string] by [key_name(usr, include_name = FALSE)].") - feedback_add_details("admin_toggle","Mute [feedback_string]|[P.muted & mute_type]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Mute [feedback_string]|[P.muted & mute_type]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //I use this proc for respawn character too. /N @@ -423,7 +423,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(new_character, "You have been fully respawned. Enjoy the game.") - feedback_add_details("admin_verb","Respawn Character") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Respawn Character") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return new_character /client/proc/cmd_admin_add_freeform_ai_law() @@ -446,7 +446,7 @@ Traitors and the like can also be revived with the previous role mostly intact. ion.announceEvent = announce_ion_laws ion.ionMessage = input - feedback_add_details("admin_verb","Add Custom AI Law") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Add Custom AI Law") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_rejuvenate(mob/living/M in GLOB.mob_list) set category = "Special Verbs" @@ -490,7 +490,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report") - feedback_add_details("admin_verb","Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_change_command_name() set category = "Special Verbs" @@ -516,7 +516,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if (alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes") log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])") message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])") - feedback_add_details("admin_verb","Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! if(isturf(O)) var/turf/T = O T.ChangeTurf(T.baseturf) @@ -531,7 +531,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(src, "Only administrators may use this command.") return holder.manage_free_slots() - feedback_add_details("admin_verb","Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world) set category = "Special Verbs" @@ -560,7 +560,7 @@ Traitors and the like can also be revived with the previous role mostly intact. explosion(O, devastation, heavy, light, flash, null, null,flames) log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])") message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])") - feedback_add_details("admin_verb","Explosion") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Explosion") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return else return @@ -583,7 +583,7 @@ Traitors and the like can also be revived with the previous role mostly intact. empulse(O, heavy, light) log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])") message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[light]) at ([O.x],[O.y],[O.z])") - feedback_add_details("admin_verb","EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return else @@ -614,7 +614,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M.gib() else M.gib(1) - feedback_add_details("admin_verb","Gib") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Gib") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_gib_self() set name = "Gibself" @@ -624,7 +624,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(confirm == "Yes") log_admin("[key_name(usr)] used gibself.") message_admins("[key_name_admin(usr)] used gibself.") - feedback_add_details("admin_verb","Gib Self") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Gib Self") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! mob.gib(1, 1, 1) /client/proc/cmd_admin_check_contents(mob/living/M in GLOB.mob_list) @@ -634,7 +634,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/list/L = M.get_contents() for(var/t in L) to_chat(usr, "[t]") - feedback_add_details("admin_verb","Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_view_range() set category = "Special Verbs" @@ -649,7 +649,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(usr)] changed their view range to [view].") //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI - feedback_add_details("admin_toggle","Change View Range|[view]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Change View Range|[view]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_call_shuttle() @@ -668,7 +668,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return SSshuttle.emergency.request() - feedback_add_details("admin_verb","Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.") return @@ -685,7 +685,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return SSshuttle.emergency.cancel() - feedback_add_details("admin_verb","Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.") @@ -720,7 +720,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet.") config.force_random_names = 1 - feedback_add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_random_events() @@ -735,7 +735,7 @@ Traitors and the like can also be revived with the previous role mostly intact. config.allow_random_events = 0 to_chat(usr, "Random events disabled") message_admins("Admin [key_name_admin(usr)] has disabled random events.") - feedback_add_details("admin_toggle","Toggle Random Events|[config.allow_random_events]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Random Events|[config.allow_random_events]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_change_sec_level() @@ -753,7 +753,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(usr)] changed the security level to [level]") message_admins("[key_name_admin(usr)] changed the security level to [level]") - feedback_add_details("admin_verb","Set Security Level [capitalize(level)]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Set Security Level [capitalize(level)]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list) set name = "Toggle Nuke" @@ -772,7 +772,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(usr)] [N.timing ? "activated" : "deactivated"] a nuke at ([N.x],[N.y],[N.z]).") message_admins("[ADMIN_LOOKUPFLW(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [ADMIN_COORDJMP(N)].") - feedback_add_details("admin_toggle","Toggle Nuke|[N.timing]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Nuke|[N.timing]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits @@ -970,7 +970,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits to_chat(usr, "You toggled your admin antag HUD [adding_hud ? "ON" : "OFF"].") message_admins("[key_name_admin(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].") log_admin("[key_name(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].") - feedback_add_details("admin_toggle","Toggle Antag HUD|[adding_hud]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Antag HUD|[adding_hud]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/has_antag_hud() var/datum/atom_hud/A = GLOB.huds[ANTAG_HUD_TRAITOR] @@ -1002,7 +1002,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] added a latent zombie infection to all humans.") log_admin("[key_name(usr)] added a latent zombie infection to all humans.") - feedback_add_details("admin_verb","Mass Zombie Infection") + SSblackbox.add_details("admin_verb","Mass Zombie Infection") /client/proc/mass_zombie_cure() set category = "Fun" @@ -1020,7 +1020,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] cured all zombies.") log_admin("[key_name(usr)] cured all zombies.") - feedback_add_details("admin_verb","Mass Zombie Cure") + SSblackbox.add_details("admin_verb","Mass Zombie Cure") /client/proc/polymorph_all() set category = "Fun" @@ -1039,7 +1039,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] started polymorphed all living mobs.") log_admin("[key_name(usr)] polymorphed all living mobs.") - feedback_add_details("admin_verb","Polymorph All") + SSblackbox.add_details("admin_verb","Polymorph All") for(var/mob/living/M in mobs) CHECK_TICK @@ -1080,7 +1080,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] sent a tip of the round.") log_admin("[key_name(usr)] sent \"[input]\" as the Tip of the Round.") - feedback_add_details("admin_verb","Show Tip") + SSblackbox.add_details("admin_verb","Show Tip") #define ON_PURRBATION(H) (!(H.dna.features["tail_human"] == "None" && H.dna.features["ears"] == "None")) @@ -1157,7 +1157,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits if (world.visibility && !world.reachable) message_admins("WARNING: The server will not show up on the hub because byond is detecting that a filewall is blocking incoming connections.") - feedback_add_details("admin_toggle","Toggled Hub Visibility|[world.visibility]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggled Hub Visibility|[world.visibility]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/smite(mob/living/carbon/human/target as mob) set name = "Smite" diff --git a/code/modules/admin/verbs/randomverbs.dm.rej b/code/modules/admin/verbs/randomverbs.dm.rej new file mode 100644 index 0000000000..5622cb5975 --- /dev/null +++ b/code/modules/admin/verbs/randomverbs.dm.rej @@ -0,0 +1,46 @@ +diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm (rejected hunks) +@@ -16,7 +16,7 @@ + + log_admin("[key_name(usr)] made [key_name(M)] drop everything!") + message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!") +- feedback_add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + + /client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list) +@@ -42,7 +42,7 @@ + + log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") + message_admins(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]") +- feedback_add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + /client/proc/cmd_admin_world_narrate() + set category = "Special Verbs" +@@ -83,7 +83,7 @@ + to_chat(M, msg) + log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]") + message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
") +- feedback_add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + /client/proc/cmd_admin_local_narrate(atom/A) + set category = "Special Verbs" +@@ -118,7 +118,7 @@ + + log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") + message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") +- feedback_add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + + /proc/cmd_admin_mute(whom, mute_type, automute = 0) +@@ -448,7 +448,7 @@ Traitors and the like can also be revived with the previous role mostly intact. + + log_admin("[key_name(usr)] healed / revived [key_name(M)]") + message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!") +- feedback_add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + /client/proc/cmd_admin_create_centcom_report() + set category = "Special Verbs" diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm.rej b/code/modules/admin/verbs/reestablish_db_connection.dm.rej new file mode 100644 index 0000000000..b0aca5351d --- /dev/null +++ b/code/modules/admin/verbs/reestablish_db_connection.dm.rej @@ -0,0 +1,15 @@ +diff a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm (rejected hunks) +@@ -17,11 +17,11 @@ + GLOB.dbcon.Disconnect() + log_admin("[key_name(usr)] has forced the database to disconnect") + message_admins("[key_name_admin(usr)] has forced the database to disconnect!") +- feedback_add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + log_admin("[key_name(usr)] is attempting to re-established the DB Connection") + message_admins("[key_name_admin(usr)] is attempting to re-established the DB Connection") +- feedback_add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ++ SSblackbox.add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + GLOB.dbcon.failed_connections = 0 + if(!GLOB.dbcon.Connect()) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 0b6f2db5b7..7b49145895 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -21,7 +21,7 @@ attach(A2,user) name = "[A.name]-[A2.name] assembly" update_icon() - feedback_add_details("assembly_made","[initial(A.name)]-[initial(A2.name)]") + SSblackbox.add_details("assembly_made","[initial(A.name)]-[initial(A2.name)]") /obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user) if(!A.remove_item_from_storage(src)) diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm index dda86e5257..6f81d884e0 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -103,8 +103,8 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they var/amount = get_amount(O) total_cost += cost total_amount += amount - feedback_add_details("export_sold_amount","[O.type]|[amount]") - feedback_add_details("export_sold_cost","[O.type]|[cost]") + SSblackbox.add_details("export_sold_amount","[O.type]|[amount]") + SSblackbox.add_details("export_sold_cost","[O.type]|[cost]") // Total printout for the cargo console. // Called before the end of current export cycle. diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 8ee179cdab..74cbc70b87 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -6,7 +6,7 @@ prefs.chat_toggles ^= CHAT_GHOSTEARS to_chat(src, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") prefs.save_preferences() - feedback_add_details("preferences_verb","Toggle Ghost Ears|[prefs.chat_toggles & CHAT_GHOSTEARS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Ghost Ears|[prefs.chat_toggles & CHAT_GHOSTEARS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_ghost_sight() set name = "Show/Hide GhostSight" @@ -15,7 +15,7 @@ prefs.chat_toggles ^= CHAT_GHOSTSIGHT to_chat(src, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") prefs.save_preferences() - feedback_add_details("preferences_verb","Toggle Ghost Sight|[prefs.chat_toggles & CHAT_GHOSTSIGHT]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Ghost Sight|[prefs.chat_toggles & CHAT_GHOSTSIGHT]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_ghost_whispers() set name = "Show/Hide GhostWhispers" @@ -24,7 +24,7 @@ prefs.chat_toggles ^= CHAT_GHOSTWHISPER to_chat(src, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"].") prefs.save_preferences() - feedback_add_details("preferences_verb","Toggle Ghost Whispers|[prefs.chat_toggles & CHAT_GHOSTWHISPER]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Ghost Whispers|[prefs.chat_toggles & CHAT_GHOSTWHISPER]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_ghost_radio() set name = "Show/Hide GhostRadio" @@ -33,7 +33,7 @@ prefs.chat_toggles ^= CHAT_GHOSTRADIO to_chat(src, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTRADIO) ? "see radio chatter" : "not see radio chatter"].") prefs.save_preferences() - feedback_add_details("preferences_verb","Toggle Ghost Radio|[prefs.chat_toggles & CHAT_GHOSTRADIO]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //social experiment, increase the generation whenever you copypaste this shamelessly GENERATION 1 + SSblackbox.add_details("preferences_verb","Toggle Ghost Radio|[prefs.chat_toggles & CHAT_GHOSTRADIO]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //social experiment, increase the generation whenever you copypaste this shamelessly GENERATION 1 /client/verb/toggle_ghost_pda() set name = "Show/Hide GhostPDA" @@ -42,7 +42,7 @@ prefs.chat_toggles ^= CHAT_GHOSTPDA to_chat(src, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTPDA) ? "see all pda messages in the world" : "only see pda messages from nearby mobs"].") prefs.save_preferences() - feedback_add_details("preferences_verb","Toggle Ghost PDA|[prefs.chat_toggles & CHAT_GHOSTPDA]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Ghost PDA|[prefs.chat_toggles & CHAT_GHOSTPDA]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //please be aware that the following two verbs have inverted stat output, so that "Toggle Deathrattle|1" still means you activated it /client/verb/toggle_deathrattle() @@ -52,7 +52,7 @@ prefs.toggles ^= DISABLE_DEATHRATTLE prefs.save_preferences() to_chat(usr, "You will [(prefs.toggles & DISABLE_DEATHRATTLE) ? "no longer" : "now"] get messages when a sentient mob dies.") - feedback_add_details("preferences_verb", "Toggle Deathrattle|[!(prefs.toggles & DISABLE_DEATHRATTLE)]") //If you are copy-pasting this, maybe you should spend some time reading the comments. + SSblackbox.add_details("preferences_verb", "Toggle Deathrattle|[!(prefs.toggles & DISABLE_DEATHRATTLE)]") //If you are copy-pasting this, maybe you should spend some time reading the comments. /client/verb/toggle_arrivalrattle() set name = "Toggle Arrivalrattle" @@ -61,7 +61,7 @@ prefs.toggles ^= DISABLE_ARRIVALRATTLE to_chat(usr, "You will [(prefs.toggles & DISABLE_ARRIVALRATTLE) ? "no longer" : "now"] get messages when someone joins the station.") prefs.save_preferences() - feedback_add_details("preferences_verb", "Toggle Arrivalrattle|[!(prefs.toggles & DISABLE_ARRIVALRATTLE)]") //If you are copy-pasting this, maybe you should rethink where your life went so wrong. + SSblackbox.add_details("preferences_verb", "Toggle Arrivalrattle|[!(prefs.toggles & DISABLE_ARRIVALRATTLE)]") //If you are copy-pasting this, maybe you should rethink where your life went so wrong. /client/verb/togglemidroundantag() set name = "Toggle Midround Antagonist" @@ -70,7 +70,7 @@ prefs.toggles ^= MIDROUND_ANTAG prefs.save_preferences() to_chat(src, "You will [(prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions.") - feedback_add_details("preferences_verb","Toggle Midround Antag|[prefs.toggles & MIDROUND_ANTAG]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Midround Antag|[prefs.toggles & MIDROUND_ANTAG]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggletitlemusic() set name = "Hear/Silence LobbyMusic" @@ -85,7 +85,7 @@ else to_chat(src, "You will no longer hear music in the game lobby.") mob.stop_sound_channel(CHANNEL_LOBBYMUSIC) - feedback_add_details("preferences_verb","Toggle Lobby Music|[prefs.toggles & SOUND_LOBBY]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Lobby Music|[prefs.toggles & SOUND_LOBBY]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglemidis() set name = "Hear/Silence Midis" @@ -98,14 +98,14 @@ else to_chat(src, "You will no longer hear sounds uploaded by admins") mob.stop_sound_channel(CHANNEL_ADMIN) - feedback_add_details("preferences_verb","Toggle Hearing Midis|[prefs.toggles & SOUND_MIDI]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Hearing Midis|[prefs.toggles & SOUND_MIDI]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/stop_client_sounds() set name = "Stop Sounds" set category = "Preferences" set desc = "Kills all currently playing sounds, use if admin taste in midis a shite" src << sound(null) - feedback_add_details("preferences_verb","Stop Self Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Stop Self Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/listen_ooc() set name = "Show/Hide OOC" @@ -114,7 +114,7 @@ prefs.chat_toggles ^= CHAT_OOC prefs.save_preferences() to_chat(src, "You will [(prefs.chat_toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") - feedback_add_details("preferences_verb","Toggle Seeing OOC|[prefs.chat_toggles & CHAT_OOC]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Seeing OOC|[prefs.chat_toggles & CHAT_OOC]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful set name = "Hear/Silence Ambience" @@ -128,7 +128,7 @@ to_chat(src, "You will no longer hear ambient sounds.") src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1) src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) - feedback_add_details("preferences_verb","Toggle Ambience|[prefs.toggles & SOUND_AMBIENCE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Ambience|[prefs.toggles & SOUND_AMBIENCE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! // This needs a toggle because you people are awful and spammed terrible music /client/verb/toggle_instruments() @@ -141,7 +141,7 @@ to_chat(src, "You will now hear people playing musical instruments.") else to_chat(src, "You will no longer hear musical instruments.") - feedback_add_details("preferences_verb","Toggle Instruments|[prefs.toggles & SOUND_INSTRUMENTS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Instruments|[prefs.toggles & SOUND_INSTRUMENTS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //Lots of people get headaches from the normal ship ambience, this is to prevent that /client/verb/toggle_ship_ambience() @@ -156,7 +156,7 @@ to_chat(src, "You will no longer hear ship ambience.") src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) src.ambience_playing = 0 - feedback_add_details("preferences_verb", "Toggle Ship Ambience|[prefs.toggles & SOUND_SHIP_AMBIENCE]") //If you are copy-pasting this, I bet you read this comment expecting to see the same thing :^) + SSblackbox.add_details("preferences_verb", "Toggle Ship Ambience|[prefs.toggles & SOUND_SHIP_AMBIENCE]") //If you are copy-pasting this, I bet you read this comment expecting to see the same thing :^) GLOBAL_LIST_INIT(ghost_forms, list("ghost","ghostking","ghostian2","skeleghost","ghost_red","ghost_black", \ "ghost_blue","ghost_yellow","ghost_green","ghost_pink", \ @@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.toggles ^= INTENT_STYLE to_chat(src, "[(prefs.toggles & INTENT_STYLE) ? "Clicking directly on intents selects them." : "Clicking on intents rotates selection clockwise."]") prefs.save_preferences() - feedback_add_details("preferences_verb","Toggle Intent Selection|[prefs.toggles & INTENT_STYLE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Intent Selection|[prefs.toggles & INTENT_STYLE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/setup_character() set name = "Game Preferences" @@ -263,7 +263,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.save_preferences() if(isobserver(mob)) mob.hud_used.show_hud() - feedback_add_details("preferences_verb","Toggle Ghost HUD|[prefs.ghost_hud]") + SSblackbox.add_details("preferences_verb","Toggle Ghost HUD|[prefs.ghost_hud]") /client/verb/toggle_inquisition() // warning: unexpected inquisition set name = "Toggle Inquisitiveness" @@ -276,7 +276,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS to_chat(src, "You will now examine everything you click on.") else to_chat(src, "You will no longer examine things you click on.") - feedback_add_details("preferences_verb","Toggle Ghost Inquisitiveness|[prefs.inquisitive_ghost]") + SSblackbox.add_details("preferences_verb","Toggle Ghost Inquisitiveness|[prefs.inquisitive_ghost]") /client/verb/toggle_announcement_sound() set name = "Hear/Silence Announcements" @@ -285,7 +285,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.toggles ^= SOUND_ANNOUNCEMENTS to_chat(src, "You will now [(prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"].") prefs.save_preferences() - feedback_add_details("preferences_verb","Toggle Announcement Sound|[prefs.toggles & SOUND_ANNOUNCEMENTS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("preferences_verb","Toggle Announcement Sound|[prefs.toggles & SOUND_ANNOUNCEMENTS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //Admin Preferences /client/proc/toggleadminhelpsound() @@ -297,7 +297,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.toggles ^= SOUND_ADMINHELP prefs.save_preferences() to_chat(usr, "You will [(prefs.toggles & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.") - feedback_add_details("admin_toggle","Toggle Adminhelp Sound|[prefs.toggles & SOUND_ADMINHELP]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Adminhelp Sound|[prefs.toggles & SOUND_ADMINHELP]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggleannouncelogin() set name = "Do/Don't Announce Login" @@ -308,7 +308,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.toggles ^= ANNOUNCE_LOGIN prefs.save_preferences() to_chat(usr, "You will [(prefs.toggles & ANNOUNCE_LOGIN) ? "now" : "no longer"] have an announcement to other admins when you login.") - feedback_add_details("admin_toggle","Toggle Login Announcement|[prefs.toggles & ANNOUNCE_LOGIN]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Login Announcement|[prefs.toggles & ANNOUNCE_LOGIN]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_hear_radio() set name = "Show/Hide Radio Chatter" @@ -318,7 +318,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.chat_toggles ^= CHAT_RADIO prefs.save_preferences() to_chat(usr, "You will [(prefs.chat_toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from nearby radios or speakers") - feedback_add_details("admin_toggle","Toggle Radio Chatter|[prefs.chat_toggles & CHAT_RADIO]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Radio Chatter|[prefs.chat_toggles & CHAT_RADIO]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/deadchat() set name = "Show/Hide Deadchat" @@ -327,7 +327,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.chat_toggles ^= CHAT_DEAD prefs.save_preferences() to_chat(src, "You will [(prefs.chat_toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") - feedback_add_details("admin_toggle","Toggle Deadchat Visibility|[prefs.chat_toggles & CHAT_DEAD]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Deadchat Visibility|[prefs.chat_toggles & CHAT_DEAD]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggleprayers() set name = "Show/Hide Prayers" @@ -336,7 +336,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.chat_toggles ^= CHAT_PRAYER prefs.save_preferences() to_chat(src, "You will [(prefs.chat_toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.") - feedback_add_details("admin_toggle","Toggle Prayer Visibility|[prefs.chat_toggles & CHAT_PRAYER]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Prayer Visibility|[prefs.chat_toggles & CHAT_PRAYER]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggleprayersounds() set name = "Hear/Silence Prayer Sounds" @@ -348,4 +348,4 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS to_chat(src, "You will now hear prayer sounds.") else to_chat(src, "You will no longer prayer sounds.") - feedback_add_details("admin_toggle", "Toggle Prayer Sounds|[prefs.toggles & SOUND_PRAYERS]") + SSblackbox.add_details("admin_toggle", "Toggle Prayer Sounds|[prefs.toggles & SOUND_PRAYERS]") diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 79b21dccee..97e05ee221 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -108,7 +108,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, OOC_COLOR) if(new_ooccolor) prefs.ooccolor = sanitize_ooccolor(new_ooccolor) prefs.save_preferences() - feedback_add_details("admin_verb","Set OOC Color") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Set OOC Color") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/verb/resetcolorooc() diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index 77d1e1d6d9..a14d301a31 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -124,7 +124,7 @@ var/atom/movable/I = new R.result (get_turf(user.loc)) I.CheckParts(parts, R) if(send_feedback) - feedback_add_details("object_crafted","[I.type]") + SSblackbox.add_details("object_crafted","[I.type]") return 0 return "." return ", missing tool." diff --git a/code/modules/events/_event.dm.rej b/code/modules/events/_event.dm.rej new file mode 100644 index 0000000000..fefa119632 --- /dev/null +++ b/code/modules/events/_event.dm.rej @@ -0,0 +1,17 @@ +diff a/code/modules/events/_event.dm b/code/modules/events/_event.dm (rejected hunks) +@@ -78,13 +78,13 @@ + triggering = FALSE + message_admins("[key_name_admin(usr)] cancelled event [name].") + log_admin_private("[key_name(usr)] cancelled event [name].") +- feedback_add_details("admin_verb","Cancel Event: [typepath]") ++ SSblackbox.add_details("admin_verb","Cancel Event: [typepath]") + + /datum/round_event_control/proc/runEvent(random) + var/datum/round_event/E = new typepath() + E.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) + E.control = src +- feedback_add_details("event_ran","[E]") ++ SSblackbox.add_details("event_ran","[E]") + occurrences++ + + testing("[time2text(world.time, "hh:mm:ss")] [E.type]") diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index d50c80567a..148541922f 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -170,7 +170,7 @@ if(istype(A, B)) continue contents_loop qdel(A) - feedback_add_details("food_made","[type]") + SSblackbox.add_details("food_made","[type]") if(bonus_reagents && bonus_reagents.len) for(var/r_id in bonus_reagents) @@ -262,7 +262,7 @@ initialize_cooked_food(S, M.efficiency) else initialize_cooked_food(S, 1) - feedback_add_details("food_made","[type]") + SSblackbox.add_details("food_made","[type]") else new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src) if(M && M.dirty < 100) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 6274716f0d..4a2f0948d9 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -142,7 +142,7 @@ return for(var/i in 1 to (C+processor.rating_amount-1)) new S.coretype(loc) - feedback_add_details("slime_core_harvested","[replacetext(S.colour," ","_")]") + SSblackbox.add_details("slime_core_harvested","[replacetext(S.colour," ","_")]") ..() /datum/food_processor_process/mob/slime/input = /mob/living/simple_animal/slime diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 42e424d109..0d3cdea2fc 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -150,7 +150,7 @@ t_amount++ product_name = t_prod.name if(getYield() >= 1) - feedback_add_details("food_harvested","[product_name]|[getYield()]") + SSblackbox.add_details("food_harvested","[product_name]|[getYield()]") parent.update_tray() return result diff --git a/code/modules/jobs/job_types/civilian_chaplain.dm b/code/modules/jobs/job_types/civilian_chaplain.dm index 19ae279c50..a4eb96b745 100644 --- a/code/modules/jobs/job_types/civilian_chaplain.dm +++ b/code/modules/jobs/job_types/civilian_chaplain.dm @@ -82,8 +82,8 @@ Chaplain H.equip_to_slot_or_del(B, slot_in_backpack) - feedback_set_details("religion_name","[new_religion]") - feedback_set_details("religion_deity","[new_deity]") + SSblackbox.set_details("religion_name","[new_religion]") + SSblackbox.set_details("religion_deity","[new_deity]") /datum/outfit/job/chaplain name = "Chaplain" diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index b98a3cfd98..8c2d1ca281 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -131,7 +131,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also /obj/machinery/computer/auxillary_base/onShuttleMove(turf/T1, rotation) ..() if(z == ZLEVEL_MINING) //Avoids double logging and landing on other Z-levels due to badminnery - feedback_add_details("colonies_dropped", "[x]|[y]|[z]") //Number of times a base has been dropped! + SSblackbox.add_details("colonies_dropped", "[x]|[y]|[z]") //Number of times a base has been dropped! /obj/machinery/computer/auxillary_base/proc/set_mining_mode() if(z == ZLEVEL_MINING) //The console switches to controlling the mining shuttle once landed. diff --git a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm index 36c3053143..144a2634ba 100644 --- a/code/modules/mining/equipment.dm +++ b/code/modules/mining/equipment.dm @@ -320,7 +320,7 @@ H.attack_same = 0 loaded = 0 user.visible_message("[user] injects [M] with [src], reviving it.") - feedback_add_details("lazarus_injector", "[M.type]") + SSblackbox.add_details("lazarus_injector", "[M.type]") playsound(src,'sound/effects/refill.ogg',50,1) icon_state = "lazarus_empty" return diff --git a/code/modules/mining/equipment.dm.rej b/code/modules/mining/equipment.dm.rej new file mode 100644 index 0000000000..b8c7edb1c9 --- /dev/null +++ b/code/modules/mining/equipment.dm.rej @@ -0,0 +1,26 @@ +diff a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm (rejected hunks) +@@ -68,7 +68,7 @@ + + /obj/item/device/wormhole_jaunter/attack_self(mob/user) + user.visible_message("[user.name] activates the [src.name]!") +- feedback_add_details("jaunter", "U") // user activated ++ SSblackbox.add_details("jaunter", "U") // user activated + activate(user) + + /obj/item/device/wormhole_jaunter/proc/turf_check(mob/user) +@@ -124,13 +124,13 @@ + + if(triggered) + usr.visible_message("The [src] overloads and activates!") +- feedback_add_details("jaunter","E") // EMP accidental activation ++ SSblackbox.add_details("jaunter","E") // EMP accidental activation + activate(usr) + + /obj/item/device/wormhole_jaunter/proc/chasm_react(mob/user) + if(user.get_item_by_slot(slot_belt) == src) + to_chat(user, "Your [src] activates, saving you from the chasm!") +- feedback_add_details("jaunter","C") // chasm automatic activation ++ SSblackbox.add_details("jaunter","C") // chasm automatic activation + activate(user) + else + to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.") diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 95f8d2d9bd..911a4d97df 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -140,7 +140,7 @@ return new /obj/effect/particle_effect/smoke(user.loc) user.forceMove(get_turf(linked)) - feedback_add_details("warp_cube","[src.type]") + SSblackbox.add_details("warp_cube","[src.type]") new /obj/effect/particle_effect/smoke(user.loc) /obj/item/device/warp_cube/red diff --git a/code/modules/mining/lavaland/necropolis_chests.dm.rej b/code/modules/mining/lavaland/necropolis_chests.dm.rej new file mode 100644 index 0000000000..60981a7456 --- /dev/null +++ b/code/modules/mining/lavaland/necropolis_chests.dm.rej @@ -0,0 +1,28 @@ +diff a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm (rejected hunks) +@@ -87,7 +87,7 @@ + user.sight |= SEE_MOBS + icon_state = "lantern" + wisp.orbit(user, 20) +- feedback_add_details("wisp_lantern","F") // freed ++ SSblackbox.add_details("wisp_lantern","F") // freed + + else + to_chat(user, "You return the wisp to the lantern.") +@@ -102,7 +102,7 @@ + wisp.stop_orbit() + wisp.loc = src + icon_state = "lantern-blue" +- feedback_add_details("wisp_lantern","R") // returned ++ SSblackbox.add_details("wisp_lantern","R") // returned + + /obj/item/device/wisp_lantern/Initialize() + ..() +@@ -229,7 +229,7 @@ + + /obj/item/device/immortality_talisman/attack_self(mob/user) + if(cooldown < world.time) +- feedback_add_details("immortality_talisman","U") // usage ++ SSblackbox.add_details("immortality_talisman","U") // usage + cooldown = world.time + 600 + user.visible_message("[user] vanishes from reality, leaving a a hole in [user.p_their()] place!") + var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc)) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index dc6bc87d18..0d651518b7 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -136,7 +136,7 @@ else inserted_id.mining_points -= prize.cost new prize.equipment_path(src.loc) - feedback_add_details("mining_equipment_bought", + SSblackbox.add_details("mining_equipment_bought", "[src.type]|[prize.equipment_path]") // Add src.type to keep track of free golem purchases // seperately. @@ -189,7 +189,7 @@ if("Mining Conscription Kit") new /obj/item/weapon/storage/backpack/dufflebag/mining_conscript(loc) - feedback_add_details("mining_voucher_redeemed", selection) + SSblackbox.add_details("mining_voucher_redeemed", selection) qdel(voucher) /obj/machinery/mineral/equipment_vendor/ex_act(severity, target) diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index 397824d830..6247083747 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -73,7 +73,7 @@ name = "Man-Machine Interface: [brainmob.real_name]" update_icon() - feedback_inc("cyborg_mmis_filled",1) + SSblackbox.inc("cyborg_mmis_filled",1) else if(brainmob) O.attack(brainmob, user) //Oh noooeeeee diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index daa72b55fb..6c4fd0b80c 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -33,7 +33,7 @@ dna.species.spec_death(gibbed, src) if(SSticker && SSticker.mode) - sql_report_death(src) + SSblackbox.ReportDeath(src) if(mind && mind.devilinfo) INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index e03844a82e..d7a2282a98 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -177,8 +177,8 @@ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(user.zone_selected)) //what we're actually ending up trying to hit. var/target_area = parse_zone(check_zone(user.zone_selected)) //our intended target - feedback_add_details("item_used_for_combat","[I.type]|[I.force]") - feedback_add_details("zone_targeted","[target_area]") + SSblackbox.add_details("item_used_for_combat","[I.type]|[I.force]") + SSblackbox.add_details("zone_targeted","[target_area]") // the attacked_by code varies among species return dna.species.spec_attacked_by(I, user, affecting, a_intent, src) diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 3e531eaaa0..6376ae4857 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -32,4 +32,4 @@ unbuckle_all_mobs(TRUE) - sql_report_death(src) + SSblackbox.ReportDeath(src) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5795854ec9..834e053c07 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -222,7 +222,7 @@ if(R.hud_used) R.hud_used.update_robot_modules_display() if(feedback_key && !did_feedback) - feedback_inc(feedback_key, 1) + SSblackbox.inc(feedback_key, 1) /obj/item/weapon/robot_module/standard name = "Standard" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 8af5c76f5b..0a0ff6bdd3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -53,7 +53,7 @@ return else if(!admin_spawned) - feedback_set_details("megafauna_kills","[initial(name)]") + SSblackbox.set_details("megafauna_kills","[initial(name)]") if(!elimination) //used so the achievment only occurs for the last legion to die. grant_achievement(medal_type,score_type) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index ca0ef6a7ea..a68ccc4884 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -48,7 +48,7 @@ ..() /mob/living/simple_animal/hostile/asteroid/death(gibbed) - feedback_add_details("mobs_killed_mining","[src.type]") + SSblackbox.add_details("mobs_killed_mining","[src.type]") ..(gibbed) /mob/living/simple_animal/hostile/asteroid/basilisk @@ -266,15 +266,15 @@ update_icon() if(implanted) - feedback_add_details("hivelord_core", "[type]|implanted") + SSblackbox.add_details("hivelord_core", "[type]|implanted") else - feedback_add_details("hivelord_core", "[type]|stabilizer") + SSblackbox.add_details("hivelord_core", "[type]|stabilizer") /obj/item/organ/hivelord_core/proc/go_inert() inert = TRUE desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested." - feedback_add_details("hivelord_core", "[src.type]|inert") + SSblackbox.add_details("hivelord_core", "[src.type]|inert") update_icon() /obj/item/organ/hivelord_core/ui_action_click() @@ -298,10 +298,10 @@ return if(H != user) H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!") - feedback_add_details("hivelord_core","[src.type]|used|other") + SSblackbox.add_details("hivelord_core","[src.type]|used|other") else to_chat(user, "You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.") - feedback_add_details("hivelord_core","[src.type]|used|self") + SSblackbox.add_details("hivelord_core","[src.type]|used|self") H.revive(full_heal = 1) qdel(src) ..() diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index aec971fb37..dab6b717a4 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -166,7 +166,7 @@ M.Friends = Friends.Copy() babies += M M.mutation_chance = Clamp(mutation_chance+(rand(5,-5)),0,100) - feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]") + SSblackbox.add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]") var/mob/living/simple_animal/slime/new_slime = pick(babies) new_slime.a_intent = INTENT_HARM diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 0d92f21494..64d4077a12 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -69,7 +69,7 @@ return 0 charge = (charge - amount) if(!istype(loc, /obj/machinery/power/apc)) - feedback_add_details("cell_used","[src.type]") + SSblackbox.add_details("cell_used","[src.type]") return 1 // recharge the cell diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 6a1595043a..e07f97c6ca 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -32,7 +32,7 @@ if(energy > 0) if(energy >= 200) var/turf/T = get_turf(src) - feedback_add_details("engine_started","[src.type]") + SSblackbox.add_details("engine_started","[src.type]") var/obj/singularity/S = new creation_type(T, 50) transfer_fingerprints_to(S) qdel(src) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index f69d4cc23f..2dffe0a567 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -265,7 +265,7 @@ if(user) user.update_inv_hands() - feedback_add_details("gun_fired","[src.type]") + SSblackbox.add_details("gun_fired","[src.type]") return 1 /obj/item/weapon/gun/attack(mob/M as mob, mob/user) diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index da4346109a..32646ee1e8 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -55,7 +55,7 @@ current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical) INVOKE_ASYNC(current_beam, /datum/beam.proc/Start) - feedback_add_details("gun_fired","[src.type]") + SSblackbox.add_details("gun_fired","[src.type]") /obj/item/weapon/gun/medbeam/process() diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index dbbb0b80b9..2c8ef5e065 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -396,7 +396,7 @@ remove_reagent(B, (multiplier * cached_required_reagents[B]), safety = 1) for(var/P in C.results) - feedback_add_details("chemical_reaction", "[P]|[cached_results[P]*multiplier]") + SSblackbox.add_details("chemical_reaction", "[P]|[cached_results[P]*multiplier]") multiplier = max(multiplier, 1) //this shouldnt happen ... add_reagent(P, cached_results[P]*multiplier, null, chem_temp) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej b/code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej new file mode 100644 index 0000000000..7a34c24c52 --- /dev/null +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej @@ -0,0 +1,442 @@ +diff a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm (rejected hunks) +@@ -19,7 +19,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimespawn/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/mob/living/simple_animal/slime/S + S = new(get_turf(holder.my_atom), "grey") + S.visible_message("Infused with plasma, the \ +@@ -36,7 +36,7 @@ + required_container = /obj/item/slime_extract/grey + + /datum/chemical_reaction/slime/slimeinaprov/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + /datum/chemical_reaction/slime/slimemonkey +@@ -47,7 +47,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimemonkey/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + for(var/i = 1, i <= 3, i++) + var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube + M.loc = get_turf(holder.my_atom) +@@ -63,7 +63,7 @@ + required_container = /obj/item/slime_extract/green + + /datum/chemical_reaction/slime/slimemutate/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + //Mutated Green +@@ -77,7 +77,7 @@ + mix_message = "The mixture rapidly expands and contracts, its appearance shifting into a sickening green." + + /datum/chemical_reaction/slime/slimemutate_unstable/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + //Metal +@@ -89,7 +89,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimemetal/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/location = get_turf(holder.my_atom) + new /obj/item/stack/sheet/plasteel (location, 5) + new /obj/item/stack/sheet/metal (location, 15) +@@ -103,7 +103,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimeglass/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/location = get_turf(holder.my_atom) + new /obj/item/stack/sheet/rglass (location, 5) + new /obj/item/stack/sheet/glass (location, 15) +@@ -118,7 +118,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecrit/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/T = get_turf(holder.my_atom) + T.visible_message("The slime extract begins to vibrate violently !") + addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 5, "Gold Slime"), 50) +@@ -134,7 +134,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecritlesser/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/T = get_turf(holder.my_atom) + T.visible_message("The slime extract begins to vibrate violently !") + addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Lesser Gold Slime", "neutral"), 50) +@@ -150,7 +150,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecritfriendly/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/T = get_turf(holder.my_atom) + T.visible_message("The slime extract begins to vibrate adorably !") + addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 1, "Friendly Gold Slime", "neutral"), 50) +@@ -168,7 +168,7 @@ + + /datum/chemical_reaction/slime/slimebork/on_reaction(datum/reagents/holder) + +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks, + /obj/item/weapon/reagent_containers/food/snacks/store/bread, + /obj/item/weapon/reagent_containers/food/snacks/breadslice, +@@ -216,7 +216,7 @@ + + /datum/chemical_reaction/slime/slimebork2/on_reaction(datum/reagents/holder) + +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/drinks) + // BORK BORK BORK + +@@ -246,7 +246,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimefrost/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + +@@ -258,7 +258,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimestabilizer/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/stabilizer/P = new /obj/item/slimepotion/stabilizer + P.loc = get_turf(holder.my_atom) + ..() +@@ -273,7 +273,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimefoam/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + +@@ -286,7 +286,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/T = get_turf(holder.my_atom) + T.visible_message("The slime extract begins to vibrate adorably!") + addtimer(CALLBACK(src, .proc/freeze, holder), 50) +@@ -310,7 +310,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimefireproof/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/fireproof/P = new /obj/item/slimepotion/fireproof + P.loc = get_turf(holder.my_atom) + ..() +@@ -325,7 +325,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecasp/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + /datum/chemical_reaction/slime/slimefire +@@ -336,7 +336,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/TU = get_turf(holder.my_atom) + TU.visible_message("The slime extract begins to vibrate adorably!") + addtimer(CALLBACK(src, .proc/slime_burn, holder), 50) +@@ -360,7 +360,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimesmoke/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + //Yellow +@@ -373,7 +373,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, created_volume) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + empulse(get_turf(holder.my_atom), 3, 7) + ..() + +@@ -386,7 +386,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecell/on_reaction(datum/reagents/holder, created_volume) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime + P.loc = get_turf(holder.my_atom) + ..() +@@ -399,7 +399,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimeglow/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/T = get_turf(holder.my_atom) + T.visible_message("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.") + var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime +@@ -416,7 +416,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimepsteroid/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/steroid/P = new /obj/item/slimepotion/steroid + P.loc = get_turf(holder.my_atom) + ..() +@@ -430,7 +430,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimejam/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + +@@ -443,7 +443,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimeplasma/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/location = get_turf(holder.my_atom) + new /obj/item/stack/sheet/mineral/plasma (location, 3) + ..() +@@ -458,7 +458,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimemutator/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/mutator/P = new /obj/item/slimepotion/mutator + P.loc = get_turf(holder.my_atom) + ..() +@@ -471,7 +471,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimebloodlust/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null)) + slime.rabid = 1 + slime.visible_message("The [slime] is driven into a frenzy!") +@@ -486,7 +486,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimespeed/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/speed/P = new /obj/item/slimepotion/speed + P.loc = get_turf(holder.my_atom) + ..() +@@ -501,7 +501,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/docility/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/docility/P = new /obj/item/slimepotion/docility + P.loc = get_turf(holder.my_atom) + ..() +@@ -514,7 +514,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/gender/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/genderchange/G = new /obj/item/slimepotion/genderchange + G.loc = get_turf(holder.my_atom) + ..() +@@ -529,7 +529,7 @@ + required_container = /obj/item/slime_extract/black + + /datum/chemical_reaction/slime/slimemutate2/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + //Oil +@@ -541,7 +541,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimeexplosion/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/turf/T = get_turf(holder.my_atom) + var/lastkey = holder.my_atom.fingerprintslast + var/touch_msg = "N/A" +@@ -570,7 +570,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecornoil/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + ..() + + //Light Pink +@@ -582,7 +582,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimepotion2/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/sentience/P = new /obj/item/slimepotion/sentience + P.loc = get_turf(holder.my_atom) + ..() +@@ -596,7 +596,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimegolem/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/effect/golemrune/Z = new /obj/effect/golemrune + Z.loc = get_turf(holder.my_atom) + notify_ghosts("Golem rune created in [get_area(Z)].", 'sound/effects/ghost2.ogg', source = Z) +@@ -610,7 +610,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimegolem2/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/golem_shell/artificial/Z = new /obj/item/golem_shell/artificial + Z.loc = get_turf(holder.my_atom) + ..() +@@ -624,7 +624,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimefloor2/on_reaction(datum/reagents/holder, created_volume) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace + P.amount = 25 + P.loc = get_turf(holder.my_atom) +@@ -639,7 +639,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecrystal/on_reaction(datum/reagents/holder, created_volume) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + if(holder.my_atom) + var/obj/item/weapon/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom)) + BC.visible_message("The [BC.name] appears out of thin air!") +@@ -654,7 +654,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimepsteroid2/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/enhancer/P = new /obj/item/slimepotion/enhancer + P.loc = get_turf(holder.my_atom) + ..() +@@ -668,7 +668,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slime_territory/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/areaeditor/blueprints/slime/P = new /obj/item/areaeditor/blueprints/slime + P.loc = get_turf(holder.my_atom) + ..() +@@ -682,7 +682,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast) + var/obj/effect/timestop/T = new /obj/effect/timestop + T.loc = get_turf(holder.my_atom) +@@ -699,7 +699,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecamera/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/device/camera/P = new /obj/item/device/camera + P.loc = get_turf(holder.my_atom) + var/obj/item/device/camera_film/Z = new /obj/item/device/camera_film +@@ -714,7 +714,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimefloor/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia + P.amount = 25 + P.loc = get_turf(holder.my_atom) +@@ -732,7 +732,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimepaint/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/list/paints = subtypesof(/obj/item/weapon/paint) + var/chosen = pick(paints) + var/obj/P = new chosen +@@ -749,7 +749,7 @@ + required_other = 1 + + /datum/chemical_reaction/slime/slimecrayon/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/list/crayons = difflist(subtypesof(/obj/item/toy/crayon),typesof(/obj/item/toy/crayon/spraycan)) + var/chosen = pick(crayons) + var/obj/P = new chosen +@@ -766,7 +766,7 @@ + required_container = /obj/item/slime_extract/rainbow + + /datum/chemical_reaction/slime/slimeRNG/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/mob/living/simple_animal/slime/random/S + S = new(get_turf(holder.my_atom)) + S.visible_message("Infused with plasma, the \ +@@ -782,7 +782,7 @@ + required_container = /obj/item/slime_extract/rainbow + + /datum/chemical_reaction/slime/slime_transfer/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + var/obj/item/slimepotion/transference/P = new /obj/item/slimepotion/transference + P.loc = get_turf(holder.my_atom) + ..() +@@ -795,7 +795,7 @@ + required_container = /obj/item/slime_extract/rainbow + + /datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder) +- feedback_add_details("slime_cores_used","[type]") ++ SSblackbox.add_details("slime_cores_used","[type]") + new/obj/item/weapon/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom)) + ..() + diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm index 9b1d5e649f..1b4455e29c 100644 --- a/code/modules/recycling/disposal-unit.dm +++ b/code/modules/recycling/disposal-unit.dm @@ -391,7 +391,7 @@ if(contents.len) if(full_pressure) spawn(0) - feedback_inc("disposal_auto_flush",1) + SSblackbox.inc("disposal_auto_flush",1) flush() flush_count = 0 diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index ed5190a701..07a0cc6b8b 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -309,13 +309,13 @@ won't update every console in existence) but it's more of a hassle to do. Also, for(var/T in temp_tech) var/datum/tech/KT = files.known_tech[T] //For stat logging of high levels if(files.IsTechHigher(T, temp_tech[T]) && KT.level >= 5) //For stat logging of high levels - feedback_add_details("high_research_level","[KT][KT.level + 1]") //+1 to show the level which we're about to get + SSblackbox.add_details("high_research_level","[KT][KT.level + 1]") //+1 to show the level which we're about to get files.UpdateTech(T, temp_tech[T]) if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any. for(var/material in linked_destroy.loaded_item.materials) linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material) - feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.type]") + SSblackbox.add_details("item_deconstructed","[linked_destroy.loaded_item.type]") linked_destroy.loaded_item = null for(var/obj/I in linked_destroy.contents) for(var/mob/M in I.contents) @@ -452,7 +452,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, new_item.materials = efficient_mats.Copy() new_item.loc = linked_lathe.loc if(!already_logged) - feedback_add_details("item_printed","[new_item.type]|[amount]") + SSblackbox.add_details("item_printed","[new_item.type]|[amount]") already_logged = 1 screen = old_screen linked_lathe.busy = 0 @@ -519,7 +519,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/obj/item/new_item = new P(src) new_item.loc = linked_imprinter.loc new_item.materials = efficient_mats.Copy() - feedback_add_details("circuit_printed","[new_item.type]") + SSblackbox.add_details("circuit_printed","[new_item.type]") screen = old_screen linked_imprinter.busy = 0 else diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 6f6533326b..2c37cd8757 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -95,10 +95,10 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) switch(event) if("Red Alert") set_security_level(SEC_LEVEL_RED) - feedback_inc("alert_keycard_auth_red",1) + SSblackbox.inc("alert_keycard_auth_red",1) if("Emergency Maintenance Access") make_maint_all_access() - feedback_inc("alert_keycard_auth_maint",1) + SSblackbox.inc("alert_keycard_auth_maint",1) GLOBAL_VAR_INIT(emergency_access, FALSE) diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index b4af9d9e17..6bf1a134b7 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -190,5 +190,5 @@ /obj/docking_port/mobile/arrivals/vv_edit_var(var_name, var_value) switch(var_name) if("perma_docked") - feedback_add_details("admin_secrets_fun_used","ShA[var_value ? "s" : "g"]") + SSblackbox.add_details("admin_secrets_fun_used","ShA[var_value ? "s" : "g"]") return ..() diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 553210a5f7..f13e29273e 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -290,7 +290,7 @@ setTimer(SSshuttle.emergencyDockTime) send2irc("Server", "The Emergency Shuttle has docked with the station.") priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") - feedback_add_details("emergency_shuttle", src.name) + SSblackbox.add_details("emergency_shuttle", src.name) // Gangs only have one attempt left if the shuttle has // docked with the station to prevent suffering from diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm index 594a6855da..d9d4eb7a71 100644 --- a/code/modules/shuttle/manipulator.dm +++ b/code/modules/shuttle/manipulator.dm @@ -155,7 +155,7 @@ message_admins("[key_name_admin(usr)] fast travelled \ [M]") log_admin("[key_name(usr)] fast travelled [M]") - feedback_add_details("shuttle_fasttravel", M.name) + SSblackbox.add_details("shuttle_fasttravel", M.name) break if("preview") @@ -182,7 +182,7 @@ with the shuttle manipulator.") log_admin("[key_name(usr)] loaded [mdp] with the \ shuttle manipulator.") - feedback_add_details("shuttle_manipulator", mdp.name) + SSblackbox.add_details("shuttle_manipulator", mdp.name) update_icon() diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index f214d018b4..eda3c3e6c6 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -583,9 +583,9 @@ "You feel an immense \ crushing pressure as the space around you ripples.") if(M.key || M.get_ghost(TRUE)) - feedback_add_details("shuttle_gib", "[type]") + SSblackbox.add_details("shuttle_gib", "[type]") else - feedback_add_details("shuttle_gib_unintelligent", "[type]") + SSblackbox.add_details("shuttle_gib_unintelligent", "[type]") M.gib() else //non-living mobs shouldn't be affected by shuttles, which is why this is an else diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 1e3b9906be..82d5db8b20 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( SSshuttle.orderhistory += SO SO.generate(pick_n_take(empty_turfs)) - feedback_add_details("cargo_imports", + SSblackbox.add_details("cargo_imports", "[SO.pack.type]|[SO.pack.name]|[SO.pack.cost]") investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]) has shipped.", "cargo") if(SO.pack.dangerous) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index f9a3b5c0cf..eb02b91735 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -54,7 +54,7 @@ return new step_type /datum/surgery/proc/complete() - feedback_add_details("surgeries_completed", "[type]") + SSblackbox.add_details("surgeries_completed", "[type]") qdel(src) diff --git a/code/modules/uplink/uplink_item.dm.rej b/code/modules/uplink/uplink_item.dm.rej new file mode 100644 index 0000000000..7709867051 --- /dev/null +++ b/code/modules/uplink/uplink_item.dm.rej @@ -0,0 +1,17 @@ +diff a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm (rejected hunks) +@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. + + /datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U) + if(item) +- feedback_add_details("traitor_uplink_items_bought", "[item]") ++ SSblackbox.add_details("traitor_uplink_items_bought", "[item]") + return new item(loc) + + /datum/uplink_item/proc/buy(mob/user, obj/item/device/uplink/U) +@@ -1351,5 +1351,5 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. + var/datum/uplink_item/I = pick(possible_items) + U.telecrystals -= I.cost + U.spent_telecrystals += I.cost +- feedback_add_details("traitor_uplink_items_bought","RN") ++ SSblackbox.add_details("traitor_uplink_items_bought","RN") + return new I.item(loc) diff --git a/code/world.dm.rej b/code/world.dm.rej new file mode 100644 index 0000000000..61fdf99e06 --- /dev/null +++ b/code/world.dm.rej @@ -0,0 +1,19 @@ +diff a/code/world.dm b/code/world.dm (rejected hunks) +@@ -208,7 +208,7 @@ + #undef WORLD_REBOOT + + /world/proc/OnReboot(reason, feedback_c, feedback_r, round_end_sound_sent) +- feedback_set_details("[feedback_c]","[feedback_r]") ++ SSblackbox.set_details("[feedback_c]","[feedback_r]") + log_game("Rebooting World. [reason]") + #ifdef dellogging + var/log = file("data/logs/del.log") +@@ -218,8 +218,6 @@ + if(count > 10) + log << "#[count]\t[index]" + #endif +- if(GLOB.blackbox) +- GLOB.blackbox.save_all_data_to_sql() + Master.Shutdown() //run SS shutdowns + RoundEndAnimation(round_end_sound_sent) + kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked diff --git a/tgstation.dme b/tgstation.dme index 1647912f6c..cead10a6c2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -209,7 +209,6 @@ #include "code\controllers\subsystem\pai.dm" #include "code\controllers\subsystem\parallax.dm" #include "code\controllers\subsystem\persistence.dm" -#include "code\controllers\subsystem\ping.dm" #include "code\controllers\subsystem\radio.dm" #include "code\controllers\subsystem\religion.dm" #include "code\controllers\subsystem\server_maint.dm" diff --git a/tgstation.dme.rej b/tgstation.dme.rej new file mode 100644 index 0000000000..02c9418835 --- /dev/null +++ b/tgstation.dme.rej @@ -0,0 +1,17 @@ +diff a/tgstation.dme b/tgstation.dme (rejected hunks) +@@ -158,6 +158,7 @@ + #include "code\controllers\subsystem\assets.dm" + #include "code\controllers\subsystem\atoms.dm" + #include "code\controllers\subsystem\augury.dm" ++#include "code\controllers\subsystem\blackbox.dm" + #include "code\controllers\subsystem\communications.dm" + #include "code\controllers\subsystem\disease.dm" + #include "code\controllers\subsystem\events.dm" +@@ -2078,7 +2079,6 @@ + #include "code\orphaned_procs\AStar.dm" + #include "code\orphaned_procs\dbcore.dm" + #include "code\orphaned_procs\priority_announce.dm" +-#include "code\orphaned_procs\statistics.dm" + #include "interface\interface.dm" + #include "interface\stylesheet.dm" + #include "interface\skin.dmf" From 08a01aa11b400053c88fdff57fc5237112aec725 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 26 Apr 2017 17:06:29 -0500 Subject: [PATCH 002/131] Refactors roundstart checks slightly --- code/__HELPERS/game.dm | 2 +- code/controllers/master.dm | 10 +++++----- code/controllers/subsystem/ticker.dm | 2 +- code/controllers/subsystem/ticker.dm.rej | 17 +++++++++++++++++ code/datums/helper_datums/getrev.dm | 2 +- code/game/gamemodes/objective.dm | 2 +- code/game/turfs/turf.dm | 2 +- code/modules/admin/admin.dm | 2 +- code/modules/admin/player_panel.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/awaymissions/capture_the_flag.dm | 2 +- code/modules/awaymissions/corpse.dm | 2 +- code/modules/mob/dead/new_player/new_player.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/mob/logout.dm.rej | 10 ++++++++++ code/modules/power/gravitygenerator.dm | 2 +- code/modules/power/singularity/emitter.dm.rej | 10 ++++++++++ code/modules/power/smes.dm | 2 +- code/world.dm | 3 +++ 19 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 code/controllers/subsystem/ticker.dm.rej create mode 100644 code/modules/mob/logout.dm.rej create mode 100644 code/modules/power/singularity/emitter.dm.rej diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 6fd41f7ea1..6bc79fb7d5 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -513,7 +513,7 @@ winset(C, "mainwindow", "flash=5") /proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank) - if(SSticker.current_state != GAME_STATE_PLAYING || !character) + if(!SSticker.IsRoundInProgress() || !character) return var/area/A = get_area(character) var/message = "\ diff --git a/code/controllers/master.dm b/code/controllers/master.dm index ab4ff43b04..01d0ac3447 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -48,7 +48,7 @@ GLOBAL_VAR_INIT(CURRENT_TICKLIMIT, TICK_LIMIT_RUNNING) var/initializations_finished_with_no_players_logged_in //I wonder what this could be? // Has round started? (So we know what subsystems to run) - var/round_started = 0 + var/local_round_started = FALSE //Don't read this var, use SSticker.HasRoundStarted() instead // The type of the last subsystem to be process()'d. var/last_type_processed @@ -189,7 +189,7 @@ GLOBAL_VAR_INIT(CURRENT_TICKLIMIT, TICK_LIMIT_RUNNING) // Notify the MC that the round has started. /datum/controller/master/proc/RoundStart() - round_started = 1 + local_round_started = TRUE var/timer = world.time for (var/datum/controller/subsystem/SS in subsystems) if (SS.flags & SS_FIRE_IN_LOBBY || SS.flags & SS_TICKER) @@ -222,7 +222,7 @@ GLOBAL_VAR_INIT(CURRENT_TICKLIMIT, TICK_LIMIT_RUNNING) // local vars rock // Schedule the first run of the Subsystems. - round_started = world.has_round_started() + local_round_started = world.has_round_started() //all this shit is here so that flag edits can be refreshed by restarting the MC. (and for speed) var/list/tickersubsystems = list() var/list/normalsubsystems = list() @@ -245,7 +245,7 @@ GLOBAL_VAR_INIT(CURRENT_TICKLIMIT, TICK_LIMIT_RUNNING) lobbysubsystems += SS timer += world.tick_lag * rand(1, 5) SS.next_fire = timer - else if (round_started) + else if (local_round_started) timer += world.tick_lag * rand(1, 5) SS.next_fire = timer normalsubsystems += SS @@ -296,7 +296,7 @@ GLOBAL_VAR_INIT(CURRENT_TICKLIMIT, TICK_LIMIT_RUNNING) if (!Failsafe || (Failsafe.processing_interval > 0 && (Failsafe.lasttick+(Failsafe.processing_interval*5)) < world.time)) new/datum/controller/failsafe() // (re)Start the failsafe. if (!queue_head || !(iteration % 3)) - if (round_started) + if (local_round_started) subsystems_to_check = normalsubsystems else subsystems_to_check = lobbysubsystems diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index f701c051da..305dbc0678 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -243,7 +243,7 @@ SUBSYSTEM_DEF(ticker) send2irc("Server", "Round of [hide_mode ? "secret":"[mode.name]"] has started[allmins.len ? ".":" with no active admins online!"]") /datum/controller/subsystem/ticker/proc/OnRoundstart(datum/callback/cb) - if(current_state < GAME_STATE_PLAYING) + if(!HasRoundStarted()) LAZYADD(round_start_events, cb) else cb.InvokeAsync() diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej new file mode 100644 index 0000000000..1dbd2f038a --- /dev/null +++ b/code/controllers/subsystem/ticker.dm.rej @@ -0,0 +1,17 @@ +diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) +@@ -667,11 +667,11 @@ SUBSYSTEM_DEF(ticker) + return + INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) + ++/datum/controller/subsystem/ticker/proc/HasRoundStarted() ++ return current_state >= GAME_STATE_PLAYING + +-/world/proc/has_round_started() +- if (SSticker && SSticker.current_state >= GAME_STATE_PLAYING) +- return TRUE +- return FALSE ++/datum/controller/subsystem/ticker/proc/IsRoundInProgress() ++ return current_state == GAME_STATE_PLAYING + + /datum/controller/subsystem/ticker/Recover() + current_state = SSticker.current_state diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index f1b5d3a973..628949ebc0 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -89,7 +89,7 @@ to_chat(src, "Enforce Continuous Rounds: [config.continuous.len] of [config.modes.len] roundtypes") to_chat(src, "Allow Midround Antagonists: [config.midround_antag.len] of [config.modes.len] roundtypes") if(config.show_game_type_odds) - if(SSticker.current_state == GAME_STATE_PLAYING) + if(SSticker.IsRoundInProgress()) var/prob_sum = 0 var/current_odds_differ = FALSE var/list/probs = list() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index c082a48224..6ac0ab8c7c 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -654,7 +654,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) for(var/mob/dead/new_player/P in GLOB.player_list) if(P.client && P.ready && P.mind!=owner) n_p ++ - else if (SSticker.current_state == GAME_STATE_PLAYING) + else if (SSticker.IsRoundInProgress()) for(var/mob/living/carbon/human/P in GLOB.player_list) if(P.client && !(P.mind in SSticker.mode.changelings) && P.mind!=owner) n_p ++ diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 10eefc4b14..ffcf98ca09 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -397,7 +397,7 @@ /turf/proc/add_blueprints_preround(atom/movable/AM) - if(!SSticker || SSticker.current_state != GAME_STATE_PLAYING) + if(!SSticker.HasRoundStarted()) add_blueprints(AM) /turf/proc/empty(turf_type=/turf/open/space) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 25b7deba9b..f4e7cccff4 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -804,7 +804,7 @@ return 1 /client/proc/adminGreet(logout) - if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) + if(SSticker.HasRoundStarted()) var/string if(logout && config && config.announce_admin_logout) string = pick( diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index bfa8553d52..09aced33a8 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -310,7 +310,7 @@ usr << browse(dat, "window=players;size=600x480") /datum/admins/proc/check_antagonists() - if (SSticker && SSticker.current_state >= GAME_STATE_PLAYING) + if (SSticker.HasRoundStarted()) var/dat = "Round Status

Round Status

" if(SSticker.mode.replacementmode) dat += "Former Game Mode: [SSticker.mode.name]
" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index dd32085681..7210b4e625 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2161,7 +2161,7 @@ else if(href_list["kick_all_from_lobby"]) if(!check_rights(R_ADMIN)) return - if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) + if(SSticker.IsRoundInProgress()) var/afkonly = text2num(href_list["afkonly"]) if(alert("Are you sure you want to kick all [afkonly ? "AFK" : ""] clients from the lobby??","Message","Yes","Cancel") != "Yes") to_chat(usr, "Kick clients from lobby aborted") diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 996b4a700b..93b9b6b3f9 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -206,7 +206,7 @@ toggle_all_ctf(user) return - if(SSticker.current_state < GAME_STATE_PLAYING) + if(!SSticker.HasRoundStarted()) return if(user.ckey in team_members) if(user.ckey in recently_dead_ckeys) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index d9663f97c9..96c0bc35de 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -22,7 +22,7 @@ anchored = 1 /obj/effect/mob_spawn/attack_ghost(mob/user) - if(SSticker.current_state != GAME_STATE_PLAYING || !loc) + if(!SSticker.HasRoundStarted() || !loc) return if(!uses) to_chat(user, "This spawner is out of charges!") diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 72f83bf546..d2ef3097cf 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -148,7 +148,7 @@ return 1 if(href_list["late_join"]) - if(!SSticker || SSticker.current_state != GAME_STATE_PLAYING) + if(!SSticker || !SSticker.IsRoundInProgress()) to_chat(usr, "The round is either not ready, or has already finished...") return diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d87573edd3..1211370b94 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -337,7 +337,7 @@ . = 1 /mob/living/simple_animal/proc/make_babies() // <3 <3 <3 - if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || SSticker.current_state != GAME_STATE_PLAYING) + if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || !SSticker.IsRoundInProgress()) return next_scan_time = world.time + 400 var/alone = 1 diff --git a/code/modules/mob/logout.dm.rej b/code/modules/mob/logout.dm.rej new file mode 100644 index 0000000000..809131d9f4 --- /dev/null +++ b/code/modules/mob/logout.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm (rejected hunks) +@@ -3,7 +3,7 @@ + unset_machine() + GLOB.player_list -= src + if(GLOB.admin_datums[src.ckey]) +- if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing. ++ if (SSticker && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing. + var/admins_number = GLOB.admins.len + if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell. + var/cheesy_message = pick( list( \ diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 7a5abbbba4..6ca3c8f620 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -304,7 +304,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne // Sound the alert if gravity was just enabled or disabled. var/alert = 0 var/area/area = get_area(src) - if(on && SSticker && SSticker.current_state == GAME_STATE_PLAYING) // If we turned on and the game is live. + if(on && SSticker.IsRoundInProgress()) // If we turned on and the game is live. if(gravity_in_level() == 0) alert = 1 investigate_log("was brought online and is now producing gravity for this level.", "gravity") diff --git a/code/modules/power/singularity/emitter.dm.rej b/code/modules/power/singularity/emitter.dm.rej new file mode 100644 index 0000000000..ea82e4cb0c --- /dev/null +++ b/code/modules/power/singularity/emitter.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm (rejected hunks) +@@ -88,7 +88,7 @@ + connect_to_network() + + /obj/machinery/power/emitter/Destroy() +- if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) ++ if(SSticker && SSticker.IsRoundInProgress()) + message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) + log_game("Emitter deleted at ([x],[y],[z])") + investigate_log("deleted at ([x],[y],[z]) at [get_area(src)]","singulo") diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index fdb4699ae5..1e1737661e 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -191,7 +191,7 @@ cell.charge = (charge / capacity) * cell.maxcharge /obj/machinery/power/smes/Destroy() - if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) + if(SSticker && SSticker.IsRoundInProgress()) var/area/area = get_area(src) message_admins("SMES deleted at ([area.name])") log_game("SMES deleted at ([area.name])") diff --git a/code/world.dm b/code/world.dm index 7af27a1504..0a7391ba62 100644 --- a/code/world.dm +++ b/code/world.dm @@ -317,3 +317,6 @@ s += ": [jointext(features, ", ")]" status = s + +/world/proc/has_round_started() + return SSticker.HasRoundStarted() \ No newline at end of file From dc1f66460855b4cf5789cacceedeac125f4bb50d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 26 Apr 2017 17:14:40 -0500 Subject: [PATCH 003/131] Admin proc calls are now serialized per admin --- code/modules/admin/verbs/debug.dm.rej | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 code/modules/admin/verbs/debug.dm.rej diff --git a/code/modules/admin/verbs/debug.dm.rej b/code/modules/admin/verbs/debug.dm.rej new file mode 100644 index 0000000000..b5277b316c --- /dev/null +++ b/code/modules/admin/verbs/debug.dm.rej @@ -0,0 +1,41 @@ +diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm (rejected hunks) +@@ -83,17 +83,23 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that + to_chat(usr, .) + feedback_add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +-GLOBAL_VAR_INIT(AdminProcCall, null) +-GLOBAL_PROTECT(AdminProcCall) ++GLOBAL_VAR_INIT(AdminProcCaller, null) ++GLOBAL_PROTECT(AdminProcCaller) ++GLOBAL_VAR_INIT(AdminProcCallCount, 0) ++GLOBAL_PROTECT(AdminProcCallCount) + + /proc/WrapAdminProcCall(target, procname, list/arguments) +- if(GLOB.AdminProcCall) +- to_chat(usr, "Another admin called proc is still running, your proc will be run after theirs finishes") +- UNTIL(!GLOB.AdminProcCall) ++ var/current_caller = GLOB.AdminProcCaller ++ var/ckey = usr.client.ckey ++ if(current_caller && current_caller != ckey) ++ to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") ++ UNTIL(!GLOB.AdminProcCaller) + to_chat(usr, "Running your proc") +- GLOB.AdminProcCall = usr.client.ckey //if this runtimes, too bad for you ++ GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you ++ ++GLOB.AdminProcCallCount + world.WrapAdminProcCall(target, procname, arguments) +- GLOB.AdminProcCall = null ++ if(--GLOB.AdminProcCallCount == 0) ++ GLOB.AdminProcCaller = null + + //adv proc call this, ya nerds + /world/proc/WrapAdminProcCall(target, procname, list/arguments) +@@ -103,7 +109,7 @@ GLOBAL_PROTECT(AdminProcCall) + return call(procname)(arglist(arguments)) + + /proc/IsAdminAdvancedProcCall() +- return usr && usr.client && GLOB.AdminProcCall == usr.client.ckey ++ return usr && usr.client && GLOB.AdminProcCaller == usr.client.ckey + + /client/proc/callproc_datum(datum/A as null|area|mob|obj|turf) + set category = "Debug" From bcab389ca23810d47ed6ad008dbdb6a765cd7e38 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 26 Apr 2017 17:15:48 -0500 Subject: [PATCH 004/131] New() goes in the trash, we've gotta Initialize() --- .../miniantags/abduction/machinery/pad.dm | 6 +- .../gamemodes/miniantags/bot_swarm/swarmer.dm | 6 +- code/game/gamemodes/wizard/artefact.dm | 4 +- code/game/objects/effects/overlays.dm | 68 ++++++++++--------- code/game/objects/effects/overlays.dm.rej | 21 ++++++ code/game/objects/items/devices/flashlight.dm | 4 +- code/modules/VR/vr_sleeper.dm | 4 +- .../simple_animal/guardian/types/support.dm | 2 +- .../hostile/bosses/paperwizard.dm | 4 +- .../hostile/megafauna/colossus.dm.rej | 10 +++ .../hostile/megafauna/dragon.dm.rej | 23 +++++++ .../hostile/megafauna/hierophant.dm | 25 ++++--- .../modules/projectiles/projectile/special.dm | 25 ++++--- .../chemistry/machinery/chem_dispenser.dm | 8 +-- .../chemistry/machinery/chem_heater.dm | 4 +- .../chemistry/machinery/chem_master.dm | 4 +- .../reagents/chemistry/machinery/pandemic.dm | 4 +- .../chemistry/machinery/reagentgrinder.dm | 5 +- code/modules/reagents/reagent_containers.dm | 6 +- .../reagents/reagent_containers/blood_pack.dm | 8 +-- .../reagents/reagent_containers/borghydro.dm | 4 +- .../reagents/reagent_containers/bottle.dm | 8 +-- .../reagents/reagent_containers/glass.dm | 8 +-- .../reagents/reagent_containers/pill.dm | 4 +- .../reagents/reagent_containers/syringes.dm | 6 +- code/modules/reagents/reagent_dispenser.dm | 8 +-- code/modules/recycling/conveyor2.dm | 12 ++-- code/modules/recycling/disposal-structures.dm | 39 +++++------ code/modules/recycling/disposal-unit.dm | 9 ++- code/modules/research/circuitprinter.dm | 4 +- code/modules/research/designs.dm | 8 +-- code/modules/research/destructive_analyzer.dm | 4 +- code/modules/research/experimentor.dm | 8 +-- code/modules/research/message_server.dm | 5 +- code/modules/research/protolathe.dm | 4 +- code/modules/research/rdconsole.dm | 8 +-- code/modules/research/rdmachines.dm | 4 +- code/modules/research/research.dm | 12 ++-- code/modules/research/server.dm | 4 +- code/modules/research/stock_parts.dm | 8 +-- .../research/xenobiology/xenobiology.dm | 10 +-- code/modules/ruins/lavaland_ruin_code.dm | 4 +- .../ruins/objects_and_mobs/sin_ruins.dm | 2 +- .../security_levels/keycard_authentication.dm | 2 +- code/modules/shuttle/computer.dm | 4 +- code/modules/shuttle/emergency.dm | 11 ++- code/modules/shuttle/manipulator.dm | 2 +- code/modules/shuttle/shuttle.dm | 12 ++-- code/modules/shuttle/shuttle.dm.rej | 10 +++ code/modules/shuttle/special.dm | 2 +- code/modules/shuttle/syndicate.dm | 4 +- code/modules/shuttle/transit.dm | 2 +- code/modules/spells/spell.dm | 4 +- code/modules/spells/spell_types/forcewall.dm | 4 +- code/modules/spells/spell_types/godhand.dm | 6 +- code/modules/spells/spell_types/trigger.dm | 4 +- code/modules/station_goals/bsa.dm.rej | 12 ++++ code/modules/station_goals/shield.dm | 4 +- code/modules/surgery/organs/augments_arms.dm | 12 ++-- .../surgery/organs/augments_internal.dm | 3 +- .../surgery/organs/organ_internal.dm.rej | 10 +++ code/modules/telesci/telepad.dm | 4 +- code/modules/telesci/telesci_computer.dm | 4 +- code/modules/uplink/uplink.dm | 20 +++--- code/modules/vehicles/atv.dm | 2 +- code/modules/vehicles/atv.dm.rej | 12 ++++ code/modules/vehicles/bicycle.dm | 4 +- code/modules/vehicles/speedbike.dm.rej | 23 +++++++ code/modules/zombie/organs.dm | 2 +- 69 files changed, 358 insertions(+), 245 deletions(-) create mode 100644 code/game/objects/effects/overlays.dm.rej create mode 100644 code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej create mode 100644 code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej create mode 100644 code/modules/shuttle/shuttle.dm.rej create mode 100644 code/modules/station_goals/bsa.dm.rej create mode 100644 code/modules/surgery/organs/organ_internal.dm.rej create mode 100644 code/modules/vehicles/atv.dm.rej create mode 100644 code/modules/vehicles/speedbike.dm.rej diff --git a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm index 5f8ad3de9d..083e610587 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm @@ -47,8 +47,8 @@ icon_state = "teleport" duration = 80 -/obj/effect/overlay/temp/teleport_abductor/New() +/obj/effect/overlay/temp/teleport_abductor/Initialize() + . = ..() var/datum/effect_system/spark_spread/S = new S.set_up(10,0,loc) - S.start() - ..() \ No newline at end of file + S.start() \ No newline at end of file diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 6ce04bed14..c6248b03cc 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -527,9 +527,9 @@ icon_state = "disintegrate" duration = 10 -/obj/effect/overlay/temp/swarmer/disintegration/New() - playsound(src.loc, "sparks", 100, 1) - ..() +/obj/effect/overlay/temp/swarmer/disintegration/Initialize() + . = ..() + playsound(loc, "sparks", 100, 1) /obj/effect/overlay/temp/swarmer/dismantle icon_state = "dismantle" diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index c925a5cbd5..e409b087d8 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -630,6 +630,6 @@ duration = 40 pixel_x = 500 -/obj/effect/overlay/temp/tornado/New(loc) - ..() +/obj/effect/overlay/temp/tornado/Initialize() + . = ..() animate(src, pixel_x = -500, time = 40) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index bc9251d9fc..ab17503447 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -44,10 +44,10 @@ /obj/effect/overlay/temp/dir_setting randomdir = FALSE -/obj/effect/overlay/temp/dir_setting/New(loc, set_dir) +/obj/effect/overlay/temp/dir_setting/Initialize(mapload, set_dir) if(set_dir) setDir(set_dir) - ..() + . = ..() /obj/effect/overlay/temp/dir_setting/bloodsplatter icon = 'icons/effects/blood.dmi' @@ -56,12 +56,12 @@ layer = BELOW_MOB_LAYER var/splatter_type = "splatter" -/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir) +/obj/effect/overlay/temp/dir_setting/bloodsplatter/Initialize(mapload, set_dir) if(set_dir in GLOB.diagonals) icon_state = "[splatter_type][pick(1, 2, 6)]" else icon_state = "[splatter_type][pick(3, 4, 5)]" - ..() + . = ..() var/target_pixel_x = 0 var/target_pixel_y = 0 switch(set_dir) @@ -93,6 +93,13 @@ /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter splatter_type = "xsplatter" +/obj/effect/overlay/temp/dir_setting/speedbike_trail + name = "speedbike trails" + icon_state = "ion_fade" + layer = BELOW_MOB_LAYER + duration = 10 + randomdir = 0 + /obj/effect/overlay/temp/dir_setting/firing_effect icon = 'icons/effects/effects.dmi' icon_state = "firing_effect" @@ -189,8 +196,8 @@ desc = "It's a decoy!" duration = 15 -/obj/effect/overlay/temp/decoy/New(loc, atom/mimiced_atom) - ..() +/obj/effect/overlay/temp/decoy/Initialize(mapload, atom/mimiced_atom) + . = ..() alpha = initial(alpha) if(mimiced_atom) name = mimiced_atom.name @@ -198,8 +205,8 @@ setDir(mimiced_atom.dir) mouse_opacity = 0 -/obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom) - ..() +/obj/effect/overlay/temp/decoy/fading/Initialize(mapload, atom/mimiced_atom) + . = ..() animate(src, alpha = 0, time = duration) /obj/effect/overlay/temp/decoy/fading/fivesecond @@ -324,15 +331,15 @@ var/mob/user var/damage = 20 -/obj/effect/overlay/temp/ratvar/volt_hit/New(loc, caster, multiplier) +/obj/effect/overlay/temp/ratvar/volt_hit/Initialize(mapload, caster, multiplier) if(multiplier) damage *= multiplier duration = max(round(damage * 0.2), 1) - ..() + . = ..() set_light(1.5, 2, LIGHT_COLOR_ORANGE) -/obj/effect/overlay/temp/ratvar/volt_hit/true/New(loc, caster, multiplier) - ..() +/obj/effect/overlay/temp/ratvar/volt_hit/true/Initialize(mapload, caster, multiplier) + . = ..() user = caster if(user) var/matrix/M = new @@ -376,8 +383,8 @@ icon_state = "warden_gaze" duration = 3 -/obj/effect/overlay/temp/ratvar/ocular_warden/New() - ..() +/obj/effect/overlay/temp/ratvar/ocular_warden/Initialize() + . = ..() pixel_x = rand(-8, 8) pixel_y = rand(-10, 10) animate(src, alpha = 0, time = 3, easing = EASE_OUT) @@ -401,8 +408,8 @@ layer = ABOVE_MOB_LAYER duration = 10 -/obj/effect/overlay/temp/ratvar/component/New() - ..() +/obj/effect/overlay/temp/ratvar/component/Initialize() + . = ..() transform = matrix()*0.75 pixel_x = rand(-10, 10) pixel_y = rand(-10, -2) @@ -432,9 +439,8 @@ light_power = 2 light_color = "#FAE48C" -/obj/effect/overlay/temp/ratvar/sigil/transgression/New() - ..() - update_light() +/obj/effect/overlay/temp/ratvar/sigil/transgression/Initialize() + . = ..() var/oldtransform = transform animate(src, transform = matrix()*2, time = 5) animate(transform = oldtransform, alpha = 0, time = 65) @@ -447,10 +453,6 @@ light_power = 0.5 light_color = "#1E8CE1" -/obj/effect/overlay/temp/ratvar/sigil/vitality/New() - ..() - update_light() - /obj/effect/overlay/temp/ratvar/sigil/accession color = "#AF0AAF" layer = ABOVE_MOB_LAYER @@ -493,9 +495,9 @@ icon = 'icons/mob/mob.dmi' duration = 15 -/obj/effect/overlay/temp/gib_animation/New(loc, gib_icon) +/obj/effect/overlay/temp/gib_animation/Initialize(mapload, gib_icon) icon_state = gib_icon // Needs to be before ..() so icon is correct - ..() + . = ..() /obj/effect/overlay/temp/gib_animation/ex_act(severity) return //so the overlay isn't deleted by the explosion that gibbed the mob. @@ -507,9 +509,9 @@ icon = 'icons/mob/mob.dmi' duration = 15 -/obj/effect/overlay/temp/dust_animation/New(loc, dust_icon) +/obj/effect/overlay/temp/dust_animation/Initialize(mapload, dust_icon) icon_state = dust_icon // Before ..() so the correct icon is flick()'d - ..() + . = ..() /obj/effect/overlay/temp/mummy_animation icon = 'icons/mob/mob.dmi' @@ -521,12 +523,12 @@ icon_state = "heal" duration = 15 -/obj/effect/overlay/temp/heal/New(loc, colour) - ..() - pixel_x = rand(-12, 12) - pixel_y = rand(-9, 0) +/obj/effect/overlay/temp/heal/Initialize(mapload, colour) if(colour) color = colour + . = ..() + pixel_x = rand(-12, 12) + pixel_y = rand(-9, 0) /obj/effect/overlay/temp/kinetic_blast name = "kinetic explosion" @@ -558,14 +560,14 @@ icon_state = "impact_bullet" duration = 5 -/obj/effect/overlay/temp/impact_effect/New(loc, atom/target, obj/item/projectile/P) +/obj/effect/overlay/temp/impact_effect/Initialize(mapload, atom/target, obj/item/projectile/P) if(target == P.original) //the projectile hit the target originally clicked pixel_x = P.p_x + target.pixel_x - 16 + rand(-4,4) pixel_y = P.p_y + target.pixel_y - 16 + rand(-4,4) else pixel_x = target.pixel_x + rand(-4,4) pixel_y = target.pixel_y + rand(-4,4) - ..() + . = ..() /obj/effect/overlay/temp/impact_effect/red_laser icon_state = "impact_laser" diff --git a/code/game/objects/effects/overlays.dm.rej b/code/game/objects/effects/overlays.dm.rej new file mode 100644 index 0000000000..f25f8f24e9 --- /dev/null +++ b/code/game/objects/effects/overlays.dm.rej @@ -0,0 +1,21 @@ +diff a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm (rejected hunks) +@@ -31,8 +31,8 @@ + . = ..() + deltimer(timerid) + +-/obj/effect/overlay/temp/New() +- ..() ++/obj/effect/overlay/temp/Initialize() ++ . = ..() + if(randomdir) + setDir(pick(GLOB.cardinal)) + flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation. +@@ -214,7 +221,7 @@ + icon = 'icons/effects/fire.dmi' + icon_state = "3" + duration = 20 +- ++ + /obj/effect/overlay/temp/cult + randomdir = 0 + duration = 10 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 496702aa4d..6955872c27 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -100,8 +100,8 @@ icon_state = "medi_holo" duration = 30 -/obj/effect/overlay/temp/medical_holosign/New(loc, creator) - ..() +/obj/effect/overlay/temp/medical_holosign/Initialize(mapload, creator) + . = ..() playsound(loc, 'sound/machines/ping.ogg', 50, 0) //make some noise! if(creator) visible_message("[creator] created a medical hologram!") diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index 41f3bbc001..9411917c39 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -17,8 +17,8 @@ var/allow_creating_vr_humans = TRUE //So you can have vr_sleepers that always spawn you as a specific person or 1 life/chance vr games var/outfit = /datum/outfit/vr_basic -/obj/machinery/vr_sleeper/New() - ..() +/obj/machinery/vr_sleeper/Initialize() + . = ..() sparks = new /datum/effect_system/spark_spread() sparks.set_up(2,0) sparks.attach(src) diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm index 95d561abeb..159e6df5f4 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/support.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm @@ -16,7 +16,7 @@ var/toggle = FALSE /mob/living/simple_animal/hostile/guardian/healer/Initialize() - ..() + . = ..() var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] medsensor.add_hud_to(src) diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index 2829bf574e..951589daaf 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -149,8 +149,8 @@ duration = 18 randomdir = FALSE -/obj/effect/overlay/temp/paperwiz_dying/New() - ..() +/obj/effect/overlay/temp/paperwiz_dying/Initialize() + . = ..() visible_message("The wizard cries out in pain as a gate appears behind him, sucking him in!") playsound(get_turf(src),'sound/magic/MandSwap.ogg', 50, 1, 1) playsound(get_turf(src),'sound/hallucinations/wail.ogg', 50, 1, 1) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej new file mode 100644 index 0000000000..3dab6ff0a6 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm (rejected hunks) +@@ -106,7 +106,7 @@ Difficulty: Very Hard + var/target + + /obj/effect/overlay/temp/at_shield/Initialize(mapload, new_target) +- ..() ++ . = ..() + target = new_target + INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE) + diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej new file mode 100644 index 0000000000..84c2ab0b38 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej @@ -0,0 +1,23 @@ +diff a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm (rejected hunks) +@@ -96,8 +96,8 @@ Difficulty: Medium + duration = 12 + pixel_z = 500 + +-/obj/effect/overlay/temp/fireball/Initialize(loc) +- ..() ++/obj/effect/overlay/temp/fireball/Initialize() ++ . = ..() + animate(src, pixel_z = 0, time = 12) + + /obj/effect/overlay/temp/target +@@ -121,8 +121,8 @@ Difficulty: Medium + /obj/effect/overlay/temp/target/ex_act() + return + +-/obj/effect/overlay/temp/target/Initialize(loc) +- ..() ++/obj/effect/overlay/temp/target/Initialize() ++ . = ..() + INVOKE_ASYNC(src, .proc/fall) + + /obj/effect/overlay/temp/target/proc/fall() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index f0c1a7ec04..03f8ce63cf 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -426,8 +426,8 @@ Difficulty: Hard layer = BELOW_MOB_LAYER var/mob/living/caster //who made this, anyway -/obj/effect/overlay/temp/hierophant/New(loc, new_caster) - ..() +/obj/effect/overlay/temp/hierophant/Initialize(mapload, new_caster) + . = ..() if(new_caster) caster = new_caster @@ -437,13 +437,13 @@ Difficulty: Hard light_range = 1 randomdir = FALSE -/obj/effect/overlay/temp/hierophant/squares/New(loc, new_caster) - ..() +/obj/effect/overlay/temp/hierophant/squares/Initialize(mapload, new_caster) + . = ..() if(ismineralturf(loc)) var/turf/closed/mineral/M = loc M.gets_drilled(caster) -/obj/effect/overlay/temp/hierophant/wall //smoothing and pooling are not friends. TODO: figure this out +/obj/effect/overlay/temp/hierophant/wall //smoothing and pooling were not friends, but pooling is dead. name = "vortex wall" icon = 'icons/turf/walls/hierophant_wall_temp.dmi' icon_state = "wall" @@ -451,15 +451,14 @@ Difficulty: Hard duration = 100 smooth = SMOOTH_TRUE -/obj/effect/overlay/temp/hierophant/wall/New(loc, new_caster) - ..() +/obj/effect/overlay/temp/hierophant/wall/Initialize(mapload, new_caster) + . = ..() queue_smooth_neighbors(src) queue_smooth(src) /obj/effect/overlay/temp/hierophant/wall/Destroy() queue_smooth_neighbors(src) - ..() - return QDEL_HINT_QUEUE + return ..() /obj/effect/overlay/temp/hierophant/wall/CanPass(atom/movable/mover, turf/target, height = 0) if(mover == caster) @@ -480,8 +479,8 @@ Difficulty: Hard var/currently_seeking = FALSE var/friendly_fire_check = FALSE //if blasts produced apply friendly fire -/obj/effect/overlay/temp/hierophant/chaser/New(loc, new_caster, new_target, new_speed, is_friendly_fire) - ..() +/obj/effect/overlay/temp/hierophant/chaser/Initialize(mapload, new_caster, new_target, new_speed, is_friendly_fire) + . = ..() target = new_target friendly_fire_check = is_friendly_fire if(new_speed) @@ -558,8 +557,8 @@ Difficulty: Hard var/friendly_fire_check = FALSE var/bursting = FALSE //if we're bursting and need to hit anyone crossing us -/obj/effect/overlay/temp/hierophant/blast/New(loc, new_caster, friendly_fire) - ..() +/obj/effect/overlay/temp/hierophant/blast/Initialize(mapload, new_caster, friendly_fire) + . = ..() friendly_fire_check = friendly_fire if(new_caster) hit_things += new_caster diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index b5c2a93996..f5df46cb7b 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -204,7 +204,8 @@ dismemberment = 20 impact_effect_type = /obj/effect/overlay/temp/impact_effect/purple_laser -/obj/item/projectile/plasma/New() +/obj/item/projectile/plasma/Initialize() + . = ..() var/turf/proj_turf = get_turf(src) if(!isturf(proj_turf)) return @@ -215,7 +216,6 @@ name = "full strength [name]" damage *= 4 range *= 2 - ..() /obj/item/projectile/plasma/on_hit(atom/target) . = ..() @@ -254,9 +254,10 @@ var/power = 4 var/list/thrown_items = list() -/obj/item/projectile/gravityrepulse/New(var/obj/item/ammo_casing/energy/gravityrepulse/C) - ..() - if(C) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items +/obj/item/projectile/gravityrepulse/Initialize() + . = ..() + var/obj/item/ammo_casing/energy/gravityrepulse/C = loc + if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items power = min(C.gun.power, 15) /obj/item/projectile/gravityrepulse/on_hit() @@ -284,9 +285,10 @@ var/power = 4 var/list/thrown_items = list() -/obj/item/projectile/gravityattract/New(var/obj/item/ammo_casing/energy/gravityattract/C) - ..() - if(C) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items +/obj/item/projectile/gravityattract/Initialize() + . = ..() + var/obj/item/ammo_casing/energy/gravityattract/C = loc + if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items power = min(C.gun.power, 15) /obj/item/projectile/gravityattract/on_hit() @@ -313,9 +315,10 @@ var/power = 4 var/list/thrown_items = list() -/obj/item/projectile/gravitychaos/New(var/obj/item/ammo_casing/energy/gravitychaos/C) - ..() - if(C) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items +/obj/item/projectile/gravitychaos/Initialize() + . = ..() + var/obj/item/ammo_casing/energy/gravitychaos/C = loc + if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items power = min(C.gun.power, 15) /obj/item/projectile/gravitychaos/on_hit() diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index f8989a2304..da1eb90685 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -52,8 +52,8 @@ "toxin" ) -/obj/machinery/chem_dispenser/New() - ..() +/obj/machinery/chem_dispenser/Initialize() + . = ..() recharge() dispensable_reagents = sortList(dispensable_reagents) @@ -244,8 +244,8 @@ ) ) -/obj/machinery/chem_dispenser/constructable/New() - ..() +/obj/machinery/chem_dispenser/constructable/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/chem_dispenser(null) B.apply_default_parts(src) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 2c6f7712e4..da728fea89 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -12,8 +12,8 @@ var/heater_coefficient = 0.10 var/on = FALSE -/obj/machinery/chem_heater/New() - ..() +/obj/machinery/chem_heater/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/chem_heater(null) B.apply_default_parts(src) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index a94a1c01ff..93628a9cc1 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -17,12 +17,12 @@ var/useramount = 30 // Last used amount layer = BELOW_OBJ_LAYER -/obj/machinery/chem_master/New() +/obj/machinery/chem_master/Initialize() create_reagents(100) add_overlay("waitlight") var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/chem_master(null) B.apply_default_parts(src) - ..() + . = ..() /obj/item/weapon/circuitboard/machine/chem_master name = "ChemMaster 3000 (Machine Board)" diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index cfc8198b38..5a73c5dcf4 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -13,8 +13,8 @@ var/wait = null var/obj/item/weapon/reagent_containers/beaker = null -/obj/machinery/computer/pandemic/New() - ..() +/obj/machinery/computer/pandemic/Initialize() + . = ..() update_icon() /obj/machinery/computer/pandemic/proc/GetVirusByIndex(index) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 5c8d695007..9f5073075f 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -89,10 +89,9 @@ var/list/holdingitems = list() -/obj/machinery/reagentgrinder/New() - ..() +/obj/machinery/reagentgrinder/Initialize() + . = ..() beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src) - return /obj/machinery/reagentgrinder/Destroy() if(beaker) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 92662600d8..11b38d1e65 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -12,9 +12,9 @@ var/disease_amount = 20 var/spillable = 0 -/obj/item/weapon/reagent_containers/New(location, vol = 0) - ..() - if (isnum(vol) && vol > 0) +/obj/item/weapon/reagent_containers/Initialize(mapload, vol) + . = ..() + if(isnum(vol) && vol > 0) volume = vol create_reagents(volume) if(spawned_disease) diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 1ed89a74db..ab46730873 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -7,8 +7,8 @@ var/blood_type = null var/labelled = 0 -/obj/item/weapon/reagent_containers/blood/New() - ..() +/obj/item/weapon/reagent_containers/blood/Initialize() + . = ..() if(blood_type != null) reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) update_icon() @@ -43,9 +43,9 @@ if(51 to INFINITY) icon_state = "full" -/obj/item/weapon/reagent_containers/blood/random/New() +/obj/item/weapon/reagent_containers/blood/random/Initialize() blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L") - ..() + . = ..() /obj/item/weapon/reagent_containers/blood/APlus blood_type = "A+" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ee6da85de0..ee0cc3c8b4 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -30,8 +30,8 @@ Borg Hypospray //Used as list for input() in shakers. -/obj/item/weapon/reagent_containers/borghypo/New() - ..() +/obj/item/weapon/reagent_containers/borghypo/Initialize() + . = ..() for(var/R in reagent_ids) add_reagent(R) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index fc08ebdbe8..a92c52abf4 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -9,8 +9,8 @@ volume = 30 -/obj/item/weapon/reagent_containers/glass/bottle/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/Initialize() + . = ..() if(!icon_state) icon_state = "bottle" update_icon() @@ -139,8 +139,8 @@ icon_state = "bottle16" var/extra_reagent = null -/obj/item/weapon/reagent_containers/glass/bottle/traitor/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/traitor/Initialize() + . = ..() extra_reagent = pick("polonium", "histamine", "formaldehyde", "venom", "neurotoxin2", "cyanide") reagents.add_reagent("[extra_reagent]", 3) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 10b584cdfb..65574b5d34 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -122,8 +122,8 @@ item_state = "beaker" materials = list(MAT_GLASS=500) -/obj/item/weapon/reagent_containers/glass/beaker/New() - ..() +/obj/item/weapon/reagent_containers/glass/beaker/Initialize() + . = ..() update_icon() /obj/item/weapon/reagent_containers/glass/beaker/on_reagent_change() @@ -176,8 +176,8 @@ origin_tech = "materials=2;engineering=3;plasmatech=3" flags = OPENCONTAINER -/obj/item/weapon/reagent_containers/glass/beaker/noreact/New() - ..() +/obj/item/weapon/reagent_containers/glass/beaker/noreact/Initialize() + . = ..() reagents.set_reacting(FALSE) /obj/item/weapon/reagent_containers/glass/beaker/bluespace diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 11d4303ce8..b6bc9b2ccf 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -11,8 +11,8 @@ var/roundstart = 0 var/self_delay = 0 //pills are instant, this is because patches inheret their aplication from pills -/obj/item/weapon/reagent_containers/pill/New() - ..() +/obj/item/weapon/reagent_containers/pill/Initialize() + . = ..() if(!icon_state) icon_state = "pill[rand(1,20)]" if(reagents.total_volume && roundstart) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index eea1fe7a2b..f4f6d3a521 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -16,8 +16,8 @@ materials = list(MAT_METAL=10, MAT_GLASS=20) container_type = TRANSPARENT -/obj/item/weapon/reagent_containers/syringe/New() - ..() +/obj/item/weapon/reagent_containers/syringe/Initialize() + . = ..() if(list_reagents) //syringe starts in inject mode if its already got something inside mode = SYRINGE_INJECT update_icon() @@ -242,7 +242,7 @@ volume = 20 origin_tech = "materials=3;engineering=3" -/obj/item/weapon/reagent_containers/syringe/noreact/New() +/obj/item/weapon/reagent_containers/syringe/noreact/Initialize() . = ..() reagents.set_reacting(FALSE) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index f3bc94c4e6..1844dc53ab 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -23,10 +23,10 @@ else return ..() -/obj/structure/reagent_dispensers/New() +/obj/structure/reagent_dispensers/Initialize() create_reagents(tank_volume) reagents.add_reagent(reagent_id, tank_volume) - ..() + . = ..() /obj/structure/reagent_dispensers/examine(mob/user) ..() @@ -129,8 +129,8 @@ density = 0 reagent_id = "condensedcapsaicin" -/obj/structure/reagent_dispensers/peppertank/New() - ..() +/obj/structure/reagent_dispensers/peppertank/Initialize() + . = ..() if(prob(1)) desc = "IT'S PEPPER TIME, BITCH!" diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 264b6a167d..21f663bd5d 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -24,8 +24,8 @@ // Auto conveyour is always on unless unpowered -/obj/machinery/conveyor/auto/New(loc, newdir) - ..(loc, newdir) +/obj/machinery/conveyor/auto/Initialize(mapload, newdir) + . = ..() operating = 1 update_move_direction() @@ -43,8 +43,8 @@ icon_state = "conveyor[operating * verted]" // create a conveyor -/obj/machinery/conveyor/New(loc, newdir) - ..(loc) +/obj/machinery/conveyor/Initialize(mapload, newdir) + . = ..() if(newdir) setDir(newdir) update_move_direction() @@ -326,8 +326,8 @@ w_class = WEIGHT_CLASS_BULKY var/id = "" //inherited by the switch -/obj/item/conveyor_switch_construct/New() - ..() +/obj/item/conveyor_switch_construct/Initialize() + . = ..() id = rand() //this couldn't possibly go wrong /obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity) diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm index 531af92238..6ea1d958b3 100644 --- a/code/modules/recycling/disposal-structures.dm +++ b/code/modules/recycling/disposal-structures.dm @@ -147,8 +147,8 @@ var/obj/structure/disposalconstruct/stored // new pipe, set the icon_state as on map -/obj/structure/disposalpipe/New(loc,var/obj/structure/disposalconstruct/make_from) - ..() +/obj/structure/disposalpipe/Initialize(mapload, obj/structure/disposalconstruct/make_from) + . = ..() if(make_from && !QDELETED(make_from)) base_icon_state = make_from.base_state @@ -176,7 +176,6 @@ stored.ptype = DISP_SORTJUNCTION if("pipe-j2s") stored.ptype = DISP_SORTJUNCTION_FLIP - return // pipe is deleted @@ -359,15 +358,14 @@ /obj/structure/disposalpipe/segment icon_state = "pipe-s" -/obj/structure/disposalpipe/segment/New() - ..() +/obj/structure/disposalpipe/segment/Initialize() + . = ..() if(stored.ptype == DISP_PIPE_STRAIGHT) dpdir = dir | turn(dir, 180) else dpdir = dir | turn(dir, -90) update() - return @@ -376,8 +374,8 @@ /obj/structure/disposalpipe/junction icon_state = "pipe-j1" -/obj/structure/disposalpipe/junction/New() - ..() +/obj/structure/disposalpipe/junction/Initialize() + . = ..() switch(stored.ptype) if(DISP_JUNCTION) dpdir = dir | turn(dir, -90) | turn(dir,180) @@ -386,7 +384,6 @@ if(DISP_YJUNCTION) dpdir = dir | turn(dir,90) | turn(dir, -90) update() - return // next direction to move @@ -452,8 +449,8 @@ dpdir = sortdir | posdir | negdir -/obj/structure/disposalpipe/sortjunction/New() - ..() +/obj/structure/disposalpipe/sortjunction/Initialize() + . = ..() // Generate a list of soring tags. if(sortType) @@ -468,7 +465,6 @@ updatedir() update() - return /obj/structure/disposalpipe/sortjunction/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/destTagger)) @@ -516,8 +512,8 @@ var/negdir = 0 var/sortdir = 0 -/obj/structure/disposalpipe/wrapsortjunction/New() - ..() +/obj/structure/disposalpipe/wrapsortjunction/Initialize() + . = ..() posdir = dir if(stored.ptype == DISP_SORTJUNCTION) sortdir = turn(posdir, -90) @@ -529,7 +525,6 @@ dpdir = sortdir | posdir | negdir update() - return // next direction to move // if coming in from negdir, then next is primary dir or sortdir @@ -557,14 +552,13 @@ icon_state = "pipe-t" var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet -/obj/structure/disposalpipe/trunk/New() - ..() +/obj/structure/disposalpipe/trunk/Initialize() + . = ..() dpdir = dir spawn(1) getlinked() update() - return /obj/structure/disposalpipe/trunk/Destroy() if(linked) @@ -631,8 +625,8 @@ // i.e. will be treated as an empty turf desc = "A broken piece of disposal pipe." -/obj/structure/disposalpipe/broken/New() - ..() +/obj/structure/disposalpipe/broken/Initialize() + . = ..() update() // the disposal outlet machine @@ -655,9 +649,8 @@ var/start_eject = 0 var/eject_range = 2 -/obj/structure/disposaloutlet/New(loc, var/obj/structure/disposalconstruct/make_from) - ..() - +/obj/structure/disposaloutlet/Initialize(mapload, obj/structure/disposalconstruct/make_from) + . = ..() if(make_from) setDir(make_from.dir) make_from.loc = src diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm index 9b1d5e649f..efb428f5f6 100644 --- a/code/modules/recycling/disposal-unit.dm +++ b/code/modules/recycling/disposal-unit.dm @@ -26,9 +26,8 @@ // create a new disposal // find the attached trunk (if present) and init gas resvr. -/obj/machinery/disposal/New(loc, var/obj/structure/disposalconstruct/make_from) - ..() - +/obj/machinery/disposal/Initialize(mapload, obj/structure/disposalconstruct/make_from) + . = ..() if(make_from) setDir(make_from.dir) make_from.loc = 0 @@ -445,8 +444,8 @@ icon_state = "intake" pressure_charging = FALSE // the chute doesn't need charging and always works -/obj/machinery/disposal/deliveryChute/New(loc,var/obj/structure/disposalconstruct/make_from) - ..() +/obj/machinery/disposal/deliveryChute/Initialize(mapload, obj/structure/disposalconstruct/make_from) + . = ..() stored.ptype = DISP_END_CHUTE spawn(5) trunk = locate() in loc diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 7b40e91bc8..76c7a22f60 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -27,8 +27,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). "Computer Parts" ) -/obj/machinery/r_n_d/circuit_imprinter/New() - ..() +/obj/machinery/r_n_d/circuit_imprinter/Initialize() + . = ..() materials = new(src, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE)) create_reagents(0) var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/circuit_imprinter(null) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index ab2ee3e9b2..15d8e5e80c 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -54,10 +54,10 @@ other types of metals and chemistry for reagents). var/list/blueprints = list() var/max_blueprints = 1 -/obj/item/weapon/disk/design_disk/New() - ..() - src.pixel_x = rand(-5, 5) - src.pixel_y = rand(-5, 5) +/obj/item/weapon/disk/design_disk/Initialize() + . = ..() + pixel_x = rand(-5, 5) + pixel_y = rand(-5, 5) for(var/i in 1 to max_blueprints) blueprints += null diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 8ec99809bf..5adfb14f88 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -13,8 +13,8 @@ Note: Must be placed within 3 tiles of the R&D Console icon_state = "d_analyzer" var/decon_mod = 0 -/obj/machinery/r_n_d/destructive_analyzer/New() - ..() +/obj/machinery/r_n_d/destructive_analyzer/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/destructive_analyzer(null) B.apply_default_parts(src) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index c8f580cc34..fba7f241d2 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -79,8 +79,8 @@ critical_items += I -/obj/machinery/r_n_d/experimentor/New() - ..() +/obj/machinery/r_n_d/experimentor/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/experimentor(null) B.apply_default_parts(src) @@ -589,8 +589,8 @@ var/cooldownMax = 60 var/cooldown -/obj/item/weapon/relic/New() - ..() +/obj/item/weapon/relic/Initialize() + . = ..() icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank") realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","illegal tech","weapon")]" diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index f0d563b1ff..46bfab3788 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -78,12 +78,11 @@ GLOBAL_LIST_INIT(message_servers, list()) var/active = 1 var/decryptkey = "password" -/obj/machinery/message_server/New() +/obj/machinery/message_server/Initialize() GLOB.message_servers += src decryptkey = GenerateKey() send_pda_message("System Administrator", "system", "This is an automated message. The messaging system is functioning correctly.") - ..() - return + . = ..() /obj/machinery/message_server/Destroy() GLOB.message_servers -= src diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index f6cbe90299..c6e742cbba 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -31,8 +31,8 @@ Note: Must be placed west/left of and R&D console to function. ) -/obj/machinery/r_n_d/protolathe/New() - ..() +/obj/machinery/r_n_d/protolathe/Initialize() + . = ..() create_reagents(0) materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE)) var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/protolathe(null) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index ed5190a701..b65ba70575 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -100,8 +100,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, C.files.RefreshResearch() -/obj/machinery/computer/rdconsole/New() - ..() +/obj/machinery/computer/rdconsole/Initialize() + . = ..() files = new /datum/research(src) //Setup the research data holder. matching_designs = list() if(!id) @@ -1065,8 +1065,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, req_access = null req_access_txt = "29" -/obj/machinery/computer/rdconsole/robotics/New() - ..() +/obj/machinery/computer/rdconsole/robotics/Initialize() + . = ..() if(circuit) circuit.name = "RD Console - Robotics (Computer Board)" circuit.build_path = /obj/machinery/computer/rdconsole/robotics diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 4dfcf3ff85..ea7f5e727b 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -16,8 +16,8 @@ var/obj/machinery/computer/rdconsole/linked_console var/obj/item/loaded_item = null //the item loaded inside the machine (currently only used by experimentor and destructive analyzer) -/obj/machinery/r_n_d/New() - ..() +/obj/machinery/r_n_d/Initialize() + . = ..() wires = new /datum/wires/r_n_d(src) /obj/machinery/r_n_d/Destroy() diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index deb8d34ffc..d6abc1b8fd 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -313,10 +313,10 @@ research holder datum. var/list/tech_stored = list() var/max_tech_stored = 1 -/obj/item/weapon/disk/tech_disk/New() - ..() - src.pixel_x = rand(-5, 5) - src.pixel_y = rand(-5, 5) +/obj/item/weapon/disk/tech_disk/Initialize() + . = ..() + pixel_x = rand(-5, 5) + pixel_y = rand(-5, 5) for(var/i in 1 to max_tech_stored) tech_stored += null @@ -339,8 +339,8 @@ research holder datum. materials = list() max_tech_stored = 0 -/obj/item/weapon/disk/tech_disk/debug/New() - ..() +/obj/item/weapon/disk/tech_disk/debug/Initialize() + . = ..() var/list/techs = subtypesof(/datum/tech) max_tech_stored = techs.len for(var/V in techs) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 42143f6e3a..468185e615 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -14,8 +14,8 @@ var/delay = 10 req_access = list(GLOB.access_rd) //Only the R&D can change server settings. -/obj/machinery/r_n_d/server/New() - ..() +/obj/machinery/r_n_d/server/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/rdserver(null) B.apply_default_parts(src) diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 74b5bc0121..0c32efbb64 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -72,10 +72,10 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi w_class = WEIGHT_CLASS_SMALL var/rating = 1 -/obj/item/weapon/stock_parts/New() - ..() - src.pixel_x = rand(-5, 5) - src.pixel_y = rand(-5, 5) +/obj/item/weapon/stock_parts/Initialize() + . = ..() + pixel_x = rand(-5, 5) + pixel_y = rand(-5, 5) //Rating 1 diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 38d742c5be..c668595699 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -25,9 +25,9 @@ qdel(O) ..() -/obj/item/slime_extract/New() - ..() - create_reagents(100) +/obj/item/slime_extract/Initialize() + . = ..() + create_reagents(100) /obj/item/slime_extract/grey name = "grey slime extract" @@ -559,8 +559,8 @@ var/duration = 140 alpha = 125 -/obj/effect/timestop/New() - ..() +/obj/effect/timestop/Initialize() + . = ..() for(var/mob/living/M in GLOB.player_list) for(var/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop/T in M.mind.spell_list) //People who can stop time are immune to timestop immune |= M diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 376c8aa9f2..32fb4a46e5 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -24,8 +24,8 @@ icon_state = "datadisk1" max_blueprints = 1 -/obj/item/weapon/disk/design_disk/golem_shell/New() - ..() +/obj/item/weapon/disk/design_disk/golem_shell/Initialize() + . = ..() var/datum/design/golem_shell/G = new blueprints[1] = G diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index c5aacadecb..349d716d2d 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -45,7 +45,7 @@ anchored = FALSE density = TRUE -/obj/structure/cursed_money/New() +/obj/structure/cursed_money/Initialize() . = ..() addtimer(CALLBACK(src, .proc/collapse), 600) diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 6f6533326b..66f29b28d0 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -18,7 +18,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) var/mob/triggerer = null var/waiting = 0 -/obj/machinery/keycard_auth/New() +/obj/machinery/keycard_auth/Initialize() . = ..() ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, .proc/triggerEvent)) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 18aa94998e..0475a28068 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -10,8 +10,8 @@ var/admin_controlled var/no_destination_swap = 0 -/obj/machinery/computer/shuttle/New(location, obj/item/weapon/circuitboard/computer/shuttle/C) - ..() +/obj/machinery/computer/shuttle/Initialize(mapload, obj/item/weapon/circuitboard/computer/shuttle/C) + . = ..() if(istype(C)) possible_destinations = C.possible_destinations shuttleId = C.shuttleId diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 553210a5f7..147f607075 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -412,8 +412,8 @@ to_chat(usr, "Escape pods will only launch during \"Code Red\" security alert.") return 1 -/obj/docking_port/mobile/pod/New() - ..() +/obj/docking_port/mobile/pod/Initialize() + . = ..() if(id == "pod") WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.") @@ -492,8 +492,7 @@ icon_state = "safe" var/unlocked = FALSE -/obj/item/weapon/storage/pod/New() - ..() +/obj/item/weapon/storage/pod/PopulateContents() new /obj/item/clothing/head/helmet/space/orange(src) new /obj/item/clothing/head/helmet/space/orange(src) new /obj/item/clothing/suit/space/orange(src) @@ -533,13 +532,13 @@ dir = EAST roundstart_move = "backup_away" -/obj/docking_port/mobile/emergency/backup/New() +/obj/docking_port/mobile/emergency/backup/Initialize() // We want to be a valid emergency shuttle // but not be the main one, keep whatever's set // valid. // backup shuttle ignores `timid` because THERE SHOULD BE NO TOUCHING IT var/current_emergency = SSshuttle.emergency - ..() + . = ..() SSshuttle.emergency = current_emergency SSshuttle.backup_shuttle = src diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm index 594a6855da..0ec4709301 100644 --- a/code/modules/shuttle/manipulator.dm +++ b/code/modules/shuttle/manipulator.dm @@ -20,7 +20,7 @@ var/obj/docking_port/mobile/preview_shuttle var/datum/map_template/shuttle/preview_template -/obj/machinery/shuttle_manipulator/New() +/obj/machinery/shuttle_manipulator/Initialize() . = ..() update_icon() diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index f214d018b4..de9338d55d 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -145,8 +145,8 @@ var/area_type = /area/space var/last_dock_time -/obj/docking_port/stationary/New() - ..() +/obj/docking_port/stationary/Initialize() + . = ..() SSshuttle.stationary += src if(!id) id = "[SSshuttle.stationary.len]" @@ -168,8 +168,8 @@ var/area/shuttle/transit/assigned_area var/obj/docking_port/mobile/owner -/obj/docking_port/stationary/transit/New() - ..() +/obj/docking_port/stationary/transit/Initialize() + . = ..() SSshuttle.transit += src /obj/docking_port/stationary/transit/proc/dezone() @@ -223,8 +223,8 @@ var/list/ripples = list() -/obj/docking_port/mobile/New() - ..() +/obj/docking_port/mobile/Initialize() + . = ..() if(!timid) register() diff --git a/code/modules/shuttle/shuttle.dm.rej b/code/modules/shuttle/shuttle.dm.rej new file mode 100644 index 0000000000..5dc3c5a13a --- /dev/null +++ b/code/modules/shuttle/shuttle.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm (rejected hunks) +@@ -316,7 +316,7 @@ + if(!check_dock(S)) + testing("check_dock failed on request for [src]") + return +- ++ + if(mode == SHUTTLE_IGNITING && destination == S) + return + diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index b78d0efd84..78732d82e4 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -14,7 +14,7 @@ var/tables_required = 2 active = FALSE -/obj/machinery/power/emitter/energycannon/magical/New() +/obj/machinery/power/emitter/energycannon/magical/Initialize() . = ..() if(prob(50)) desc = "Oh no, not again." diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 22a408ec6c..83ef7f06eb 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -31,9 +31,9 @@ var/challenge = FALSE var/moved = FALSE -/obj/item/weapon/circuitboard/computer/syndicate_shuttle/New() +/obj/item/weapon/circuitboard/computer/syndicate_shuttle/Initialize() + . = ..() GLOB.syndicate_shuttle_boards += src - ..() /obj/item/weapon/circuitboard/computer/syndicate_shuttle/Destroy() GLOB.syndicate_shuttle_boards -= src diff --git a/code/modules/shuttle/transit.dm b/code/modules/shuttle/transit.dm index c03d4a2645..7bf217d1ff 100644 --- a/code/modules/shuttle/transit.dm +++ b/code/modules/shuttle/transit.dm @@ -5,7 +5,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "at_shield1" -/obj/effect/landmark/transit/New() +/obj/effect/landmark/transit/Initialize() . = ..() GLOB.transit_markers += src diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index bdab8b6c22..cc3f2c1ab9 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -223,8 +223,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th /obj/effect/proc_holder/spell/proc/playMagSound() playsound(get_turf(usr), sound,50,1) -/obj/effect/proc_holder/spell/New() - ..() +/obj/effect/proc_holder/spell/Initialize() + . = ..() action = new(src) still_recharging_msg = "[name] is still recharging." diff --git a/code/modules/spells/spell_types/forcewall.dm b/code/modules/spells/spell_types/forcewall.dm index 6579171738..8b2a40fe59 100644 --- a/code/modules/spells/spell_types/forcewall.dm +++ b/code/modules/spells/spell_types/forcewall.dm @@ -26,8 +26,8 @@ /obj/effect/forcefield/wizard var/mob/wizard -/obj/effect/forcefield/wizard/New(atom/loc, mob/summoner) - ..() +/obj/effect/forcefield/wizard/Initialize(mapload, mob/summoner) + . = ..() wizard = summoner QDEL_IN(src, 300) diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 20d223354b..26c543537e 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -14,9 +14,9 @@ throw_range = 0 throw_speed = 0 -/obj/item/weapon/melee/touch_attack/New(var/spell) - attached_spell = spell - ..() +/obj/item/weapon/melee/touch_attack/Initialize() + attached_spell = loc + . = ..() /obj/item/weapon/melee/touch_attack/attack(mob/target, mob/living/carbon/user) if(!iscarbon(user)) //Look ma, no hands diff --git a/code/modules/spells/spell_types/trigger.dm b/code/modules/spells/spell_types/trigger.dm index 4cd8107b6a..d219a22fca 100644 --- a/code/modules/spells/spell_types/trigger.dm +++ b/code/modules/spells/spell_types/trigger.dm @@ -5,8 +5,8 @@ var/list/linked_spells = list() //those are just referenced by the trigger spell and are unaffected by it directly var/list/starting_spells = list() //those are added on New() to contents from default spells and are deleted when the trigger spell is deleted to prevent memory leaks -/obj/effect/proc_holder/spell/targeted/trigger/New() - ..() +/obj/effect/proc_holder/spell/targeted/trigger/Initialize() + . = ..() for(var/spell in starting_spells) var/spell_to_add = text2path(spell) diff --git a/code/modules/station_goals/bsa.dm.rej b/code/modules/station_goals/bsa.dm.rej new file mode 100644 index 0000000000..d252acd18d --- /dev/null +++ b/code/modules/station_goals/bsa.dm.rej @@ -0,0 +1,12 @@ +diff a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm (rejected hunks) +@@ -161,8 +161,8 @@ + return locate(world.maxx,y,z) + return get_turf(src) + +-/obj/machinery/bsa/full/New(loc,cannon_direction = WEST) +- ..() ++/obj/machinery/bsa/full/Initialize(mapload,cannon_direction = WEST) ++ . = ..() + switch(cannon_direction) + if(WEST) + dir = WEST diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index 863d7d4bde..b89ed4bde0 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -99,8 +99,8 @@ var/static/gid = 0 var/id = 0 -/obj/machinery/satellite/New() - ..() +/obj/machinery/satellite/Initialize() + . = ..() id = gid++ /obj/machinery/satellite/interact(mob/user) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 1a0932f6e0..4fc22ec2c2 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -14,8 +14,8 @@ var/obj/item/holder = null // You can use this var for item path, it would be converted into an item on New() -/obj/item/organ/cyberimp/arm/New() - ..() +/obj/item/organ/cyberimp/arm/Initialize() + . = ..() if(ispath(holder)) holder = new holder(src) @@ -207,8 +207,8 @@ contents = newlist(/obj/item/device/assembly/flash/armimplant) origin_tech = "materials=4;combat=3;biotech=4;magnets=4;powerstorage=3" -/obj/item/organ/cyberimp/arm/flash/New() - ..() +/obj/item/organ/cyberimp/arm/flash/Initialize() + . = ..() if(locate(/obj/item/device/assembly/flash/armimplant) in items_list) var/obj/item/device/assembly/flash/armimplant/F = locate(/obj/item/device/assembly/flash/armimplant) in items_list F.I = src @@ -225,8 +225,8 @@ contents = newlist(/obj/item/weapon/melee/energy/blade/hardlight, /obj/item/weapon/gun/medbeam, /obj/item/borg/stun, /obj/item/device/assembly/flash/armimplant) origin_tech = "materials=5;combat=7;biotech=5;powerstorage=5;syndicate=6;programming=5" -/obj/item/organ/cyberimp/arm/combat/New() - ..() +/obj/item/organ/cyberimp/arm/combat/Initialize() + . = ..() if(locate(/obj/item/device/assembly/flash/armimplant) in items_list) var/obj/item/device/assembly/flash/armimplant/F = locate(/obj/item/device/assembly/flash/armimplant) in items_list F.I = src diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 7b4f98693c..ff2a3f0312 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -155,8 +155,7 @@ /obj/item/device/autosurgeon/reviver) var/amount = 5 -/obj/item/weapon/storage/box/cyber_implants/bundle/New() - ..() +/obj/item/weapon/storage/box/cyber_implants/PopulateContents() var/implant while(contents.len <= amount) implant = pick(boxed) diff --git a/code/modules/surgery/organs/organ_internal.dm.rej b/code/modules/surgery/organs/organ_internal.dm.rej new file mode 100644 index 0000000000..51db3e41ea --- /dev/null +++ b/code/modules/surgery/organs/organ_internal.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm (rejected hunks) +@@ -655,7 +655,7 @@ + var/phomeme_type = "sans" + var/list/phomeme_types = list("sans", "papyrus") + +-/obj/item/organ/tongue/bone/New() ++/obj/item/organ/tongue/bone/Initialize() + . = ..() + phomeme_type = pick(phomeme_types) + diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index d4e49215ad..5d85cde569 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -10,8 +10,8 @@ active_power_usage = 5000 var/efficiency -/obj/machinery/telepad/New() - ..() +/obj/machinery/telepad/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/telesci_pad(null) B.apply_default_parts(src) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index a6c909438e..9a0fdf55fc 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -30,9 +30,9 @@ var/list/crystals = list() var/obj/item/device/gps/inserted_gps -/obj/machinery/computer/telescience/New() +/obj/machinery/computer/telescience/Initialize() recalibrate() - ..() + . = ..() /obj/machinery/computer/telescience/Destroy() eject() diff --git a/code/modules/uplink/uplink.dm b/code/modules/uplink/uplink.dm index 8a72bd0566..f3379b9110 100644 --- a/code/modules/uplink/uplink.dm +++ b/code/modules/uplink/uplink.dm @@ -20,8 +20,8 @@ GLOBAL_LIST_EMPTY(uplinks) var/purchase_log = "" var/list/uplink_items -/obj/item/device/uplink/New() - ..() +/obj/item/device/uplink/Initialize() + . = ..() GLOB.uplinks += src uplink_items = get_uplink_items(gamemode) @@ -133,24 +133,24 @@ GLOBAL_LIST_EMPTY(uplinks) return hidden_uplink.attackby(I, user, params) // A collection of pre-set uplinks, for admin spawns. -/obj/item/device/radio/uplink/New() - ..() +/obj/item/device/radio/uplink/Initialize() + . = ..() icon_state = "radio" hidden_uplink = new(src) hidden_uplink.active = TRUE hidden_uplink.lockable = FALSE -/obj/item/device/radio/uplink/nuclear/New() - ..() +/obj/item/device/radio/uplink/nuclear/Initialize() + . = ..() hidden_uplink.set_gamemode(/datum/game_mode/nuclear) -/obj/item/device/multitool/uplink/New() - ..() +/obj/item/device/multitool/uplink/Initialize() + . = ..() hidden_uplink = new(src) hidden_uplink.active = TRUE hidden_uplink.lockable = FALSE -/obj/item/weapon/pen/uplink/New() - ..() +/obj/item/weapon/pen/uplink/Initialize() + . = ..() hidden_uplink = new(src) traitor_unlock_degrees = 360 diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index 5f663b85f8..4450f6bab8 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -34,7 +34,7 @@ density = 0 -/obj/vehicle/atv/turret/New() +/obj/vehicle/atv/turret/Initialize() . = ..() turret = new(loc) turret.base = src diff --git a/code/modules/vehicles/atv.dm.rej b/code/modules/vehicles/atv.dm.rej new file mode 100644 index 0000000000..4595beddc4 --- /dev/null +++ b/code/modules/vehicles/atv.dm.rej @@ -0,0 +1,12 @@ +diff a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm (rejected hunks) +@@ -9,8 +9,8 @@ + . = ..() + riding_datum = new/datum/riding/atv + +-/obj/vehicle/atv/New() +- ..() ++/obj/vehicle/atv/Initialize() ++ . = ..() + if(!atvcover) + atvcover = image("icons/obj/vehicles.dmi", "atvcover") + atvcover.layer = ABOVE_MOB_LAYER diff --git a/code/modules/vehicles/bicycle.dm b/code/modules/vehicles/bicycle.dm index 184b03a6bf..d51de5809c 100644 --- a/code/modules/vehicles/bicycle.dm +++ b/code/modules/vehicles/bicycle.dm @@ -7,8 +7,8 @@ var/static/list/bike_music = list('sound/misc/bike1.mid', 'sound/misc/bike2.mid', 'sound/misc/bike3.mid') -/obj/vehicle/bicycle/New() - ..() +/obj/vehicle/bicycle/Initialize() + . = ..() riding_datum = new/datum/riding/bicycle /obj/vehicle/bicycle/buckle_mob(mob/living/M, force = 0, check_loc = 1) diff --git a/code/modules/vehicles/speedbike.dm.rej b/code/modules/vehicles/speedbike.dm.rej new file mode 100644 index 0000000000..26fe1428c9 --- /dev/null +++ b/code/modules/vehicles/speedbike.dm.rej @@ -0,0 +1,23 @@ +diff a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm (rejected hunks) +@@ -16,20 +16,9 @@ + overlay.layer = ABOVE_MOB_LAYER + add_overlay(overlay) + +-/obj/effect/overlay/temp/speedbike_trail +- name = "speedbike trails" +- icon_state = "ion_fade" +- layer = BELOW_MOB_LAYER +- duration = 10 +- randomdir = 0 +- +-/obj/effect/overlay/temp/speedbike_trail/New(loc,move_dir) +- ..() +- setDir(move_dir) +- + /obj/vehicle/space/speedbike/Move(newloc,move_dir) + if(has_buckled_mobs()) +- new /obj/effect/overlay/temp/speedbike_trail(loc,move_dir) ++ new /obj/effect/overlay/temp/dir_setting/speedbike_trail(loc,move_dir) + . = ..() + + /obj/vehicle/space/speedbike/red diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 295d774595..f254ef6337 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -13,7 +13,7 @@ var/revive_time_max = 700 var/timer_id -/obj/item/organ/zombie_infection/New(loc) +/obj/item/organ/zombie_infection/Initialize() . = ..() if(iscarbon(loc)) Insert(loc) From b45d053ac61fa5ff7a4051dc036054dfab037d9e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 27 Apr 2017 02:32:35 -0500 Subject: [PATCH 005/131] When jumpsuits take severe damage, their suit sensors break. --- code/__DEFINES/misc.dm | 15 ++++++++ code/game/data_huds.dm | 2 +- code/game/machinery/computer/crew.dm | 10 +++--- code/modules/clothing/chameleon.dm | 2 +- code/modules/clothing/clothing.dm | 36 +++++++++++-------- code/modules/clothing/clothing.dm.rej | 29 +++++++++++++++ code/modules/clothing/under/jobs/civilian.dm | 2 +- code/modules/clothing/under/jobs/security.dm | 4 +-- code/modules/clothing/under/miscellaneous.dm | 6 ++-- code/modules/clothing/under/syndicate.dm | 2 +- .../research/xenobiology/xenobiology.dm | 2 +- 11 files changed, 80 insertions(+), 30 deletions(-) create mode 100644 code/modules/clothing/clothing.dm.rej diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index efb9b3addf..321bbf7b67 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -201,6 +201,21 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define BLOOD_STATE_XENO "xeno" #define BLOOD_STATE_OIL "oil" #define BLOOD_STATE_NOT_BLOODY "no blood whatsoever" + +//suit sensors: sensor_mode defines + +#define SENSOR_OFF 0 +#define SENSOR_LIVING 1 +#define SENSOR_VITALS 2 +#define SENSOR_COORDS 3 + +//suit sensors: has_sensor defines + +#define BROKEN_SENSORS -1 +#define NO_SENSORS 0 +#define HAS_SENSORS 1 +#define LOCKED_SENSORS 2 + //Turf wet states #define TURF_DRY 0 #define TURF_WET_WATER 1 diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index de830c856b..2e5854509a 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -24,7 +24,7 @@ if(!istype(H)) return 0 var/obj/item/clothing/under/U = H.w_uniform if(!istype(U)) return 0 - if(U.sensor_mode <= 2) return 0 + if(U.sensor_mode <= SENSOR_VITALS) return 0 return 1 /datum/atom_hud/data/human/medical/basic/add_to_single_hud(mob/M, mob/living/carbon/H) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 1d331051e6..65fbee45f0 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -153,8 +153,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) U = H.w_uniform // Are the suit sensors on? - if (U.has_sensor && U.sensor_mode) - pos = H.z == 0 || U.sensor_mode == 3 ? get_turf(H) : null + if ((U.has_sensor > 0) && U.sensor_mode) + pos = H.z == 0 || U.sensor_mode == SENSOR_COORDS ? get_turf(H) : null // Special case: If the mob is inside an object confirm the z-level on turf level. if (H.z == 0 && (!pos || pos.z != z)) continue @@ -170,10 +170,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) assignment = "" ijob = 80 - if (U.sensor_mode >= 1) life_status = (!H.stat ? "true" : "false") + if (U.sensor_mode >= SENSOR_LIVING) life_status = (!H.stat ? "true" : "false") else life_status = null - if (U.sensor_mode >= 2) + if (U.sensor_mode >= SENSOR_VITALS) dam1 = round(H.getOxyLoss(),1) dam2 = round(H.getToxLoss(),1) dam3 = round(H.getFireLoss(),1) @@ -184,7 +184,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) dam3 = null dam4 = null - if (U.sensor_mode >= 3) + if (U.sensor_mode >= SENSOR_COORDS) if (!pos) pos = get_turf(H) var/area/player_area = get_area(H) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index b15378c3b3..8f7547eaff 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -202,7 +202,7 @@ item_color = "black" desc = "It's a plain jumpsuit. It has a small dial on the wrist." origin_tech = "syndicate=2" - sensor_mode = 0 //Hey who's this guy on the Syndicate Shuttle?? + sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle?? random_sensor = 0 resistance_flags = 0 armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 26b052d2ce..de76034e48 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -83,7 +83,7 @@ C.use(1) update_clothes_damaged_state(FALSE) obj_integrity = max_integrity - to_chat(user, "You fix the damages on [src] with [C].") + to_chat(user, "You fix the damage on [src] with [C].") return 1 if(pockets) var/i = pockets.attackby(W, user, params) @@ -161,7 +161,7 @@ /obj/item/clothing/obj_break(damage_flag) if(!damaged_clothes) update_clothes_damaged_state(TRUE) - + to_chat(usr, "Your [src] starts to fall apart!") /obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE) var/index = "\ref[initial(icon)]-[initial(icon_state)]" @@ -519,9 +519,9 @@ BLIND // can't see anything slot_flags = SLOT_ICLOTHING armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women - var/has_sensor = 1//For the crew computer 2 = unable to change mode + var/has_sensor = HAS_SENSORS // For the crew computer var/random_sensor = 1 - var/sensor_mode = 0 /* 1 = Report living/dead, 2 = Report detailed damages, 3 = Report location */ + var/sensor_mode = NO_SENSORS var/can_adjust = 1 var/adjusted = NORMAL_STYLE var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only @@ -633,15 +633,18 @@ BLIND // can't see anything to_chat(user, "Alt-click on [src] to wear it normally.") else to_chat(user, "Alt-click on [src] to wear it casually.") - switch(sensor_mode) - if(0) - to_chat(user, "Its sensors appear to be disabled.") - if(1) - to_chat(user, "Its binary life sensors appear to be enabled.") - if(2) - to_chat(user, "Its vital tracker appears to be enabled.") - if(3) - to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.") + if (has_sensor == BROKEN_SENSORS) + to_chat(user, "Its sensors appear to be shorted out.") + else if(has_sensor > NO_SENSORS) + switch(sensor_mode) + if(SENSOR_OFF) + to_chat(user, "Its sensors appear to be disabled.") + if(SENSOR_LIVING) + to_chat(user, "Its binary life sensors appear to be enabled.") + if(SENSOR_VITALS) + to_chat(user, "Its vital tracker appears to be enabled.") + if(SENSOR_COORDS) + to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.") if(hastie) to_chat(user, "\A [hastie] is attached to it.") @@ -661,10 +664,13 @@ BLIND // can't see anything return if (!can_use(M)) return - if(src.has_sensor >= 2) + if(src.has_sensor == LOCKED_SENSORS) to_chat(usr, "The controls are locked.") return 0 - if(src.has_sensor <= 0) + if(src.has_sensor == BROKEN_SENSORS) + to_chat(usr, "The sensors have shorted out!") + return 0 + if(src.has_sensor <= NO_SENSORS) to_chat(usr, "This suit does not have any sensors.") return 0 diff --git a/code/modules/clothing/clothing.dm.rej b/code/modules/clothing/clothing.dm.rej new file mode 100644 index 0000000000..3deb315f37 --- /dev/null +++ b/code/modules/clothing/clothing.dm.rej @@ -0,0 +1,29 @@ +diff a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm (rejected hunks) +@@ -545,16 +545,26 @@ BLIND // can't see anything + tI.color = hastie.color + . += tI + ++/obj/item/clothing/under/attackby(obj/item/W, mob/user, params) ++ if((has_sensor == BROKEN_SENSORS) && istype(W, /obj/item/stack/cable_coil)) ++ var/obj/item/stack/cable_coil/C = W ++ C.use(1) ++ has_sensor = HAS_SENSORS ++ to_chat(user,"You repair the suit sensors on [src] with [C].") ++ return 1 ++ + /obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE) + ..() + if(ismob(loc)) + var/mob/M = loc + M.update_inv_w_uniform() ++ if(has_sensor > NO_SENSORS) ++ has_sensor = BROKEN_SENSORS + + /obj/item/clothing/under/New() + if(random_sensor) + //make the sensor mode favor higher levels, except coords. +- sensor_mode = pick(0, 1, 1, 2, 2, 2, 3, 3) ++ sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS) + adjusted = NORMAL_STYLE + ..() + diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index eb0d9d0edf..8c30774c02 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -14,7 +14,7 @@ icon_state = "captain" item_state = "b_suit" item_color = "captain" - sensor_mode = 3 + sensor_mode = SENSOR_COORDS random_sensor = 0 /obj/item/clothing/under/rank/cargo diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 15ebee3875..b44070c0e4 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -18,7 +18,7 @@ armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 30) strip_delay = 50 alt_covers_chest = 1 - sensor_mode = 3 + sensor_mode = SENSOR_COORDS random_sensor = 0 /obj/item/clothing/under/rank/security/grey @@ -27,7 +27,7 @@ icon_state = "security" item_state = "gy_suit" item_color = "security" - + /obj/item/clothing/under/rank/warden name = "security suit" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index d7b7e8ee1f..6aedfc13e6 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -61,8 +61,8 @@ icon_state = "prisoner" item_state = "o_suit" item_color = "prisoner" - has_sensor = 2 - sensor_mode = 3 + has_sensor = LOCKED_SENSORS + sensor_mode = SENSOR_COORDS random_sensor = 0 /obj/item/clothing/under/rank/mailman @@ -404,7 +404,7 @@ /obj/item/clothing/under/gladiator/ash_walker desc = "This gladiator uniform appears to be covered in ash and fairly dated." - has_sensor = 0 + has_sensor = NO_SENSORS /obj/item/clothing/under/sundress name = "sundress" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 83e7e59253..72aed9b7cf 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -4,7 +4,7 @@ icon_state = "syndicate" item_state = "bl_suit" item_color = "syndicate" - has_sensor = 0 + has_sensor = NO_SENSORS armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 40) alt_covers_chest = 1 diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 38d742c5be..c31a241489 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -420,7 +420,7 @@ item_color = "golem" flags = ABSTRACT | NODROP resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - has_sensor = 0 + has_sensor = NO_SENSORS /obj/item/clothing/suit/golem name = "adamantine shell" From 30f275d5f90a38267a7e675cca5201a57075a49c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 27 Apr 2017 09:26:09 -0500 Subject: [PATCH 006/131] Fixes being unable to empty an emagged cloning pod via manual ejection. --- code/game/machinery/cloning.dm | 14 +++++++------ code/game/machinery/cloning.dm.rej | 28 +++++++++++++++++++++++++ code/modules/mob/living/carbon/death.dm | 6 +++++- 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 code/game/machinery/cloning.dm.rej diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 5773db04be..4c7ecbe87e 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -317,7 +317,7 @@ return else connected_message("Authorized Ejection") - SPEAK("An authorized ejection of [occupant.real_name] has occurred.") + SPEAK("An authorized ejection of [clonemind.name] has occurred.") to_chat(user, "You force an emergency ejection. ") go_out() else @@ -345,7 +345,7 @@ if(mess) //Clean that mess and dump those gibs! mess = FALSE - new /obj/effect/gibspawner/generic(loc) + new /obj/effect/gibspawner/generic(loc) audible_message("You hear a splat.") icon_state = "pod_0" return @@ -358,7 +358,7 @@ to_chat(occupant, "There is a bright flash!
You feel like a new being.") occupant.flash_act() - var/turf/T = get_turf(src) + var/turf/T = get_turf(src) occupant.forceMove(T) icon_state = "pod_0" occupant.domutcheck(1) //Waiting until they're out before possible monkeyizing. The 1 argument forces powers to manifest. @@ -370,6 +370,8 @@ SPEAK("Critical error! Please contact a Thinktronic Systems \ technician, as your warranty may be affected.") mess = TRUE + for(var/obj/item/O in unattached_flesh) + qdel(O) icon_state = "pod_g" if(occupant.mind != clonemind) clonemind.transfer_to(occupant) @@ -378,16 +380,16 @@ to_chat(occupant, "Agony blazes across your consciousness as your body is torn apart.
Is this what dying is like? Yes it is.") playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 50, 0) occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50) - QDEL_IN(occupant, 40) + QDEL_IN(occupant, 40) /obj/machinery/clonepod/relaymove(mob/user) if(user.stat == CONSCIOUS) go_out() /obj/machinery/clonepod/emp_act(severity) - if(prob(100/(severity*efficiency))) + if((occupant || mess) && prob(100/(severity*efficiency))) connected_message(Gibberish("EMP-caused Accidental Ejection", 0)) - SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [occupant.real_name] prematurely." ,0)) + SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [clonemind.name] prematurely." ,0)) go_out() ..() diff --git a/code/game/machinery/cloning.dm.rej b/code/game/machinery/cloning.dm.rej new file mode 100644 index 0000000000..bd2462c1de --- /dev/null +++ b/code/game/machinery/cloning.dm.rej @@ -0,0 +1,28 @@ +diff a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm (rejected hunks) +@@ -343,7 +343,7 @@ + if(mess) //Clean that mess and dump those gibs! + mess = FALSE + for(var/obj/A in contents) +- if(istype(A, /obj/item/organ) || istype(A, /obj/effect/decal/cleanable/blood/gibs)) ++ if(istype(A, /obj/effect/decal/cleanable/blood/gibs)) + A.forceMove(T) + audible_message("You hear a splat.") + icon_state = "pod_0" +@@ -378,10 +378,13 @@ + to_chat(occupant, "Agony blazes across your consciousness as your body is torn apart.
Is this what dying is like? Yes it is.") + playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 50, 0) + occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50) +- var/obj/item/organ/brain/B = occupant.getorganslot("brain") +- B.Remove(occupant) +- B.forceMove(src) +- occupant.gib(TRUE, TRUE, TRUE) ++ addtimer(CALLBACK(src, .proc/end_malfunction, occupant), 40) ++ ++/obj/machinery/clonepod/proc/end_malfunction(mob/victim) ++ if(!istype(victim)) //Where the hell did they go? ++ return ++ victim.ghostize(FALSE) ++ victim.gib(TRUE, TRUE, TRUE) + + /obj/machinery/clonepod/relaymove(mob/user) + if(user.stat == CONSCIOUS) diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index ba757bd713..1d6d373db5 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -24,7 +24,8 @@ if(!no_bodyparts) if(no_organs)//so the organs don't get transfered inside the bodyparts we'll drop. for(var/X in internal_organs) - qdel(X) + if(no_brain || !istype(X, /obj/item/organ/brain)) + qdel(X) else //we're going to drop all bodyparts except chest, so the only organs that needs spilling are those inside it. for(var/X in internal_organs) var/obj/item/organ/O = X @@ -42,6 +43,9 @@ if(no_brain && istype(I, /obj/item/organ/brain)) qdel(I) continue + if(no_organs && !istype(I, /obj/item/organ/brain)) + qdel(I) + continue I.Remove(src) I.forceMove(get_turf(src)) I.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5) From 82ecda1353d7f19797c5a6888deda420fe9f6b7c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 27 Apr 2017 16:40:53 -0500 Subject: [PATCH 007/131] Server hop can now be used in lobby --- code/modules/mob/dead/dead.dm | 32 +++++++++++++++++++++- code/modules/mob/dead/observer/observer.dm | 26 ------------------ 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index 81f36bf221..bbaed3a8c4 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -5,6 +5,11 @@ args[1] = FALSE Initialize(arglist(args)) //EXIST DAMN YOU!!! +/mob/dead/Initialize() + . = ..() + if(config.cross_allowed) + verbs += /mob/dead/proc/server_hop + /mob/dead/dust() //ghosts can't be vaporised. return @@ -12,4 +17,29 @@ return /mob/dead/ConveyorMove() //lol - return \ No newline at end of file + return + + + +/mob/dead/proc/server_hop() + set category = "OOC" + set name = "Server Hop!" + set desc= "Jump to the other server" + if(notransform) + return + if(!config.cross_allowed) + verbs -= /mob/dead/proc/server_hop + to_chat(src, "Server Hop has been disabled.") + return + if (alert(src, "Jump to server running at [config.cross_address]?", "Server Hop", "Yes", "No") != "Yes") + return 0 + if (client && config.cross_allowed) + to_chat(src, "Sending you to [config.cross_address].") + new /obj/screen/splash(client) + notransform = TRUE + sleep(29) //let the animation play + notransform = FALSE + winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources + client << link(config.cross_address + "?server_hop=[key]") + else + to_chat(src, "There is no other server configured!") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 2c5b064137..44df294737 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -58,9 +58,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) verbs += /mob/dead/observer/proc/dead_tele - if(config.cross_allowed) - verbs += /mob/dead/observer/proc/server_hop - if(icon_state in GLOB.ghost_forms_with_directions_list) ghostimage_default = image(src.icon,src,src.icon_state + "_nodir") else @@ -586,29 +583,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp target.faction = list("neutral") return 1 -/mob/dead/observer/proc/server_hop() - set category = "Ghost" - set name = "Server Hop!" - set desc= "Jump to the other server" - if(notransform) - return - if(!config.cross_allowed) - verbs -= /mob/dead/observer/proc/server_hop - to_chat(src, "Server Hop has been disabled.") - return - if (alert(src, "Jump to server running at [config.cross_address]?", "Server Hop", "Yes", "No") != "Yes") - return 0 - if (client && config.cross_allowed) - to_chat(src, "Sending you to [config.cross_address].") - new /obj/screen/splash(client) - notransform = TRUE - sleep(29) //let the animation play - notransform = FALSE - winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources - client << link(config.cross_address + "?server_hop=[key]") - else - to_chat(src, "There is no other server configured!") - /proc/show_server_hop_transfer_screen(expected_key) //only show it to incoming ghosts for(var/mob/dead/observer/O in GLOB.player_list) From 58185531739c22450f715a4807608128f39bfd67 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 27 Apr 2017 17:00:24 -0500 Subject: [PATCH 008/131] Makes minibot listen on a configurable port --- bot/config.py | 1 + bot/minibot.py | 2 +- bot/nudge.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bot/config.py b/bot/config.py index 8888753ab7..c0ffc55bed 100644 --- a/bot/config.py +++ b/bot/config.py @@ -1,6 +1,7 @@ # Configuration for the minibot.py bot starts here server = "irc.rizon.net" port = 6667 +nudge_port = 45678 channels = ["#asdfgbus", "#botbus"] defaultchannel = "#asdfgbus" diff --git a/bot/minibot.py b/bot/minibot.py index 82e46722f8..cc5ac1a5b4 100644 --- a/bot/minibot.py +++ b/bot/minibot.py @@ -73,7 +73,7 @@ def setup_irc_socket(): def setup_nudge_socket(): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.bind(("", 45678)) # localhost:45678 + s.bind(("", nudge_port)) # localhost:nudge_port s.listen(5) logger.info("Nudge socket up and listening") return s diff --git a/bot/nudge.py b/bot/nudge.py index 7f195adae1..8a13c5636b 100644 --- a/bot/nudge.py +++ b/bot/nudge.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +from config import * import sys import pickle import socket @@ -16,7 +17,7 @@ def pack(): def nudge(data): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect(("localhost", 45678)) + s.connect(("localhost", nudge_port)) s.send(data) s.close() From 4a2e1367b5102f44ec089ff7ff9d3d7d342ad984 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 27 Apr 2017 17:01:29 -0500 Subject: [PATCH 009/131] Renames generic armor and athletic shorts --- code/modules/clothing/suits/armor.dm | 2 +- code/modules/clothing/suits/armor.dm.rej | 10 ++++++++++ code/modules/clothing/under/shorts.dm | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 code/modules/clothing/suits/armor.dm.rej diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index f05923f899..a8ed4d2100 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -13,7 +13,7 @@ armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50) /obj/item/clothing/suit/armor/vest - name = "armor" + name = "armor vest" desc = "A slim armored vest that protects against most types of damage." icon_state = "armoralt" item_state = "armoralt" diff --git a/code/modules/clothing/suits/armor.dm.rej b/code/modules/clothing/suits/armor.dm.rej new file mode 100644 index 0000000000..5996d94b57 --- /dev/null +++ b/code/modules/clothing/suits/armor.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm (rejected hunks) +@@ -140,7 +140,7 @@ + return 1 + + /obj/item/clothing/suit/armor/vest/det_suit +- name = "armor" ++ name = "detective's armor vest" + desc = "An armored vest with a detective's badge on it." + icon_state = "detective-armor" + allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/ballistic,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/weapon/melee/classic_baton/telescopic) diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 119527ec4f..dfef527fe1 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -8,25 +8,31 @@ can_adjust = 0 /obj/item/clothing/under/shorts/red + name = "red athletic shorts" icon_state = "redshorts" item_color = "redshorts" /obj/item/clothing/under/shorts/green + name = "green athletic shorts" icon_state = "greenshorts" item_color = "greenshorts" /obj/item/clothing/under/shorts/blue + name = "blue athletic shorts" icon_state = "blueshorts" item_color = "blueshorts" /obj/item/clothing/under/shorts/black + name = "black athletic shorts" icon_state = "blackshorts" item_color = "blackshorts" /obj/item/clothing/under/shorts/grey + name = "grey athletic shorts" icon_state = "greyshorts" item_color = "greyshorts" /obj/item/clothing/under/shorts/purple + name = "purple athletic shorts" icon_state = "purpleshorts" item_color = "purpleshorts" \ No newline at end of file From 3cd889b8ceac796d0995af1689935ce936773dfb Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 09:59:07 -0500 Subject: [PATCH 010/131] Language icons --- code/__DEFINES/language.dm | 2 + code/game/atoms_movable.dm | 2 +- code/game/machinery/requests_console.dm | 8 ++-- code/game/say.dm | 44 +++++++++++------- code/modules/language/common.dm | 4 +- code/modules/language/drone.dm | 4 +- code/modules/language/language.dm | 25 ++++++++++ code/modules/language/machine.dm | 4 +- code/modules/language/monkey.dm | 3 +- code/modules/language/ratvar.dm | 4 +- code/modules/language/slime.dm | 3 +- code/modules/language/swarmer.dm | 5 +- code/modules/language/xenocommon.dm | 3 +- code/modules/mob/living/carbon/human/say.dm | 11 ++--- code/modules/mob/living/say.dm | 21 ++++----- .../mob/living/simple_animal/simple_animal.dm | 4 +- icons/misc/language.dmi | Bin 0 -> 1455 bytes 17 files changed, 98 insertions(+), 49 deletions(-) create mode 100644 icons/misc/language.dmi diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm index 3f09f46817..e7818d7bf3 100644 --- a/code/__DEFINES/language.dm +++ b/code/__DEFINES/language.dm @@ -1,2 +1,4 @@ #define NO_STUTTER 1 #define TONGUELESS_SPEECH 2 +#define LANGUAGE_HIDE_ICON_IF_UNDERSTOOD 4 +#define LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD 8 diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 5d81e1f80c..dc418cbf89 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -120,7 +120,7 @@ if(flags & CLEAN_ON_MOVE) clean_on_move() - + var/datum/proximity_monitor/proximity_monitor = src.proximity_monitor if(proximity_monitor) proximity_monitor.HandleMove() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 648b44932a..7506008e79 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -439,12 +439,12 @@ GLOBAL_LIST_EMPTY(allConsoles) updateUsrDialog() return -/obj/machinery/requests_console/say_quote(input, list/spans, message_mode) +/obj/machinery/requests_console/say_mod(input, message_mode) var/ending = copytext(input, length(input) - 2) if (ending == "!!!") - return "blares, \"[attach_spans(input, spans)]\"" - - return ..() + . = "blares" + else + . = ..() /obj/machinery/requests_console/proc/clear_emergency() emergency = null diff --git a/code/game/say.dm b/code/game/say.dm index efad2f105f..deab83ad10 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -56,10 +56,16 @@ GLOBAL_LIST_INIT(freqtospan, list( var/namepart = "[speaker.GetVoice()][speaker.get_alt_name()]" //End name span. var/endspanpart = "" - //Message - var/messagepart = " [lang_treat(speaker, message_language, raw_message, spans, message_mode)]" - return "[spanpart1][spanpart2][freqpart][compose_track_href(speaker, namepart)][namepart][compose_job(speaker, message_language, raw_message, radio_freq)][endspanpart][messagepart]" + //Message + var/messagepart = " [lang_treat(speaker, message_language, raw_message, spans)]" + + var/languageicon = "" + var/datum/language/D = get_language_instance(message_language) + if(D.display_icon(src)) + languageicon = "[D.get_icon()] " + + return "[spanpart1][spanpart2][freqpart][languageicon][compose_track_href(speaker, namepart)][namepart][compose_job(speaker, message_language, raw_message, radio_freq)][endspanpart][messagepart]" /atom/movable/proc/compose_track_href(atom/movable/speaker, message_langs, raw_message, radio_freq) return "" @@ -67,33 +73,37 @@ GLOBAL_LIST_INIT(freqtospan, list( /atom/movable/proc/compose_job(atom/movable/speaker, message_langs, raw_message, radio_freq) return "" -/atom/movable/proc/say_quote(input, list/spans=list(), message_mode) - if(!input) - return "says, \"...\"" //not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code +/atom/movable/proc/say_mod(input, message_mode) var/ending = copytext(input, length(input)) if(copytext(input, length(input) - 1) == "!!") - spans |= SPAN_YELL - return "[verb_yell], \"[attach_spans(input, spans)]\"" - input = attach_spans(input, spans) - if(ending == "?") - return "[verb_ask], \"[input]\"" - if(ending == "!") - return "[verb_exclaim], \"[input]\"" + return verb_yell + else if(ending == "?") + return verb_ask + else if(ending == "!") + return verb_exclaim + else + return verb_say - return "[verb_say], \"[input]\"" +/atom/movable/proc/say_quote(input, list/spans=list(), message_mode) + if(!input) + input = "..." + + if(copytext(input, length(input) - 1) == "!!") + spans |= SPAN_YELL + + var/spanned = attach_spans(input, spans) + return "[say_mod(input, message_mode)], \"[spanned]\"" /atom/movable/proc/lang_treat(atom/movable/speaker, datum/language/language, raw_message, list/spans, message_mode) if(has_language(language)) var/atom/movable/AM = speaker.GetSource() if(AM) //Basically means "if the speaker is virtual" - if(AM.verb_say != speaker.verb_say || AM.verb_ask != speaker.verb_ask || AM.verb_exclaim != speaker.verb_exclaim || AM.verb_yell != speaker.verb_yell) //If the saymod was changed - return speaker.say_quote(raw_message, spans, message_mode) return AM.say_quote(raw_message, spans, message_mode) else return speaker.say_quote(raw_message, spans, message_mode) else if(language) var/atom/movable/AM = speaker.GetSource() - var/datum/language/D = new language + var/datum/language/D = get_language_instance(language) raw_message = D.scramble(raw_message) if(AM) return AM.say_quote(raw_message, spans, message_mode) diff --git a/code/modules/language/common.dm b/code/modules/language/common.dm index 9109ab395c..deb20e1cc6 100644 --- a/code/modules/language/common.dm +++ b/code/modules/language/common.dm @@ -5,9 +5,11 @@ speech_verb = "says" whisper_verb = "whispers" key = "0" - flags = TONGUELESS_SPEECH + flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_UNDERSTOOD default_priority = 100 + icon_state = "galcom" + //Syllable Lists /* This list really long, mainly because I can't make up my mind about which mandarin syllables should be removed, diff --git a/code/modules/language/drone.dm b/code/modules/language/drone.dm index 18f0ed3842..390e0027cf 100644 --- a/code/modules/language/drone.dm +++ b/code/modules/language/drone.dm @@ -4,7 +4,7 @@ speech_verb = "chitters" ask_verb = "chitters inquisitively" exclaim_verb = "chitters loudly" - spans = list(SPAN_ROBOT, "drone") + spans = list(SPAN_ROBOT) key = "d" flags = NO_STUTTER syllables = list(".", "|") @@ -12,3 +12,5 @@ space_chance = 0 sentence_chance = 0 default_priority = 20 + + icon_state = "drone" diff --git a/code/modules/language/language.dm b/code/modules/language/language.dm index 075850491c..4222982182 100644 --- a/code/modules/language/language.dm +++ b/code/modules/language/language.dm @@ -21,6 +21,21 @@ var/static/list/scramble_cache = list() var/default_priority = 0 // the language that an atom knows with the highest "default_priority" is selected by default. + // if you are seeing someone speak popcorn language, then something is wrong. + var/icon = 'icons/misc/language.dmi' + var/icon_state = "popcorn" + +/datum/language/proc/display_icon(atom/movable/hearer) + var/understands = hearer.has_language(src.type) + if(flags & LANGUAGE_HIDE_ICON_IF_UNDERSTOOD && understands) + return FALSE + if(flags & LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD && !understands) + return FALSE + return TRUE + +/datum/language/proc/get_icon() + return "" + /datum/language/proc/get_random_name(gender, name_count=2, syllable_count=4, syllable_divisor=2) if(!syllables || !syllables.len) if(gender==FEMALE) @@ -93,3 +108,13 @@ return speech_verb #undef SCRAMBLE_CACHE_LEN + +/proc/get_language_instance(langtype) + if(!ispath(langtype, /datum/language)) + return + + if(!GLOB.language_datums[langtype]) + var/datum/language/langdatum = new langtype + GLOB.language_datums[langtype] = langdatum + + . = GLOB.language_datums[langtype] diff --git a/code/modules/language/machine.dm b/code/modules/language/machine.dm index 3e8bff846e..822018407c 100644 --- a/code/modules/language/machine.dm +++ b/code/modules/language/machine.dm @@ -4,13 +4,15 @@ speech_verb = "whistles" ask_verb = "chirps" exclaim_verb = "whistles loudly" - spans = list(SPAN_ROBOT, "changeling") + spans = list(SPAN_ROBOT) key = "6" flags = NO_STUTTER syllables = list("beep","beep","beep","beep","beep","boop","boop","boop","bop","bop","dee","dee","doo","doo","hiss","hss","buzz","buzz","bzz","ksssh","keey","wurr","wahh","tzzz") space_chance = 10 default_priority = 90 + icon_state = "eal" + /datum/language/machine/get_random_name() if(prob(70)) return "[pick(GLOB.posibrain_names)]-[rand(100, 999)]" diff --git a/code/modules/language/monkey.dm b/code/modules/language/monkey.dm index 171cc95e04..d3ef541bb3 100644 --- a/code/modules/language/monkey.dm +++ b/code/modules/language/monkey.dm @@ -4,8 +4,9 @@ speech_verb = "chimpers" ask_verb = "chimpers" exclaim_verb = "screeches" - spans = list("monkey") key = "1" space_chance = 100 syllables = list("oop", "aak", "chee", "eek") default_priority = 80 + + icon_state = "animal" diff --git a/code/modules/language/ratvar.dm b/code/modules/language/ratvar.dm index 2319b40889..cef4a3164e 100644 --- a/code/modules/language/ratvar.dm +++ b/code/modules/language/ratvar.dm @@ -6,7 +6,9 @@ exclaim_verb = "clanks" key = "r" default_priority = 10 - spans = list(SPAN_ROBOT, "brass") + spans = list(SPAN_ROBOT) + + icon_state = "ratvar" /datum/language/ratvar/scramble(var/input) . = text2ratvar(input) diff --git a/code/modules/language/slime.dm b/code/modules/language/slime.dm index cc4c36e2ef..7171c07b39 100644 --- a/code/modules/language/slime.dm +++ b/code/modules/language/slime.dm @@ -4,7 +4,8 @@ speech_verb = "warbles" ask_verb = "warbles" exclaim_verb = "warbles" - spans = list("slime") key = "k" syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!") default_priority = 70 + + icon_state = "slime" diff --git a/code/modules/language/swarmer.dm b/code/modules/language/swarmer.dm index b17cb88bf2..e3b7826706 100644 --- a/code/modules/language/swarmer.dm +++ b/code/modules/language/swarmer.dm @@ -4,12 +4,15 @@ speech_verb = "tones" ask_verb = "tones inquisitively" exclaim_verb = "tones loudly" - spans = list(SPAN_ROBOT, "swarmer") + spans = list(SPAN_ROBOT) key = "s" flags = NO_STUTTER space_chance = 100 sentence_chance = 0 default_priority = 60 + + icon_state = "swarmer" + // since various flats and sharps are the same, // all non-accidental notes are doubled in the list /* The list with unicode symbols for the accents. diff --git a/code/modules/language/xenocommon.dm b/code/modules/language/xenocommon.dm index 17481aff04..f932b3c5af 100644 --- a/code/modules/language/xenocommon.dm +++ b/code/modules/language/xenocommon.dm @@ -4,7 +4,8 @@ speech_verb = "hisses" ask_verb = "hisses" exclaim_verb = "hisses" - spans = list("alien") key = "4" syllables = list("sss","sSs","SSS") default_priority = 50 + + icon_state = "xeno" diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index d5e872a404..69743c5d77 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -1,10 +1,9 @@ -/mob/living/carbon/human/say_quote(input, spans, message_mode) +/mob/living/carbon/human/say_mod(input, message_mode) verb_say = dna.species.say_mod - . = ..() - if(src.slurring) - input = attach_spans(input, spans) - return "slurs, \"[input]\"" - + if(slurring) + return "slurs" + else + . = ..() /mob/living/carbon/human/treat_message(message) message = dna.species.handle_speech(message,src) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 4cb8147b9e..33d9dd21b1 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -423,18 +423,17 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 3 return 0 -/mob/living/say_quote(input, list/spans, message_mode) - var/tempinput = attach_spans(input, spans) +/mob/living/say_mod(input, message_mode) if(message_mode == MODE_WHISPER) - return "[verb_whisper], \"[tempinput]\"" - if(message_mode == MODE_WHISPER_CRIT) - return "[verb_whisper] in [p_their()] last breath, \"[tempinput]\"" - if (stuttering) - return "stammers, \"[tempinput]\"" - if (getBrainLoss() >= 60) - return "gibbers, \"[tempinput]\"" - - return ..() + . = verb_whisper + else if(message_mode == MODE_WHISPER_CRIT) + . = "[verb_whisper] in [p_their()] last breath" + else if(stuttering) + . = "stammers" + else if(getBrainLoss() >= 60) + . = "gibbers" + else + . = ..() /mob/living/get_default_language() if(selected_default_language) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d2709e614c..043ddbb4fb 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -254,10 +254,10 @@ if(icon_gib) new /obj/effect/overlay/temp/gib_animation/animal(loc, icon_gib) -/mob/living/simple_animal/say_quote(input, list/spans) +/mob/living/simple_animal/say_mod(input, message_mode) if(speak_emote && speak_emote.len) verb_say = pick(speak_emote) - return ..() + . = ..() /mob/living/simple_animal/emote(act, m_type=1, message = null) if(stat) diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e961c351912a5b8dcf5d2f12ab5a08b5fdd0c5b5 GIT binary patch literal 1455 zcmV;g1yK5lP)7rM2Y@oo&Rg0|5B9y1x>;Hud9b(Z^i||pC z|A7DhRi^Eo|NpT6|76(kaJ2txssH!r>;OQk06Camm-z-hn*chQM~U?XJeX&l`v5nS zHFVoekNZi9^;?qiTa)unkNZP|?LdI(07kk1M797ztpGlz06d?2hif_j0004WQchC< zK<3zH00022dQ@0+L}hbha%pgMX>V=-0C=2@(Xk4`Fc1ddIeCiE?xG-WF47_$+IKjb zvkfM>atW>Y^i~UQa&G_6ef-On=2Bmq&QxuqXXNB4nzK3X_F65@=5Z~DlU5_TVa!`e z88WW1K=6fD)^U0tw7M|_-165vFp`KMy70#qL!N;}mb?ons|7fqyk?oAyw;P&G$GtY zInmS;N6`)7dkP}+?g?yvvC`CC_4(}!vpb0e+>(Qg000AaNklUDge2nd{=B;rhHV7vA$7fF;s%gqFCL1qhC9J3?P9pa3i{EiGFX-z=4bTv30n zH%%g##R5_a{PoM009jfIGJr|$O{ztmmr~C^2Z%RYv^N@xKsB@#z_!Z(i;Iip03%Pq zhIz*pDHIAwO;~YPbbz5bXylD_oUDn(0@lPKlKN$>hzh{C-)^n3 zHO^2a&?47&yImrzcl-^19ka78^*wf)^$LWh4v=yL0C@N2hVS|toA4nBy)z7>m)D`G zBfQnF(!)Z>M*^F00KFjyEq0bhv5?KY0$n{kN<6E9C<1GH>>P&IX2u+%4AAklE|3Gp z+AX%mT5ZM*t@g5*UO~U*89tRxEJR^F#v4hy4ltwzO}<54aIw%7U4R7vU-OJ z`26MTx4rK_e$Hk}QTP_{F@)8hf?@pn{pat$*-X>V1JKJV{eK*sdVilIWNZKc002ov JPDHLkV1f Date: Fri, 28 Apr 2017 10:02:16 -0500 Subject: [PATCH 011/131] >unironically spelling unironically wrong --- code/modules/clothing/suits/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 66339b8c86..bc1f25cfa7 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -334,7 +334,7 @@ /obj/item/clothing/suit/vapeshirt //wearing this is asking to get beat. name = "Vape Naysh shirt" - desc = "A cheap white T-shirt with a big tacky \"VN\" on the front, Why would you wear this unironicly?" + desc = "A cheap white T-shirt with a big tacky \"VN\" on the front, Why would you wear this unironically?" icon_state = "vapeshirt" item_state = "vapeshirt" From c1853bf0df72804adf597ab0f077e80889ee9af8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 12:17:33 -0500 Subject: [PATCH 012/131] Librarians can speak any language --- code/modules/jobs/job_types/civilian.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index 60bb646b23..86185e2848 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -143,6 +143,15 @@ Librarian /obj/item/soapstone = 1 ) + +/datum/outfit/job/librarian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + + if(visualsOnly) + return + + H.grant_all_languages(omnitongue=TRUE) + /* Lawyer */ From 88323ff86c6e5af4852f9be7c37c753c96304ee2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 20:53:13 -0500 Subject: [PATCH 013/131] Fixes Linux buildscript chime when server ready --- tools/linux_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/linux_build.py b/tools/linux_build.py index bf23b2c531..99fb652b94 100644 --- a/tools/linux_build.py +++ b/tools/linux_build.py @@ -47,7 +47,7 @@ def stage3(profile_mode=False): try: while p.returncode is None: stdout = p.stdout.readline() - if "Initializations complete." in stdout: + if "Initializations complete" in stdout: play("sound/misc/server-ready.ogg") time_taken = time.time() - start_time print("{} seconds taken to fully start".format(time_taken)) From 49c81c8a1d2576f22cf82d8ee827c1923b379cdd Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 20:53:17 -0500 Subject: [PATCH 014/131] Rechargers no longer flash the charged animation before charging --- code/game/machinery/recharger.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 code/game/machinery/recharger.dm diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm old mode 100644 new mode 100755 index ca398539a0..a081e3eb80 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -61,7 +61,7 @@ G.loc = src charging = G use_power = 2 - update_icon() + update_icon(scan = TRUE) else to_chat(user, "[src] isn't connected to anything!") return 1 @@ -162,10 +162,13 @@ ..() -/obj/machinery/recharger/update_icon(using_power = 0) //we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier. +/obj/machinery/recharger/update_icon(using_power = 0, scan) //we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier. if(stat & (NOPOWER|BROKEN) || !anchored) icon_state = "rechargeroff" return + if(scan) + icon_state = "rechargeroff" + return if(panel_open) icon_state = "rechargeropen" return From 6aa436c87449b24585eeb1b925058a451d473ca6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 20:53:20 -0500 Subject: [PATCH 015/131] Whisper() now has the same args as Say() --- .../gamemodes/clock_cult/clock_helpers/ratvarian_language.dm | 2 +- code/modules/mob/living/say.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm b/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm index fcb30a096d..a9727017d3 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/ratvarian_language.dm @@ -106,6 +106,6 @@ List of nuances: if(!whisper) L.say(message, "clock", spans, language=/datum/language/common) else - L.whisper(message) + L.whisper(message, "clock", spans, language=/datum/language/common) else AM.say(message, language=/datum/language/common) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 4cb8147b9e..1c348af1d2 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -448,5 +448,5 @@ GLOBAL_LIST_INIT(department_radio_keys, list( /mob/living/proc/open_language_menu(mob/user) language_menu.ui_interact(user) -/mob/living/whisper(message as text) - say("#[message]") +/mob/living/whisper(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null) + say("#[message]", bubble_type, spans, sanitize, language) From 402c451cc3caab4b45ee74beaa972489e3b3755b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 20:56:26 -0500 Subject: [PATCH 016/131] Adds organ storage containers --- .../mob/living/silicon/robot/robot_modules.dm | 1 + code/modules/surgery/organ_manipulation.dm | 22 +++++++- .../modules/surgery/prosthetic_replacement.dm | 16 +++++- code/modules/surgery/tools.dm | 55 ++++++++++++++++++- 4 files changed, 89 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5795854ec9..5a3ed2ff8c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -271,6 +271,7 @@ /obj/item/roller/robo, /obj/item/borg/cyborghug/medical, /obj/item/stack/medical/gauze/cyborg, + /obj/item/weapon/organ_storage, /obj/item/borg/lollipop) emag_modules = list(/obj/item/weapon/reagent_containers/borghypo/hacked) ratvar_modules = list( diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 1808a45b08..6e3c224924 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -24,7 +24,7 @@ /datum/surgery_step/manipulate_organs time = 64 name = "manipulate organs" - implements = list(/obj/item/organ = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0) + implements = list(/obj/item/organ = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0, /obj/item/weapon/organ_storage = 100) var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/crowbar = 55) var/implements_mend = list(/obj/item/weapon/cautery = 100, /obj/item/weapon/weldingtool = 70, /obj/item/weapon/lighter = 45, /obj/item/weapon/match = 20) var/current_type @@ -55,6 +55,15 @@ /datum/surgery_step/manipulate_organs/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) I = null + if(istype(tool, /obj/item/weapon/organ_storage)) + if(!tool.contents.len) + to_chat(user, "There is nothing inside [tool]!") + return -1 + I = tool.contents[1] + if(!isorgan(I)) + to_chat(user, "You cannot put [I] into [target]'s [parse_zone(target_zone)]!") + return -1 + tool = I if(isorgan(tool)) current_type = "insert" I = tool @@ -74,7 +83,7 @@ "You begin to extract [B] from [target]'s [parse_zone(target_zone)]...") return TRUE if(!organs.len) - to_chat(user, "There is no removeable organs in [target]'s [parse_zone(target_zone)]!") + to_chat(user, "There are no removeable organs in [target]'s [parse_zone(target_zone)]!") return -1 else for(var/obj/item/organ/O in organs) @@ -108,7 +117,14 @@ target.heal_bodypart_damage(45,0) return 1 else if(current_type == "insert") - I = tool + if(istype(tool, /obj/item/weapon/organ_storage)) + I = tool.contents[1] + tool.icon_state = "evidenceobj" + tool.desc = "A container for holding body parts." + tool.cut_overlays() + tool = I + else + I = tool user.drop_item() I.Insert(target) user.visible_message("[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!", diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm index b054626f4e..53520679c2 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/prosthetic_replacement.dm @@ -16,11 +16,20 @@ /datum/surgery_step/add_prosthetic name = "add prosthetic" - implements = list(/obj/item/bodypart = 100, /obj/item/weapon/twohanded/required/chainsaw = 100, /obj/item/weapon/melee/synthetic_arm_blade = 100) + implements = list(/obj/item/bodypart = 100, /obj/item/weapon/organ_storage = 100, /obj/item/weapon/twohanded/required/chainsaw = 100, /obj/item/weapon/melee/synthetic_arm_blade = 100) time = 32 var/organ_rejection_dam = 0 /datum/surgery_step/add_prosthetic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(istype(tool, /obj/item/weapon/organ_storage)) + if(!tool.contents.len) + to_chat(user, "There is nothing inside [tool]!") + return -1 + var/obj/item/I = tool.contents[1] + if(!isbodypart(I)) + to_chat(user, "[I] cannot be attached!") + return -1 + tool = I if(istype(tool, /obj/item/bodypart)) var/obj/item/bodypart/BP = tool if(ismonkey(target))// monkey patient only accept organic monkey limbs @@ -49,6 +58,11 @@ return -1 /datum/surgery_step/add_prosthetic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(istype(tool, /obj/item/weapon/organ_storage)) + tool.icon_state = "evidenceobj" + tool.desc = "A container for holding body parts." + tool.cut_overlays() + tool = tool.contents[1] if(istype(tool, /obj/item/bodypart)) var/obj/item/bodypart/L = tool user.drop_item() diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 92dba6eede..90cb344cf5 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -97,4 +97,57 @@ /obj/item/weapon/surgical_drapes/attack(mob/living/M, mob/user) if(!attempt_initiate_surgery(src, M, user)) - ..() \ No newline at end of file + ..() + +/obj/item/weapon/organ_storage //allows medical cyborgs to manipulate organs without hands + name = "organ storage bag" + desc = "A container for holding body parts." + icon = 'icons/obj/storage.dmi' + icon_state = "evidenceobj" + +/obj/item/weapon/organ_storage/afterattack(obj/item/I, mob/user, proximity) + if(!proximity) + return + if(contents.len) + to_chat(user, "[src] already has something inside it.") + return + if(isorgan(I)) + var/obj/item/organ/O = I + if(O.status != ORGAN_ORGANIC) + to_chat(user, "[src] can only hold organic body parts!") + return + else if(isbodypart(I)) + var/obj/item/bodypart/BP = I + if(BP.status != BODYPART_ORGANIC) + to_chat(user, "[src] can only hold organic body parts!") + return + else + return + + user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].") + icon_state = "evidence" + var/xx = I.pixel_x + var/yy = I.pixel_y + I.pixel_x = 0 + I.pixel_y = 0 + var/image/img = image("icon"=I, "layer"=FLOAT_LAYER) + img.plane = FLOAT_PLANE + I.pixel_x = xx + I.pixel_y = yy + add_overlay(img) + add_overlay("evidence") + desc = "An organ storage container holding [I]." + I.loc = src + w_class = I.w_class + +/obj/item/weapon/organ_storage/attack_self(mob/user) + if(contents.len) + var/obj/item/I = contents[1] + user.visible_message("[user] dumps [I] from [src].", "You dump [I] from [src].") + cut_overlays() + I.forceMove(get_turf(src)) + icon_state = "evidenceobj" + desc = "A container for holding body parts." + else + to_chat(user, "[src] is empty.") + return \ No newline at end of file From 3fa6f63608ffe0d18f4191d8840c093728e68a71 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 20:57:31 -0500 Subject: [PATCH 017/131] Replaces Mending Motor with Mending Mantra --- .../clock_cult/clock_items/clockwork_slab.dm | 2 +- .../scripture_applications.dm | 22 ---- .../clock_scriptures/scripture_revenant.dm | 2 +- .../clock_scriptures/scripture_scripts.dm | 111 ++++++++++++++++++ .../clock_structures/mending_motor.dm | 107 ----------------- config/tips.txt | 6 +- icons/mob/actions.dmi | Bin 189762 -> 191022 bytes tgstation.dme | 1 - 8 files changed, 116 insertions(+), 135 deletions(-) delete mode 100644 code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index 36ff67262b..35caabab5a 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -61,7 +61,7 @@ /obj/item/clockwork/slab/cyborg/medical //five scriptures, plus a spear quickbound = list(/datum/clockwork_scripture/ranged_ability/linked_vanguard, /datum/clockwork_scripture/ranged_ability/sentinels_compromise, \ - /datum/clockwork_scripture/create_object/vitality_matrix, /datum/clockwork_scripture/fellowship_armory, /datum/clockwork_scripture/create_object/mending_motor) + /datum/clockwork_scripture/create_object/vitality_matrix, /datum/clockwork_scripture/channeled/mending_mantra, /datum/clockwork_scripture/fellowship_armory) /obj/item/clockwork/slab/cyborg/security //four scriptures, plus a spear quickbound = list(/datum/clockwork_scripture/channeled/belligerent, /datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/channeled/taunting_tirade, \ diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm index efc479f522..25576f5710 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm @@ -214,28 +214,6 @@ quickbind_desc = "Creates an Interdiction Lens, which drains power into nearby Sigils of Transmission." -//Mending Motor: Creates a prism that will quickly heal mechanical servants/clockwork structures at a power cost -/datum/clockwork_scripture/create_object/mending_motor - descname = "Powered Structure, Repairs Other Structures" - name = "Mending Motor" - desc = "Creates a mechanized prism that will rapidly repair damaged clockwork constructs, converted cyborgs, and clockwork structures." - invocations = list("May this prism...", "...mend our dents and scratches!") - channel_time = 80 - consumed_components = list(VANGUARD_COGWHEEL = 3, GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 1) - object_path = /obj/structure/destructible/clockwork/powered/mending_motor - creator_message = "You form a mending motor, which will rapidly repair damaged clockwork constructs, converted cyborgs, and clockwork structures." - observer_message = "An onyx prism forms in midair and sprouts tendrils to support itself!" - invokers_required = 2 - multiple_invokers_used = TRUE - usage_tip = "Powerful healing but power use is somewhat inefficient, though much better than a proselytizer." - tier = SCRIPTURE_APPLICATION - one_per_tile = TRUE - primary_component = VANGUARD_COGWHEEL - sort_priority = 7 - quickbind = TRUE - quickbind_desc = "Creates a Mending Motor, which rapidly repairs constructs and structures at a power cost." - - //Mania Motor: Creates a malevolent transmitter that will broadcast the whispers of Sevtug into the minds of nearby nonservants, causing a variety of mental effects at a power cost. /datum/clockwork_scripture/create_object/mania_motor descname = "Powered Structure, Area Denial" diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm index faab84befe..0dbd2d46e8 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm @@ -110,7 +110,7 @@ channel_time = 150 consumed_components = list(BELLIGERENT_EYE = 3, VANGUARD_COGWHEEL = 3, GEIS_CAPACITOR = 3, REPLICANT_ALLOY = 6) usage_tip = "Ocular wardens will become empowered, clockwork proselytizers will require no alloy, tinkerer's daemons will produce twice as quickly, \ - and interdiction lenses, mending motors, mania motors, tinkerer's daemons, and clockwork obelisks will all require no power." + and interdiction lenses, mania motors, tinkerer's daemons, and clockwork obelisks will all require no power." tier = SCRIPTURE_REVENANT primary_component = REPLICANT_ALLOY sort_priority = 4 diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index 4fd4e629a1..f7fcc8c299 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -69,6 +69,117 @@ quickbind_desc = "Creates a Vitality Matrix, which drains non-Servants on it to heal Servants that cross it." +//Mending Mantra: Channeled for up to ten times over twenty seconds to repair structures and heal allies +/datum/clockwork_scripture/channeled/mending_mantra + descname = "Channeled, Area Healing and Repair" + name = "Mending Mantra" + desc = "Repairs nearby structures and constructs. Servants wearing clockwork armor will also be healed. Channeled every two seconds for a maximum of twenty seconds." + chant_invocations = list("Mend our dents!", "Heal our scratches!", "Repair our gears!") + chant_amount = 10 + chant_interval = 20 + consumed_components = list(VANGUARD_COGWHEEL = 1, REPLICANT_ALLOY = 1) + usage_tip = "This is a very effective way to rapidly reinforce a base after an attack." + tier = SCRIPTURE_SCRIPT + primary_component = VANGUARD_COGWHEEL + sort_priority = 4 + quickbind = TRUE + quickbind_desc = "Repairs nearby structures and constructs. Servants wearing clockwork armor will also be healed.
Maximum 10 chants." + var/heal_attempts = 4 + var/heal_amount = 2.5 + var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) + var/static/list/heal_finish_messages = list("There, all mended!", "Try not to get too damaged.", "No more dents and scratches for you!", "Champions never die.", "All patched up.", \ + "Ah, child, it's okay now.", "Pain is temporary.", "What you do for the Justiciar is eternal.", "Bear this for me.", "Be strong, child.", "Please, be careful!", \ + "If you die, you will be remembered.") + var/static/list/heal_target_typecache = typecacheof(list( + /obj/structure/destructible/clockwork, + /obj/machinery/door/airlock/clockwork, + /obj/machinery/door/window/clockwork, + /obj/structure/window/reinforced/clockwork, + /obj/structure/table/reinforced/brass)) + var/static/list/ratvarian_armor_typecache = typecacheof(list( + /obj/item/clothing/suit/armor/clockwork, + /obj/item/clothing/head/helmet/clockwork, + /obj/item/clothing/gloves/clockwork, + /obj/item/clothing/shoes/clockwork)) + +/datum/clockwork_scripture/channeled/mending_mantra/chant_effects(chant_number) + var/turf/T + for(var/atom/movable/M in range(7, invoker)) + if(isliving(M)) + if(isclockmob(M) || istype(M, /mob/living/simple_animal/drone/cogscarab)) + var/mob/living/simple_animal/S = M + if(S.health == S.maxHealth || S.stat == DEAD) + continue + T = get_turf(M) + for(var/i in 1 to heal_attempts) + if(S.health < S.maxHealth) + S.adjustHealth(-heal_amount) + new /obj/effect/overlay/temp/heal(T, "#1E8CE1") + if(i == heal_attempts && S.health >= S.maxHealth) //we finished healing on the last tick, give them the message + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else if(issilicon(M)) + var/mob/living/silicon/S = M + if(S.health == S.maxHealth || S.stat == DEAD || !is_servant_of_ratvar(S)) + continue + T = get_turf(M) + for(var/i in 1 to heal_attempts) + if(S.health < S.maxHealth) + S.heal_ordered_damage(heal_amount, damage_heal_order) + new /obj/effect/overlay/temp/heal(T, "#1E8CE1") + if(i == heal_attempts && S.health >= S.maxHealth) + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else + to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.health == H.maxHealth || H.stat == DEAD || !is_servant_of_ratvar(H)) + continue + T = get_turf(M) + var/heal_ticks = 0 //one heal tick for each piece of ratvarian armor worn + var/obj/item/I = H.get_item_by_slot(slot_wear_suit) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + I = H.get_item_by_slot(slot_head) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + I = H.get_item_by_slot(slot_gloves) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + I = H.get_item_by_slot(slot_shoes) + if(is_type_in_typecache(I, ratvarian_armor_typecache)) + heal_ticks++ + if(heal_ticks) + for(var/i in 1 to heal_ticks) + if(H.health < H.maxHealth) + H.heal_ordered_damage(heal_amount, damage_heal_order) + new /obj/effect/overlay/temp/heal(T, "#1E8CE1") + if(i == heal_ticks && H.health >= H.maxHealth) + to_chat(H, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else + to_chat(H, "\"[text2ratvar(pick(heal_finish_messages))]\"") + break + else if(is_type_in_typecache(M, heal_target_typecache)) + var/obj/structure/destructible/clockwork/C = M + if(C.obj_integrity == C.max_integrity || (istype(C) && !C.can_be_repaired)) + continue + T = get_turf(M) + for(var/i in 1 to heal_attempts) + if(C.obj_integrity < C.max_integrity) + C.obj_integrity = min(C.obj_integrity + 5, C.max_integrity) + C.update_icon() + new /obj/effect/overlay/temp/heal(T, "#1E8CE1") + else + break + return TRUE + + //Sigil of Submission: Creates a sigil of submission, which converts one heretic above it after a delay. /datum/clockwork_scripture/create_object/sigil_of_submission descname = "Trap, Conversion" diff --git a/code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm b/code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm deleted file mode 100644 index 6bd0f46e9d..0000000000 --- a/code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm +++ /dev/null @@ -1,107 +0,0 @@ -//Mending Motor: A prism that consumes replicant alloy or power to repair nearby mechanical servants at a quick rate. -/obj/structure/destructible/clockwork/powered/mending_motor - name = "mending motor" - desc = "A dark onyx prism, held in midair by spiraling tendrils of stone." - clockwork_desc = "A powerful prism that rapidly repairs nearby mechanical servants and clockwork structures." - icon_state = "mending_motor_inactive" - active_icon = "mending_motor" - inactive_icon = "mending_motor_inactive" - unanchored_icon = "mending_motor_unwrenched" - construction_value = 20 - max_integrity = 125 - obj_integrity = 125 - break_message = "The prism falls to the ground with a heavy thud!" - debris = list(/obj/item/clockwork/alloy_shards/small = 3, \ - /obj/item/clockwork/alloy_shards/medium = 1, \ - /obj/item/clockwork/alloy_shards/large = 1, \ - /obj/item/clockwork/component/vanguard_cogwheel/onyx_prism = 1) - var/heal_attempts = 4 - var/heal_cost = MIN_CLOCKCULT_POWER*2 - var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) - var/static/list/heal_finish_messages = list("There, all mended!", "Try not to get too damaged.", "No more dents and scratches for you!", "Champions never die.", "All patched up.", \ - "Ah, child, it's okay now.") - var/static/list/heal_failure_messages = list("Pain is temporary.", "What you do for the Justiciar is eternal.", "Bear this for me.", "Be strong, child.", "Please, be careful!", \ - "If you die, you will be remembered.") - var/static/list/mending_motor_typecache = typecacheof(list( - /obj/structure/destructible/clockwork, - /obj/machinery/door/airlock/clockwork, - /obj/machinery/door/window/clockwork, - /obj/structure/window/reinforced/clockwork, - /obj/structure/table/reinforced/brass)) - -/obj/structure/destructible/clockwork/powered/mending_motor/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - to_chat(user, "It requires at least [heal_cost]W to attempt to repair clockwork mobs, structures, or converted silicons.") - -/obj/structure/destructible/clockwork/powered/mending_motor/forced_disable(bad_effects) - if(active) - if(bad_effects) - try_use_power(heal_cost) - visible_message("[src] emits an airy chuckling sound and falls dark!") - toggle() - return TRUE - -/obj/structure/destructible/clockwork/powered/mending_motor/attack_hand(mob/living/user) - if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) - if(total_accessable_power() < MIN_CLOCKCULT_POWER) - to_chat(user, "[src] needs more power to function!") - return 0 - toggle(0, user) - -/obj/structure/destructible/clockwork/powered/mending_motor/process() - var/efficiency = get_efficiency_mod() - for(var/atom/movable/M in range(7, src)) - var/turf/T - if(isclockmob(M) || istype(M, /mob/living/simple_animal/drone/cogscarab)) - T = get_turf(M) - var/mob/living/simple_animal/S = M - if(S.health == S.maxHealth || S.stat == DEAD) - continue - for(var/i in 1 to heal_attempts) - if(S.health < S.maxHealth) - if(try_use_power(heal_cost)) - S.adjustHealth(-(8 * efficiency)) - new /obj/effect/overlay/temp/heal(T, "#1E8CE1") - else - to_chat(S, "\"[text2ratvar(pick(heal_failure_messages))]\"") - break - else - to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") - break - else if(is_type_in_typecache(M, mending_motor_typecache)) - T = get_turf(M) - var/obj/structure/destructible/clockwork/C = M - if(C.obj_integrity == C.max_integrity || (istype(C) && !C.can_be_repaired)) - continue - for(var/i in 1 to heal_attempts) - if(C.obj_integrity < C.max_integrity) - if(try_use_power(heal_cost)) - C.obj_integrity = min(C.obj_integrity + (8 * efficiency), C.max_integrity) - if(C == src) - efficiency = get_efficiency_mod() - C.update_icon() - new /obj/effect/overlay/temp/heal(T, "#1E8CE1") - else - break - else - break - else if(issilicon(M)) - T = get_turf(M) - var/mob/living/silicon/S = M - if(S.health == S.maxHealth || S.stat == DEAD || !is_servant_of_ratvar(S)) - continue - for(var/i in 1 to heal_attempts) - if(S.health < S.maxHealth) - if(try_use_power(heal_cost)) - S.heal_ordered_damage(8 * efficiency, damage_heal_order) - new /obj/effect/overlay/temp/heal(T, "#1E8CE1") - else - to_chat(S, "\"[text2ratvar(pick(heal_failure_messages))]\"") - break - else - to_chat(S, "\"[text2ratvar(pick(heal_finish_messages))]\"") - break - . = ..() - if(. < heal_cost) - forced_disable(FALSE) diff --git a/config/tips.txt b/config/tips.txt index dc9c8931d7..0293e53c14 100644 --- a/config/tips.txt +++ b/config/tips.txt @@ -155,7 +155,7 @@ As a Cultist, do not cause too much chaos before your objective is completed. If As a Cultist, your team starts off very weak, but if necessary can quickly convert everything they have into raw power. Make sure you have the numbers and equipment to support going loud, or the cult will fall flat on its face. As a Cultist, the Blood Boil rune will deal massive amounts of brute damage to non-cultists, stamina damage to Ratvarian scum, and some damage to fellow cultists of Nar-Sie nearby, but will create a fire where the rune stands on use. As a Cultist, you can create an army of manifested goons using a combination of the Manifest rune, which creates homunculi from ghosts, and the Blood Drain rune, which drains life from anyone standing on any blood drain rune. -As a Servant, your clockwork Slab fits in pockets and does not need to be held to communicate with other Servants. +As a Servant, your Clockwork Slab fits in pockets and does not need to be held to communicate with other Servants. As a Servant, remember that while the selection of scripture and tools Servant cyborgs get is limited, it is still extremely useful, and some of it is unique; for example, engineering and janitor cyborgs get a proselytizer that can use their own power in addition to its own. As a Servant, the Judicial Visor is an effective defensive combat tool in small spaces, as it stuns and mutes anyone still on it after 3 seconds. It is also useful for stunning already-stunned enemies for long enough to convert them or finish them off. As a Servant, making, and protecting, Tinkerer's Caches is extremely important, as caches are required to unlock scripture and share components. @@ -171,13 +171,13 @@ As a Servant, you can deconstruct a Clockwork Wall with a Clockwork Proselytizer As a Servant, Volt Void will drain power from nearby Sigils of Transmission to up to double the damage of each volt ray. It'll even use your own power if you happen to be a cyborg! As a Servant, Fellowship Armory invokes much faster for each nearby servant and attempts to provide each affected servant with powerful armor against melee, bullet, and bomb attacks. The gauntlets provided are also immune to elecricity. As a Servant, Spatial Gateway can teleport to any living Servant or Clockwork Obelisk, and gains additional uses and duration for each Servant assisting in the invocation. -As a Servant, defending the Gateway to the Celestial Derelict is your ultimate goal, and it is heavily recommended that you defend it with all the tools you have avalible, including Ocular Wardens, Mania Motors, Mending Motors, and other, not mentioned things. +As a Servant, creating and activating the Gateway to the Celestial Derelict is your ultimate goal, and you must defend it with all the tools you have available. As a Servant, once Ratvar has arrived, all of your tools gain a massive boost in power and will, in general, have no cost and work at double speed. As a Servant, you can impale human targets with a Ratvarian Spear by pulling them, then attacking them. This does massive damage and stuns them, and should effectively win the fight. As a Servant, Sentinel's Compromise can instantly return you or another Servant to a fighting state by converting half of all their brute, burn, and oxygen damage to toxin, effectively halving the damage they have. Clockwork Floors will also rapidly heal toxin damage in Servants, allowing the Compromise more effectiveness. As a Servant, Belligerent and Taunting Tirade are extremely powerful for disabling and disrupting large groups of enemies, though they render you somewhat vulnerable, as Belligerent requires that you stand still, and Taunting Tirade makes you extremely obvious. As a Servant, Soul Vessels can be placed in cyborg shells, mecha, Cogscarab shells, and Anima Fragment shells. -As a Servant, you can unwrench Clockwork Structures, but doing so will damage them, severely weakening them until repaired with a proselytizer or a mending motor. Damage from other sources will also similarly weaken structures. +As a Servant, you can unwrench Clockwork Structures, but doing so will damage them, severely weakening them until repaired with a Proselytizer or Mending Mantra. Damage from other sources will also similarly weaken structures. You can deconvert Cultists of Nar-Sie and Servants of Ratvar by feeding them large amounts of holy water. As a Wizard, you can turn people to stone, then animate the resulting statue with a staff of animation to create an extremely powerful minion, for all of 5 minutes at least. As a Wizard, the fireball spell performs very poorly at close range, as it can easily catch you in the blast. It is best used as a form of artillery down long hallways. diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi index 84e1f1c1da0649b44474e24b32103f056da171cf..988ae8bdc8302482a6f8541405abfb80f7826ff6 100644 GIT binary patch delta 113115 zcmbTd2T&AE7dATNoKz&|Ac!Q93@%7UkRXa8QIsq>haHk2IZMt8C?JwV;-VlqO3pdw zCBw3Nhxh%y|EpVdtM08^HC5ZQJ3W0)_tPglr}uXk$+uyWSWb}BTknOd;#(JUXKP1S zYX^G(@XV+-=yhPMA%{(Ye{y7xDhRhF><`H$KdCV+=i0Lv2OjY_KFFY|Oq9s|G$R4} zQKWmeN4Mu4?0+|I!H1(L|4_vJjhQJ!G}m01nUlm5_H%W7xowo$txTJvB}19j}t11 zWglg7l1S;=@x@xc5!*6-eNJUlF&-Nm%1ye|5F%+7cm54--Qn|ss}?KnL=#IRK@m$8 z%)a~Dxl;X>!f%Ozl)JiEiw!DvYXdk#8I+T?Rsq#|Wh?X?19D4l32h3Bcz4Wwf)I~j zqsNQRJpkb#S%r9_Veq<5`VzT|lMbm*d5ht+oY&Vksy1E`k$+5$VtSI~nc7|^+B9S@ zB9Gq4g>3CAdBA_XMBUq@zL-xb(5~p*2W$4E{W7)!T781O6NZkpf-*?rJq(BJn~s>UO8(J@bbQgAb6kvw6gBv)YYR#)_Wy2ODNNe)pYm?qU3M%uyB4b?v12Q-8 zO`J-zJW13tna)wQQc_nf_#zrZ#f{{8MoQkRa#PYUi+NFe4bR>rB1?7R#j}y{mIbWH4 z)^^Xq?OdVDWtz(R<8Yeyibg({+;(IByxd&M2id(Eu;-lf@rT4uRcoulQMhv!|5BS= z(R~8dKW{^-&y3wY(+M7)9{2?lYp$1dXxzN}%`Drma6Rs9&W%;8d4{0t?`$_kYyolI zeW8mLp7o81D{jxwFWQgLAg@OmXW!kyzZnR5gQ?jy+xxH5514K4CKl|<^3qPD5fUQj z$7Eg&(hY@GN=jGI)6JpO)VE1wK&0zo^J&Mq1K!CvCfpkGc|G zi+!#}_`V(3br>*v*K>JPgjrcds$QrUY|HDn*eG%5s zJ{NYW3g9dXY@$i8yh9VQLnSanAgmGRaPR7`PkzucYzte5$z0+w4&d_)qz~k2(&)Nq)(Y>)t7m<7g-k|w@A*pO+cjd>`dJp4R(4&^J@Tla&o|2-!Cr4D z-D`}s{zNIv5Nxp@-qK+z`B%jhtvBdc_Twi1*#z%JyJ&*R2H18G;56LwX3M3_XMJCU zTKsWe+b1C+ij?W-V6xM9iOM}8G}w7X0t0f^&Prq+V>LX=LPnY4d3DCWa!#?j3G2n? zbf^$7{_yqPRXBbp^QWkSaNp8)aD^>*OP-p0=*mf+#jyW2hhX!^g>|-jmiw>7yJy9k z`K;FSns{H2vgw0&?eP^5<;?`kA4ZoG_^6YEX!|@!DwnZk4=(7I;lc%N8(`f1pt-uZ zDLgpVo)T$XBP;ON_?Hk4eept62kEk}e};a2!qf|+UWEvksXwc)UCL{JYSIP2z4fkN z(;`Pqd4=QRb!sO|?hXx|O34B*K5xWaU8G&D!}L@7Hx5eRX_BYo(xk2bE6e4>-bJ5e zr7vH*O?}b+GI~=-pUU2N{;a-+B@?VwMO?QZS@jf|Wxd(`xDkOq^h4k!(`NF?+v$`>>x3FCdP!5ERL+t zF~pFi0Y|l&F?o9aD|@}4)bTz{ixm4~NYPW6xjmknH~nHvCNmkPT+M;~aXai1b(>LP zl-&WJU;lR!V3|!2-eI;h*=kPJi-oY(`ZQ|+4HWa?(>HGYcydzQeWSlYd&`480G-^^6<PzHI z{HsXXuz|z=vMqS~g$V3$&Ig052kLF<9g9ntKl@j?;j8#3KB)c>EbEh*Ta-oH3rJYi=9%>sx@xRUY_!1APbH7yMMbXPCHQe*&0^7gg3{s3 z`#*oFUvhZA-kR(eK4&l7YhPPfGrrU1^MQiwPz3g+tk^$5P(l5)i8eXuTlk#yCE3-5 zainb-J*^X>dXdom3Mm{yO836rV#T#?2^34joEl-|p~rt77i`C#tJ&Ls+w1o6FjiWF z#ZPZPk-?ZzqWGFWgMxZh23P`$f;|03zGkbmll_itZm8_F z`03_ZWvib{CJ4qe9C^O)rs>UhzVH+0Hd$7D^p#-YV$dAE3R=QfVPjWKfW{8-e*ZSb zvwb)26$+*O1q20gR}>cds{c1Ns%S?)XyaxD14~mS!|dhR&s>MRL2Bxov%q%XWTjutK9~#xe-@_sp`nB&xZ^!`+2R z@X)oW61AcI<9v~!os3!_hl5TCKj@cfaI^&$Z4Ml-17)cN{B`!NP$iJHx#W;{cXwa< z>r=PjnM%-&C^Z8?IqUtFHTMM;`zN%0l9o)9&obn3C+z>jfa zPj?%_v9QPnJ*P|kv{rxdlhqdMn|gb88#s@C@!F>7o&4#wu1jj zHjbejp4ZclTB`#``%2ywiyS`rB51kOV{@F_bA59_Fd6cwL&Ws3(9(fnln=kO(Vlq( zuSUyWR>BnR(lQ6qbzEE=JVgVq(%VpL1=+t$Gp2ebQ>%M1jVnh(r9-1)D56(4-)IEh zmV6p7a13f~QceEiO2up+XLm0fH7+M&Tn+x|X+rk;MB@|hv&UA0A``3WtnxQL)=2Ce*ttWZgo2spQK>G`hDBXnz%roH;chaav%x}4u*5LT> zRo>TnDPY^@8T|Fe8~EzpJ@m(bp^Y?(sk{|21Crm9O#aVk5Lyf|rTNxG$4#vBuD|4p z_&{(~f2`kBXt)J|cziW~{HdXPN%6b~1W3k2>qm$y^{d*#TCPhQ$-CZ4~z%9&6&gW3uMsxJ7 zVTC>|B;o%wlJ{f>Ot=!4~d7k%}fy^h;sBM}~=@$2!B z)mT%((*lnj+i+D8+QZ^4eVi4<<&WJHq=|q71eehDZ$kep0fh?XZJsmiKt?d+(H9f} zscLgsz57z2E3;tJ_bG9NgRX4biEN1A$0wg3!}_?c!83Hl?Ql_~Y4xKtnlvcqtllHy zkyGaaH)iz1CDy#6(z686uke6?est0GMJCf}<~umP!n;j^vO7A@9tRQ&DZD%vhHLo#9(8ZhJIKJKl!OENIlo@b)toZ7L_LrTUH87q18a9;brEh|f=X{Y`*cB*im4 z2?0K)D0hO_y_;v1%16Paxm5ParBBb3%=o1qLAb2Z>YH`vzRdZ75Uo3LHMF=*R>n(7?V|;{yYu7lr9_ zx1&^Q#4edDE!oN3e&qV0$sT-Faabl4h`o z*(k2YIZqv}Wvv(Ex?JizuXWS0nzIPlo*AhhoH~<)pD8@*AD%sPGLf_(TVfps*2p$- zO86hygwUBgkw$>95!2D{t&d@tFUVx=XTCjU-&kUUQcrGlS!h*X5z|qWu+1SJL`A2^ z`NtqW7Lqjuww$s&=U565HN#MuqW8})W5Q4IUZMkZyPHX3g9KM*+#=6b@#@j3i=gF; z(Tsx*AMSMJiW}h*mARcJfhCf~di(WhDAA6zN+z#<(k<}Kik3A}I!<(r2br}&Wd`ab zU~nr|OZ0P5*<$A;(D$EX&#%&%rT>ynj7pgCr?UkSH+wTYK4@XNK|bXwXH5iYHBeu8 z8&8z^I)ITbywOnp@$~@=-<0jd>@Zia^^Pjr7OEGuc|lhy@;$rmYBL2^1y}G0N9Qk^ ztv><%Cceh((kVb{v={Tu$ z1oLc2#FF!%FlzRRJ_R{Ok} zNfTWbFq{OiKSggbqfAdeP8}8b&VS~{bjvMni<}V9FElY#y?OjWv4>7n>~6HNiC z{zUnb=M#LIM;@l%#WcD@K~LiC@!TzM$=f~kjE{_np?HXgkN?-oTBv=b{;EDW)-Rz3 zZQON#9o{p?BqBolBRKgf&0{FBp!ZILu{r-N|qM2TO6cID4BnZoHfiz!#cklQa+CxT`Q8I|B zgVv8agiKQ*J7B|KIcWDwzSEY3ta`>5wh8%bi)+=ln)$@;e3cMn?ykgoRsTB4gOIuY zr{E7?7u<9YDULP7Pr>J2p{Bbop$9Lr_>pKChSi52FOHGswqvm$=iDOan@8!ljh{xa z4K40(c6kVqI{S$W_Xb2@9+ z19!XPKVW%vZ(z+auK zw2@gUviFs$k$duV&sUN|OHeE`A|cG<20;-12SGhh=A)ot)WeQucgEk)b-{kqow{58 zcCXe^BVejuju?7MBy9eBV>2$EmO!(CoFf4j!r3Q_ z6deOo6`HHgxrAj2m&)U5fmf>TvF9VlH6fVwi-3orH$|_KMh$vWGJ`EWn10*s*q3;M zRWw<>;cbxjfn6^iei8OfOdTYw5 zqh>qFMS1bppUND&#}n>8r(de6nv$%+ehg>7&CZh!?HQ(tG)y>!>|xra569kN5Y?ec zf*_p#l3HH|DW>n9hMaShlj6LjPNwpLO>nFtY=XXjtwr!5n`G&QF)1}OE^iRdsG+#i z39x06LYz}vyr%bk(+jC2ihfv^LcOCcx4WY*YraI*4K?bU{LGhbY$;yA@4$*w)^`M+MVD#&rnj0{svARHpWw>P1?E4N13d(>Jk7Iyut;3y4;nw4q$p_ANbIJ`Ur2{q|E-;Nb)H@keKu__>E=I0bkKZSy8q4D?wfO z13Z%jB+ea`QGJr?D|87Ig48X)XCALq`|Us=3;3hcIV02KK>v1!+K@gk52F`Bl&di% zCbbDvg!Z&yrfoPRc*j9w392zTqtmb~MQ_HERX9%Ak%VdQl}$1t1N!3oD*C~V4X5U` zO9$3mW&%4m3uYqc^)NXjqe;5}>ra ziiatTwKlOn!45o^KlP%P(owZ{&&fV9lT%--VFM&fE}teJmZ&z-NVFya=)0)xkAodTcnQN9F__A$?`cWBCiuT#d z_CGEw)$0Yvw(r?_dmKwHnOrzI%J=LfRMwmm$mbHnhfgjOQf`H++w#Mu*8}3;z4Yn^ zMXMq{-;VQSeQ+JEMU2|FQz%N{TfBt=*dDawpv4_jXtq!0(e4+eHdYZamd)r_7G%Fx z6=rh7#&YZQLOFaQ4)&4{bHe!B`xy{Q4(7ZcWh!qgjWGH6YVe>i7vS92P0;VztmKjd zg@a$Jbi+#J9qEMZUxeaNWFC_Tn1c+}h4HW9tCsL%A{*N9-q1Sp!`xlZ<+8EYVD1NK zF!?YM>dWwwe{y(Jg6M62Wyn?r(^Fi>hh8N1G=3(-{-#amx z&X(g9jN_w{e$A-C0Fj?h#-=jn`JcDZF1m@!<{K%?cKUKPEb*Pyd-`#xa@XZJt3?nOAg+@LzGHxg@o zWn)(EsxE*rXBm>p9BaT85P6kXW;osV#6r(ekEdc@Opvki#^PdN>4aHc~f?( zXG0cT+c3N zk=y{74XYyWnLLP5kCtkvFlKhUcwh4{YFyqDS_ab8Ug^vZ!q@bNV0JnjKgek}4_C7k z@5v5b2>XB-%32>k@;XnoBQ zkBRK}xat`s&cPk_(@vV(=lWIr2$k@XJ&M5wC%=hGE4s|U$^M8UZc%1#l6k9U-n~cG zn)R1K<)qiCJt|B)u+(j$MgWOnR;y@&DIO$mEqmZ|XrQ)0med=a$4^wI-K-UPO5=j~ zrA?)`-jJkp1*|Rw->-4jXGeASb5gA`G-ot4lymN}ae6Ph`Yy65w zKBbM+>PFQ-iZrt?RtZu3KVxFYm==b%Pypy}qXqAMSPU*WRxE_1_|#bhHEm>YFFQBX zDe10o5 zXOwW+m)GZrhPKTJ@{&T;>kk2Av5z5qgfFjuBDs^qk3#mI{V4_USWTMf5NE&D z-kOmG3S{X0i0v~_F*qE0xz+JLq04}*?~#&a6B-hB1X&|?6x`{IT+#9g`tFWrI`!kR zu+5yQ$Cqy}s{yDeyASFCeySFA|QK?;do# zc$;*-L-c!ch5(E#X(|}uc`$IK-Gb^V`)FbvXp{P$=)slYAx`Ec>YBI$*N}WzDLbe1 zIge%X>al;!+0JKEJ#CtL0ubPnyUeE2F~0jK;&q!-Aexs zh?>2$KiX*((aLUy#_A*(s@S+mQg`u@mu_EYoP99jM0WlVv$N4C^s?XQZ=CD$7tAZ6 zj+&l59An~iaJ}izLyUr!!>>nMR`;G5yebRioxDi%$so?5KAQ9_@RG{__Eo> z*}bX^=4jS8txaoIOMX|T0Ze2<9Gfdao?uJOPcIbiKfh}1AdCIbBTd(v^7?`~!!e-_ zQ}8nD>M&tmUZUs4Bd31T!H<12kAl1u<5pcoIyY^t%GfM`<^r@neke?s24z9YUL zZ`K}0CaU`Qe*SBPUf!XW1&8qghCxmFk9h9mV#DnGosl7A)rA@`n(nfbbN$PUYlvQ> zwBvl~+hdOEY#JSgWwa6c*Xa6S{=rfVOzaYb@6XHoVs^@C#TRbOUA+5v;7a!$vK(K) z%gueWJN1!x(vAHMy-W`Q{wtBt&u0%2HH{6u8@VSivF$fc$10~ze@My>qcIF(zfaE{ zra*g_i`wV#>i+As{Xa{)*Pn(c$yEo$>?b9B5d~j52O+W$oGcy+bO(Rw0_j+4^|LtIz z4w)XtL|MXbO9G5Co|Mmvk0WuulSkpS{X-ZB4bl;c71?O*<7Jouw>PlHug&*=uMy;w zofvQ@h(Em-e@lMLdW@)*PE`K>zg{(Ct7@A-Y-hy!&GEb9bj|eRlM?s0%`bp|-wOs& znZ027hd~#jjU;UO$6G=p{(orZ>-Z4-I|Ocf?^1LCI691Pa8-*AFL$A7o1hXp1w!!B)h1UqZ3`LI-fYM}>L81zK# zkT=`^G{eu7KDAE!sJ&ND$l)dYzfQL?M^LB1UTlC;i71Z;v^0K@mM~JosXp&1a4(g0 zl_DEqgf&hk-jmbWNdo}S9mZIb^zz{CGp+})zmt`zLa)pCW`etRX zb!BfGo^yyoYxZ{*Y^XU`ChH#XrH~o`K)cI4s^Wew>7x`_13D)g?~9@D)n(yQbHJmc zz3k|g`iJ1J4o<9e`ul_8UzjNb3~v9Brh-4Y#H7!VRgPj5T)#Z|EbeD0HXWC^pj4L3g1pa|X zGRFp1{JjyWapO8UjL#)6Ck&o7%s7*K;q^utD=M zJov0g@LX9G6SudkKZ4lV+0yyx=T<0-hEhmwOxP2@t1pmEMqlX+VRl0db)UZr9pY%_ zP;W|Z;m`Rx8}`-v4x_!-Y`HhZ!?TAEei0mo&avnLqf;-!SwM8G<9LC>%WEF>Cd8vo zW9>jh#k6G7d{p(V{6f;^-wcEhZRWXr!tltQ>VGg+25lKj-5<5PNEqw{>l6k+mq7DA zVGnq65oE9w3ga|{KMWnj(RDmOXY@WD&ND4z`uu?EGoHIlbsqkgPd6L{#zTflMY=%s z$G#Z0VC;YF^tGw(TPFZ&2=`?O@}C5SOWnEPX3(~)UP`SWavGoXS1!CWf2OyvA5$+u z|L3_h_uICwi>CI> zPnuRYk$lTQW)_FCjqk9cP$$fOXmH#=j2}*JTXdwn1tU1|YP7fOxfcPc%qm8$}J4npqFmrVu&S5V= zS1Po}2D|||MzX(*pjbTk^5sRvj|Z>O#ROdbOVveRE7>HU$4IwvE%om4`J&^;EH_W| z>1TeOP4%RH<{IYU5++acWK!lP;`tn=+AEY_)f^qC7U)oW=;Lnv!&vDL`Xn*=TzXv} zeI{KDqqKo&N-q^r%(-m6>Gp`As|^B#L0$-aj?g`yOQ0sHl#iHH_NY8p;lsO!o`dt; zbK&6s6AYHf;L6#vbKt&s=t1n~qt8_5wzcY`nMsd|!g_b!Z7VZwVxwXZ!}GJTnQN_G zaoFU=Y8xNe2>e+gM=fQ!(&oES9T#%jI-ydSaQ@zt@SP@4SFl^fyiV?BDghC_!1m<1 zt(w6j*^2hI#puG&ODRVCX>+L^Z-_?6eKjkBbhuiz^xZ#adv>MOlu?$(B5@o8i%09| zM>Rh^jneBa8$i+)Etr%epO2sbUra#p$|;P%=IjbbP85a4`biH5Q!xEo7|t@vh=LR4 z*Sd@{dBLII;?qTv9x9K4FsR7 z$;!rtHB;x-a#e&%I)7N#SG~i2gbl8kiRfbDG5ZF~=RBx3^!?*yGb(ckah#ql{h38> z2=?0V*PJ?A?^s`|1kL_UnjidkbFe`+7|@JYR&U}5;Euxoljd2XnpYr8k{O( z2B+6fmqyO7v|YjBfW;+d-=@nB-l_3&^UysPWo7)YU%$qtq|n~L+$>gi^g_@cY5Z+| zy}G|SmPB=oasM5VUbY!%X~NfP?op_a_#~?M_Xc=8rQVY@jlL;<)v*IluKsXypvJbKLFM zeQgB5wIjaN`Mz})w-LgU7hc6*(Y+?HJcFys*DIxL2W2MC;zkf08{fHNpV-9!V(-?p6yJX{8_un8-^i|8*PB4yGA&u3IzvD$6MA6Y$h zN9q-TRo8&4nsUwZ8wi~MAQ7z)!z}yVyq$d7-Ra(8_FJ@=h$#i^RBB`9X+)$vva}ku z%h&#YV-2CoL8x>Vb2JDU!6UJcc~HeS{HuZs4KXCQ&(+{xmai8vEN6z#F!ASO?wi-r zn)o_<7dD}xM9>C<&IrRKHAs5-% zo4<#Jg%y4M8aTD1Y-97a3~32f^I7!pHRy(xV@2^h!A{{br#ZN(++A(G@Vp)24!Z5; zxW+#`<9sj?>+Kx#j^ZZn^+!;^N3c}mv{t-1b|*%;;#hnHHFIGS@y6C3^1+#nC>s;d zCfQ_XE?f1CMsp|Xm%if}rIG|iGgQ`CN2vXtg9+HXd0~FR^7D@*To-Zi$(SRNNM}Y# zXI${$;9z~En5L_%D+P1!h(OeJE9SDxse?WUeKn+`Q_ccKf%ENtD^O9I-SRum7di{5 zyvYugs@1L8@n?^)YWJGx*nF689*Q8Mq*6rv7b+)>H09GfBJ(K>% z4NN|#yGn+JjN~j2uf-l79es35>1P8ww9xSQ^mL!eOx>RgA#}HZ_yj>Y40=PN|9}qv z6BirXNRarbt_*5=Yx$4LULFJpZ&jAyPE^m{9?OGu;!mGHvu}dycb}moCB+x>A};c| zF+|T$Lj}EmqQv`}*ZQNOs19StgK43F1!|TVPVkn&t`jQ+Y~g6kPa+h%xzT~C6=A;i1ax+&6$UR`Ah3=a0_&{Ap${9nYB4aix)C*x}xr!7Btkz!&5O3}6W&-)0WLl*u~ zAHrsPz#RZz0^V3>v~rC8E1FxgnIkhEB4?Eb!;;Uy^ndJ? z-8mP$+PqzNkbHmHaPp?Z=yas?;#_;1N!LK33Tb%E=u%&yOD9AWn^gbU-Rx;l<1g%; zOg$clnwEu6GSx#Nm#V_zcT@!yZeLgybtasGeT$J&_K#kdERYwz+BWkbl9K<#trMT8 zNF)UWF9G?{Yd6fJ=+%k%E5!)E80AaWck_u!$u_ibc>@oCBJoX8@`yOtu4{xA`uJR& z;>XG<`odud8RH(wGzmM0r_Ur9>KPM6ykvPhV3W7GV^8*ZK7L8lFn@?|WIQ9DQ>PVF z-0)Nv|!yjOP9#%|XesCK&DSgCcIGTE6gGRqaTR`RY}a2Gy;LZ)TvM=~cm zBZfFWZ9mjo5ZD;Cw)`i9GFGZ&6@Vues^8ht8@`U}<&v5)PNOtmW)hGeww3hG zYcuok`K%rk?I0sK;k>wdK!Xll>!1g%=eI2sHfnrm!_&)p3L5J=w16=y3EDJeU;bj7 zNL9*a=;TC;+S8RoHh+5n4K#~4KE(RY-255%h83G^l5+ko!c7Gy1$UkVKmfE9ru4u{ zAOi3wXim|7_UKr8w?J6I3%sIQKBu@93^tatrk`w3 z1({GxxMMgZY%-Hcs##HM^e4|@0wWb^mvm34PKZR z_Z3leKx}+`V7fz7?TBqb;}|$3+P_9)vHI2NN~DiJtHI-T;exPiUrD`DtW^W6u2I!X znmsDc{FW82K?_+L^HC>bP(H7kOkk6WQ!)K0L%wVw+Th(hAr%*~eA&{#JS7j1tkXVG z&z&-`zW-cILN*4o^Tz{Dx{O&JX|KBS`2%Yz8<0YqT364mB)Q@0^xh)Z16+54FE$)4&-%aO7k!X@4w`W8@~^SEk#^`op!2d0!rv2zPxNvuX@fylbJg*Hs95|)2 z#uT3Yw@6}Y1lMcmCzy}~0|*0`FEi2@qiV-iapBs!gr?Ug4ZM!N*?FImo>S*(Hj&mM z&za;n{8@ko?0I6K42zav-WDjmqT0jWe>QZ#O#YkyY=EKg7|u9B?fpxS4=2k@^U}+F*g2((< zFfqU3ZX9w6uCw!e0vQA!@F_ndUj$yvSKw{SS4GP9@qfEs% z!{Snnpm*rw0X68KHh~+RAoqU{6W}Jux2H$>>Q$-ToZ)9vXR#f121pIa#y)@T>kMKY zEg6$J+~%kuBV8{0R%23at)8Gx$QF9tpju_+HA8~u~ZE#~Deo@1BZ&%pY zIWVyqAgD-6}Gn88nK(6*pFP%@EvRtFC4RwRBD}6Mc)KHc!bpFmh z`4~m9?BUa(pPV@MB$ktNSb7>ihP5s1MpXIexLf;IdeNk6_e|Cg_-Z%E+{nlqTQ)|W zf;T0!qn>oTkk{n6{KPd%)X8_M!~0wRDsp!BNcm1{+9H6x44GpP`07z-??#351Z#W4PHW1JD#?NW_F2>sKIszJapcm@8vY zh)I$>INfR+&{{JAi`7{_xdXKLiHCyN>jaWO7)~tid@W?_jZhO6wJ`V(yKhX+C*6c{ z*g}B+zyk+i|204nOGw_Hn2xYHLaYzAH}AN-s%tlKj05-DRFWc~>bXPU{<+o10RGaLkrTCtM!A1}=8p9s@(W`q!svkJF}H>Aw{l zcc%~ev~snnFpwoxlP{ixU)USish!UME>U)RM$lywp`HR;tr~v+x!2 z2KM5CH<{DzpdXJTqt_&Ur$=3kOs%+ zq-J!3stOF2>vs_v6_p|zHK_mAP$BO#Y%`?JK0@zGZ=Bd%FKhg+wD-%3B)I{ZFqYny zt5?_%zoMu_!v)73y8=N_LV`aQ)@GOC(lAN&YHD4K^N*5SSk!$*w=g1H+N#M8FXaO#B74Y zyr|kZTGVF8c|J*`H85VCnIL8)K!gb+gq{XZ6L9lD;ORE-#dyED=(CT# z1lv$68t(f;=VO1@nE`U_86SEbr-6udX5tj7Y6k?8#~v(IY!jdUTw^EnC_?$u zw3)IbrW}A@*-cEJ1CCIzzyka{yzt^9f57iyJ#_zyO}u;qtE3J-8{SZGeuZU)8Z{x# z5nMLqoIi&N@9O}~(h0f%KylR%G6HgAb6G7$$&TOOJn?+qX@~b4LG(9!U19Ins0X*5 zpC!H#8p8ZJAavhvjR4qXgu)tL7?z`~KT~WvH4ANOQzgN2bFV%eaU66PRPnqRWvrXe zgn5h+glJUv4vpk2Ro%`PgDMVxC8x2&qW-!J>PUGu#4l6xP(1ozTnMtoD~2iZa_Yoy z3kdQHlm*F`aT&|!F_$U28W@|5ty9;x(d7w^3U-%H6uq_~uB)&zSOmGXy5-`Q*EW^gw?$VkwrW@ML_tKU@&Dl3m z@0sNoR~!B3rI9G(#%M66T>5<)iH`@}?GDUPle4*Q!$e9vEp_2S82PPF6@6GW`Zr_( zadq+(%T_%3`>AU5gE@65AI(#7N=##O;l}F}E<}0r%leiuD+fK_oaIt~H8qbElWOFS z<}gl>_bEqI_L7cYGu~O8;y&m4Xu$No)k@SpqXeQvgD1Tu1vD{&u@V@^%qD4;9^a~V zmplu%wISmFvaI7;MebxF$@gPBPFU|{6V6?RWsPSFMJF>c#2rjO{`|OY7nST#7mvQG z6Ly|YV5NBo3>>3DuvtjhqUzaT(bDE^3N4I$i&3ILe#_F=K< z>xvz8LU)!ezz&u4kJeH2RZi%7^a-Pkz4&uR4aGkT3XT&D3s!`^pNnvf2SaD2cV0{Q zom2nCdI2zEIb!=`HJ`sL8L~K^YB{Vd`{V$ViZgyFgI~NFUD!Y8wo>bO<>sDe#N4U- za&Ppf47L{Uf}51_)cXGV*UfG3!dC++Wb|b1RI@otl3=BLHyxP)6eW16^X|ENeHh}; z8RUw+P!{iZQCy?qJs@V63mdf?Flb;O!H@UB<5kXk&@{Lq?5ZVX+h{CLKuLJxfVtG} zR`F&grDEKAm5jq*ThDys7MEa3V(l^&N?GH$&1(ADouspHdg(hl?8JFRF=87MjnQK_ zqF>Nw%!2;HF^X~8FSkBGPDQj@jE0}5nEG+_h#Gle=)O#09H-il>FMuXq;`ycuuAMa zlF-oy??b#IA)9Z0_hVZILm;4_ZFQJ1PmwSOk8sbCXm#mXFN4Dq27gTiyWmRnZrp(8cstV5=~&fj$~B}{3)Z;6QNzIkBA^e0WU{b20QU+CCjyGgcc zJ9MjKz=|>B-OF9IBLZ3?ozYyt)wk@L*Va!@zEb#80RlMtq|2t0c#jBVM^BlmQJbCjpIT+qTv=Y*aYe@g05u03|<01H9$ z8?k)@b)vlk;<^j`WN4-r6^U{Zb?b-t!t!_|4UIeb2#4(knm-LW-mZ-1z|Cmqql{tI zA%4WE^A}omQqqZJL`!+g4jFL=C+uX(3yEJ6TN+N1#<#V8F?g(WTAk!Zpvf(Arm$w!vl_g^3 z^@LK<5jTTJ&FZ^P&X8jon3rD-4Wj8=l_kRPAOr&G-k!`m;N+mdQ1=DZ&qq2T@>Wrp zkE8P=g5sGvHfiS^d#4mB2KdJO$yeuy>hYiTSk>-wL_LW#loG7cQB9;sCPQOjW~zR# zFjsmRg95R&r)QHe@XUt(q?(uIbVyYks0eXuyZRFQo2YHHIjD+Qx9ASNQH|3~n419- z_;baIh$R5)taFjV*v(#=W&GLv>GeC6Z(VAzI^IvS!Ah-Dsbhmas%cJn-f;f7U9|>I zBr&e`W|RF|3Ym9mdF#;Ha9&xyt$uEajKV|0s6HZ(Z}P8f-NB!X{yqHV>68ys)jiBf z!Pt!E92nwj4yx$`MDVQ*Hp|voD}z-f;PkwdMekgz9kG`!2YV%vO3rAitPH!UPElWe zML}bz;vYm{^x?j()5eDvk-gz9mlRr`_*S1t?vx zsyDdsnN&2qnd!6GCrfe}**@Iglz1d3!;BTkqXR`ZWvocC(DYN{__mGPA6W6po9`)W zR!#9a{aJBy^j4CmjESbDkQs2cr$dP< zJAD=hcq6IExc%_i@sns>cAdM{T%cOth{Xy; zD3LD$$6k+dKrP4?IhFK;K^TMXlt!rsJ5u9=he@Gh(T{#jPy)(?bLXMcop6wQ*{<(9 z6z*P8I=kCG^gqR7JbvXM=-&^>0H&@(6)kC_nM9I2wudN;4nM-7>ykDd`LONjV+W+B ziI<#Q-)C7Yz~JG)?I-u$Hubz`+{Ul~&W+)1HvmqW5IX3`95>ugNX=VrL zOnN zuShXQWr~4Id!JUaUIkidqzy7D2!yqD`A9JbGgT9PP#egDNHTs|OIMt2IaJGd_cA(<8T zLEmfEJkA?stnzt@+UlY|l*OqPb<9hvTb8JC#Nmmb^l{ zNorJbj9!CLhW*PttuI{%9C1a(2%waDpBQ^vfFjbH3?gb2Z*frqGAcjol*JhZ1osYf z^F|z7U;o{}K8HA#BTqM+857+gtAs2YiQnQcfXmXu@)8k$Kzz%!nsa;wmF%!&-|5-WqJk=vog#~m zicL2W`(gPx+(x=Ub1MYG9!@Myd1w2#)(^H#kM=;>$atUZKmA+ZT9aX5XoKc^z#p_8 zs>@}U8<;ju!}H(AmY@T;)2p_lfF(4q_AgOc^-ul25Xt+i*uVdO7=8+urkRbnhG z5Y5SFFs{0smUdYk`sQU&JfwJE8LnvBciAOn8B)*Mm^q1^becbnFZ}mUl2cg}9N?Z*95>(b>klK5Zr3XhN**xQG9FJvz#9Lq8yR*vB zC1yGH0E^p0;LsoRIJupLZOX7U%v(JFk33FL&(!MnbY_o-Y>`+l`kub<(+eM_`)FP? zinnBc(-YeN{aqDV-yOhlr52y0=;y|_yz;cRqnx|)k0HwhQ_mVB)MlXI!=K}=u0MB@ zzJCr+)VOM0KbtZs)lO<~R_y)RrNoGsbQWXaQq#%;QWG<+0?Q!l{A#oPbQqg?|12!GFa5#vumI)*o6>3ro>z0jUGAa zL-TfXtfM9&$Ur*?lqvFvK>;sLg)=60>nn>|e45bbkPlq?mQ!ly&xpN3u-A@HkdohB zU@}1G3#6>0Z|gS}4Q!Buurtz=;4#LyN}qGJbJ2&!><7 zWDH)7y;eN*&^?;co1YCA7|Px&5d3<|x&lngH_7tMrD8@f4nN_`VLpXR&10FLP$D{> zllX63)(T=qcrhMX2QWUZ*w^08mvY99ASxlG^ftsFPcAuvGC3BU~0T89)-TNX<|A zAMkj=N7x(XSe+Ow;1gu^gYWhYE+{R|=6B2!hG!cCGt&Q7HBx)KNXu+5)9kh<`Y`%} z6jZDr{`>9!GKk4t! zYGSBT!Yf-JLbN-d@njfx4or>8plOUH$iVKHBup~`u`;k?|2|@Hrne{oREuJQ!I1+> zJFA{zFKSo68oiHaR|jE;Z3q4%D~YIfC;4FXSUG)m&z)afBMm3+lTQft@aLHmhA)pe z5+~NrL99xZtE};Cot79yYHxl!;bnKe>hp<*ZIii8^z!JlX;A2-;Uy((Ei#d1O+)~p z*wGM{x?H~^ojxZX1}4vFK%viv{fP!?0q55m@1p6y?Ba28XyMv3mjDPapJ0pTUq8J?kWB6_J3l_ z^n9bU;0;!y#j?LdjNnr++*sW74IM{<5?1HG9%Baj2&?}4w( zu_>!NVkc3|OegxsAv44MRv}6e0|_wQjM0MM?$7C<<*c6~Ua)#MGVjUJnv1G{z6pUL ztj2~N15!I=FOXw%(#|79WwnY|wJnPydGd{Nzz=S(_5H(APhVA>{_(~LIMB(@5z_?C zH7C7pH(YO~Kd=JCvptcajXz$1s1>_AJc1^-FhR{|IuJ$#LdPv@nnUmQFyUX(1Nn=h zVUiJVhw@64h9GcKEKjKjJ`ko{>W`9{&&#Yu6+a16L1I(hTCkw67Q=t-#PagbV%6_$LnR9TW2ASd#kR)XELZ@k zoCOF~Cc$xgdRe)NwAF26#IyODtMGtZ$PX`h5W4!OAe$pFbaYMW(R!cG)l)sr=M-2wuGS?iW^UG_A~dWLqM`Do8K- zh?~PSA_@~7C~f=E6`f*tmVM$sb> zh1yNl_{WkMkGNHpp7!#@i~cO(fDto+STe95y-*7){#4?hL~=EV*8Sn@l<_S3v-y~t zL8+I4U}s@Rv~_1nArU~62?lozw8}I5Ifh-&Q4+qM9dGpBy4r_LOzPtkVBq6RH=h?7 z3it}0QSAK#bW-oSgNFR(L9X|Y+rom@)@#XRNw@Dl_O$2vUG;Q?uvEt}&9Vm+;Q8Tf z`#!ka%O2#vPo7B31UAyoYJ>OKWX=y2)i#JLt|adCW8%unUJMrAg%D(;QowVfa&jc~ zPll-#rv41Ahb~>8?eLhF0>$2;p$s6FY4$IO-c|IhrfR=2Lrc?q&2He@biS*c%xX>>BoiJ^n0*X#0`cu%U|8GGKsW*QP-1=I}>S&e{ZO~BhGY( z?z{NopyxpZCoH88?;PD;e`KvKZ21n*8?avD-jYVpv*0qwD;(SczCoGmQPUgVK5`hU zphpU{_PS1gsh2Q|_^<`Z;O*gS$0gIBSShnuez^+wfu-;=oi1~OTrd_%t?dmOZJl{W zO2kJ)n7yx8+-un%F+ImF_3rYU;|M0AT_U##mOR=;`SiUxwLx->|8|nHLJjuC(Rm>w zu;f1kdWJ|_Xy9-GPo5t<0hJ9ME4)_JJP>@R?D*M(X+(Y9@Mhr=c`mLip}B^CQdmvVZWUN zzxzb5OT7T=VNyn1Ig%%)PO&Z9MCgnt){3nvr7%88!eC$pJX^6JyG)NeHm3fW1Gmbs zv1>SKWfh1@%7`M02y-!fLOA|;;S%qO`z{ilXF~88hl{nenx){`E1t+7 zsjH8ef$P5FZ1xw8yCNdwsKnH;jfs#%4f#5s;Gk~T)gT z_FwDv8NtcME<6N;330wE-& z3YQgIw_6Eta-w()}s9ghE_n;;cmb4Jeqpbe1FIOHxO{pu_gZzspj*P(Ff+mSH zYSj@CNzSu=`>Jf%lx9H9(Uz>7Kp&8N1l5z)pC*HTf7KhnSdxb$^rATbbIW7vqG=W2 z11UQ}a)j3CZ2ge13VSK^66as#Ra0^H`$Ml{7#X%OOC6V9j!==L!P`h3F`6hOk$Tyq zassf?`w1$jP-Tj82CbuQZ#zmHA^PiOCwJ>=b6#3YzAPT>m96( zUX-+f({tbvCxLny>uk6ihomC(sjr}c6r@%J>c|;0zn%e(bM%$IAjLrH!Qbk#;0H@{PBj?+d=*g~&!|zBhxXDl+k&gHB$D z2e8(9wKg{%YLeE4GSZM=)DE3Sbz!uP9KYHaHnDownYu>51tBGm(eONi)IUBlAIPOv#2Y-4nk5oT3*M@0w z{@p#E?Q*)E|JOeC359umzHp=!|5tT6|5Mo~;~9hRgjUTAmn%*8_#v`4j(Eeg!6R}5 z6=S?4#|kYMalj?RErIWs37+Gd4+qruBF8VSZZ9Nb!>jCA#QqQob=~ z%JaoAx0fa<448T}KzEg@P(jq5$P^#JF1Aerhtu??FE$tb(dhNwy^#4TK@OoYDc%2d zi9u#v6%!M4sDU@YORl6r|7Tt(xf#S8PZNziVt4~~_}X%ECG-f*jI$h#OMcJGw1M{q zm|X`~?v}?v5w9eUyNv|;7UX;E{K3orf!3m!HPsyWhZJ~llD0gjzy6$S@(?tGy?QpO ztD3=%%h%hzmdLY5EU|c0g0((;#XLI?uUEYabZku_Pvt_iuaZy$i)zPPD8cBo&U44k z-O04IM*38_s=Mqc_(?xTczt8ahr)@JLb>^1#8oBhn?X;kOAoiTM2Ujfm9X`N$ohZ{ zdTIb50UiDGslf(m>27(LO2-l(tjtSpJd`tPe~k?q9lFLmo~d5GbK2l9_W1Ss@ObWX zX7afN2DBNC1qV?ni`&vg%(L{K1so7pq~Pi02rdt**u7`V02F=~E4}j{m}jgyv0GLo zQ#ERTV9ApTJ$B~Bm(;(1dbmAp|0!VGK7S)*+aLe>>&e_kI0Cga#;)lV?Tp*q-Q9Apr8fWSr-QOs>pVkFz6+nVge# z_9b%do?+v1p=-ka_h5n*2mW920{=S2RTEwW9lGIe61W5?&4x<;xauKRd))>Sa|vflWYZa-dew~CJ@+hJ>n zfVJr&d3xuztL=T_G8F*rU>Cyb|7{lyQEzfyp)a~B2PqG&-~XFX?z*U`aiN6$t@a+zhWq@0Mu3qjEvedRMoQx|IB4+JE`Tvy5Lm{|spT zQ|)Ijtm#Fl>KxSktWi9m{ZHbSe)Qfh(}ygz>8+208pa20$xmJp_anM%4;dErpu6g~ zs6V6BUx3;N+usG!bt?CGOqQ$TX}O`2Zrl@J1M(OOi8@6x`F-v(DHdvP{%fV<*D z4PDjtR6Q8@lN#axJl(JU+SF2XQ>t0ud`lXwz|?mU09wYh*5t$kWFyY=dzdjiUpo|f ztRj`F1E1~}l7_>3X;wJ|_M=)bTLHFS#ns*dV3ApNap02K@q6~2lvT3mpO>?N`#P?j z{+#~e5vubXcaCbKrlAL&r#jDm+esL8SAicmrfZ=#^F1PX~Z$ z03kxSH=?eV&UA$mO?r?T3kDZ@-0f{HP>_+ZiyMC}!*E^gJWeFqsF%^#A8?0E`(abw zU4yN2oF-HC7rYovRlTJfeX6q~$lf>sWO?E_jiFuy=}cG45AO^~vg%wq6B-2S z>mi|Zda;}NCtTMO%`^;)g+rkW&2BUd3_rHFw^?!FldGsWGgW)}5VJu<176e2`dqF4BYIlyb1?0eudF z6Pl|Z0Kli~y9@fk!W8fx{Gk>@@_d4L#=>)Qpt747$@!lRB?h_U{OQ;rGD{ z3ri_j)Pk-db;K-V0hi;u9_4vNMZN+xShtQpOUq=1&u3pGs-7#nj--gID5adKnoetvcIr~BJ< z=X3NLT$xc`wkhWfGg*X6FhkeGZk~$Kp;WErZ?z+RSHAJyz4fJ0Si0U#wqRS{#O??R z28e-MNuGE=+|H>CM)B)0gglU>QhZ&pCW^>bB@=+D;ns+n(kp^&p>qkQN?_fhM{2w~ zd_|NFhTQK25nM+cIcJovRz?y2Rf0>&UtskE-w6;^hZ+lxoPR95VUYgkce-^E7J*vs zL2Xy7>*GGRdV!9bi3!K|`Ibiylfgez>m zAA4s6Y9)ndpgm@7&_vQXMZNp^-|V3!u}eQmsw2^(^Gbo{%Y&cQRUE@dT_J2$bXkq^ zD;=C4DQzzgD&#+XM>gK4nMd4lMvR#Q?W^s~e$lhK?`xxF2!q0gXrZx-bY}x-`+1(J zDPbPaTS{MZOXl6O1YoujqXEiHU$L2E8dv9={*IhlXt4(tIT-7GIS*!jV6v;GxHY8` z;bEcOJQ&!Hh#u7+KrZ9qY+dp@5RRSZ9e(>UyEZ?N(nYb9**ZcvH+$$UF^wf}m_V zvfp82hs(a|i-@B#x2adGA#}CS{rbV@#zydUHKNRDd;eg7FKxPhzxTqmVJ#_jq-XN# zWg>3u!q`)i-I?@4Aq|URfX}vMBofQz3ryUQKqblt{j)ytjLEMUJYrV_T0B0GX7P^n z(>>Y!QVp}QC8~n>v=onjBq;b?lTlllf;XyG8izEBH=q_Q_cxb48I~ zykxzmF84CDRXf}rPmb6d21}m?M$z3bk~+7p{dxSbbMZzdqDyjz1{c-z4L@!RhP$A* z9FdL1K@pmu!l@AY7dS-YP)kRr$e4F+yErWtMz!*A(NcKAVvGbHt|UVLk<4E$i|p%- zw0rh_IKchw#p8c3ccdvmZ31$?nz(Ph`(@X9U$FSm?>cX!&=*yl>&%`iF-Bi3<1q27}h zFw_KhH(z?vSUut*??h=V@UG|Bw&gJ>^smL%LU$sZ%nKuOQ19R0MopAi{_uVqm1W#_ ztiEfSyPGNM1s{HTcv!%z<9Bh+V{KR0e#k8VTBMTOes6)17^w)!benqZOT3oM?Z&NR zuz+V^z~5R$X0N2=Us1qf&~EVc;}@h9iwZX304*=s7p96TT5ho=En@H8J?K}8rK)9( zjaRbIk?F$F&W9QW?P6cWbGC`HxAL?o6qSL=-(M;vFc=}JSJB4uAs2cpLZ?= zQuwb@&t+M0+OZl#s@@bUjdc(;EGHJLNaLHwiE!r%;+WF*nR6Q#HPusvx;|@4@z*GY zM;_vH*?}hm4dU8-Q4QAw|yU^aTRvUX_~2QDA&a~VrOg)H!gyOY=dQB+{i z)))in=fMc~S`oQwr2kv98f@(Z^#;cKr|X5Fp+C84n3x6%WJ7*WPQJ_LF|s*aR%|bz zx&oB{7ldIW^t|s0%jvtZ_aw5GNkNTkF80dnTk@UDi1@m;3wdV~Y8?xM(5J)39tuqB zC#Bj8GYC}0iDw>k$pc2xGKcHhZ=u zMG_%{yej|mP#zT!_O}Ng^l+?eX-9qT<=J0v7s8k)9;Y2RY8?4{DdmfbpEzoE^|3sv z=Y&vY^%Y;nyRLq3NOCsvZK$rjNg2bsr{siUV}7nZAPuX5-7v zR5@aA(J)&|^_w>E-ZK^}AhSAMR;uR0uN<9qwk32bYm|K5pnoK2l7LkOG(e3rql2ON1gyZQUM;He0qfI(ONF&N8bsR9F>v zR7OGgZ-nn3ly5H!$!tEX6E~Yyj(KSb$!}#A$A{X;J`N&?+UlCbu$tI) z^ZNTQ#RoQP@s%00;}Jq`3E8yX*hm{Z+cd$e%X_ejk~zJP6a*bSKTrvwJz=kGI0f32 zm~w%TE!5zs*Fm1S&FKZ|%FC#4G=isJW$`w**8^$@pE(?|*t3Xy9$;O66-jC-;{Q{u z5#Kmv^iUf#)YPw$a|nFqaNR=W!x23SD9z>At|ZHQtp$KZG~y5|g9+IV{VGH~KT zp0RU(5~U0}x&%%%ZsQ6cNGy&4bLg46=jU7EAq#J-9+9z6V42%9(w>96?vdA7U+uHr z>WKVO3K)Oml~EeD6dAvk#jV)9Elu;uIge}DwTwn+AQwU_ESrfFl?-Y7279bc)Ly&& zQu?PW@`Tr*EL~P7f+3y@vBotlJdo?!uW|PJu7vi9WgD_=pG&zn6N#}71gV7DPHNG* zMCyFOscd@Q`=PmG?Q|#}uQ!Z&*@02c%(t428tcBM0l}@7I&ne2xql`o{%P1_hhUX# z%-SX5x)IW43f5hn0AtLbJJ9VMC-N)*ZApIYiG)8CA8claVxp z=bt{%7mi=Hp@RgGdyn^nqHh0OpJBjN-O)BjmvlCOrcLb)C>6)^hc%76az-d~Wv?Q}&n${MWlS*WDg(&`2__*j2N-2?r^x7U-^KO5DwaIvJD9J)n*1 z!2forp=B` zy7KEJ_1;#4ZGW|A^ae-?+a-|k+Lpv1ojd8AFdOt)7Lq~;k7s>buVtBUw^s6!P^+~7 zYGpw}R#b-O$xi{wPJP`upUP3=%hxj3N4DfI2uRpGtE;s|++g)X)Rv|+gn=Y2EW+K8 zull~<%J*0`vOc>1nETnQ;aXL_Pxo!*w!q~fNSu20IaOW4@l(0LQ_1DfWjd{7qhsAq zCpHx(W%b_24^`V819b0ktNIFDZZ+o6ZBG6NJE};+7FnU!{pqrsm&2`* z$KriKlFGAWE*BjP4u;RrO5nW*a%|!T%&>@(S7jP`jU|YIB;{Z7TyjML5NZl5Rd=EG z#}WTQPN47M!Nb3qQu_AkMv?vUgM2gf_S~6QmgNn`-RXw3=O&?CoQvv8q{uT9%CfDY zA~)BE#wq~?KT&Ec&`WWl3;tj+grh}L{eMxaNS+1jwbp|C;8hQaLjAf8aCZgF@1tH1 zu2RYLxZj=o-{_640)?jx)8NlvQmRG2XC>wdeG?W}PceEb`Ta46>?T}EeV|KbjviJ- zQ7y=d$mOFl=ab6&7VNm7N9ChJyh52UUH0aUybN>C)=yn3nd|aA;rqPi(ez>eNTDIy zwC(JkSt%!&xO(pgME8!kRK_kmGbi4a#=&ur;7w6APafaRcc5LLMJtQHRYqu9oI`cO z>Ns;nZtKbevG8DcGgAYRYYGm!tQg<3!uG}7f;CG^gNr80ZELAmTWZMg5cAubRX-#JE@+(nKADEc(6E`1_u_~ zh$WVfH{Ll!qOLbll<@2!i?njAz(?1gIxszDPh`}}v07<@WJUs*0``)m7u=QPBD=8R zpDt= zRZK!6o+A~y=iJtycyd*2uxjsqoV?NhuW`s7@-o$AF62i|`o9IUbOQeru{HZ#!(fd9 zh$QWRn!rE&K&aDSyc+Xi6QTE2jHU4gb{(2bWY+X=DqKcIMW&Uq;R(q?I}mBkOQ70( z;y!N#A@^{BwIqq##^T^Pm$zGe2O{VJ2hjrq0Q?F~?^ojm$RLJstr0 zFy8uN!!c2(BdAatw2Q%nuRwHpj{G-{`Fp_DxF_mrYyri0o9n3|5+~}FDdw%!&zb&I zJ=;Qe9cQCoy=-0g1ZKe#5(;xbck{G72_5KPX5BCcjqiA{9j-{QS>a!o+yiJ0i)0Q( zzYjydj$*rG2CMSV(R{jEy(#Wd=U<1^;xMKk}U?iv72qTBQf?VZKN zry8J5Tp@!Wd3Pb|qGj%G!LEPAaYWH_?ZLLknKLV4zS4$=bImQyO7v#_9Q4NXR=m;m z4R4?XV}4&ZG{t9)kWdk=8A#^S6!xhckqLc4^k0?zpy}tq(QutBI(cbjbkr|6Ze{7U z9Q*ESi^7`F7>-F*7XjwA#vr^Z>}wR5hW+o&|BM3>OfzcD(9kBa69JQcwd)JyV((bB65gMJ$T=UmRw&QT&Cnf7>+?;a|3?`r+C!eE^T z7IEe{AKklaj$+K1o*fQxWJ_rF8m4K-iOMbg1!0bn6|Cdo8xO>*5#ZQXy`G=1Dbj?B zNQ*AN0$a_iNGCjTJ}!aL999N~EC&w{uSiUXPoYu*Din_gFT-lCJXWr+uanx}&A7M# zY0gdhb3_Kz5r=9A1id9ZlD1Gh7Cap_5jPAPOcUE`H|0Ekc1?6hsck=>nuFE0?)CwC zr#MC?@e^jm*f8+Mcg!Kl>UO!fmKS`I$S$HPHs81iMhs_1`Sd235DKz2)ET-EvNdS9 zR5yt^m5JGAX-}0;a>^g^e6y)XRJL|%l5z?vTw_NT`U!HFW>dK)t)eh=Lz|1 z%WBD1r;O3?;33S}JbP)$Frq~C=Z%MHd3){igf!^0?dK!jKlxUZGLx~CYHhY0x{4oA zYpQ>3AN<{HUGZ4ru)X+*hr4HW?=&!fv}8q z-Wrs?hHn2d{X|wgF!Z)HiR^wYU`+mE+1BVHoJV%G`jpBR9C4HO(CmBr*Mb@^c1Ca@ z)v0OHCYQ^~X_vfe11f~TixSx|$xSe}jD$ZK@Sz8)Thi(Fz4@chE$SUrXfvU$C@n#j*yE>8A`NFEXkXNfbrS?(oM+Bob6glnkzd zN%bhRNyVJ|H&>EXjBZs~bYF9D@?UpL?lX=m9v^nxlb4Q~4e%#F_FMIZNTFBi0KJN4 zvGN|kc3_u`jECbj0|tS)$*{M4pPR-9W@j<$A;y0arw*KXI<_b|1=>({oB|z+1rG?t zleD|bK}}NEm4N3wKl!1~?5g7PPNW!=tht<$^*Xl+=)_9`L$66i69&8rJfY=Os%^vf zVvI~Lt3uWwWsg%p?#=Pva{==U#Y5%8U>lN8Sb}HyE*hkVKyK^jWgROqlcY3fRTE~i z>=>3YGAMq!kI47EO*d(Q1czP=><3h>F6sRJEf*89ID=+8SH9qAW zCjK@hN}I{h1~{3f0uH5IK6pIMKOT(RSh=q5;l1}BJF6`FbbL(?3-rs{#z4HJf-)dz z)pfM+5P{(q)B z)9%aj*9Pa?i^IX*zR(H`#MfUZ3k3hMS8A5`+34R5UKk%|H zF|CQK5Vc)m(@(42Gzq4UEQEyT)DA4Ct!{>cdg|AfBO8|iwFgy?o70KZ^qcGTsUzr) zy|?Q}Ag>?#W$1)|3%Vtre6p(xiblRof&Dbj#wkN!zxtZEw3qjo?5LZJB53`+kKi zQ@tncBbK_=WZg#(s)GakQe{%6e4W-hWS;9QclC;&1A<9_ks~D^>p@R#&?{~nccTDc zPJs6xci_E6i&0v)#&% z7}Y6N`cm?(4b;E#<#l7*70aUyv+t5-=m=Ym%lNR?bS7)v7pbRl^S$afBbKbr%Yu&JM-@bDlO&EJ6Xtx zD(u=Gq#Ct|UG{&A2}*zF@ctf^dfg<%zbkW_CHywIRB-rx$wxfv0-jb#Tivubx0E^} z8e;Mp#;ugVFSanO*E1_LE@^AMqPFPs6MBbwNRamyaRXNTt`1A{G_VVKWBRAdfwh#8Z_fe1t%)B$$T za&!xwd6Vs5rI879oC6B#gMB-DT!#2RcKp8V3A@X8hyIh`aW0x$`e#ip;Qr&o!SamdRBD4V)S!0Vb0z=`t|@_2ZfNu}4(D0_D7CH<5mNNVVY305 z_YT)nkvP1<_~PN%Fty~`-~K1m(c^eX7b^`UN>Qnx-cU`2lI@HX&~EDZ_{Md%do&~@HR!tY?p!cv zf7Unf__tE)vyn6X;cwDMrDg;SmS^Bo3sxCbJnq~_P)RZ&Rd0UD(PZtlWcGL&x2i|b zr%~hZ-%1@5MC7@vAs1)Nmx)1FwI|NiXA|ke7nQ0{`fRhrHA_DyZh4y=v6F_fhN|Kj z38yD{0pgS42-@^5f{dtiNGo=)!A~`|r&1YwbRQi*nCV6NZgYlEG4?z>x;y4jB;QX` zDKA=Y5*lGIZ-BJn$@CHyJgR||Y-oAvLl1Im~U!JtS4RS08Ii6wJMy(E+5o&IEM2)8Tm1dG{z_= z$h0=tBD@CT2@$Q2l7mPbqR1s3ph8q!ZVa}ry#aH`?N_gyV}-uw2N3f~9ajZip?-gI z{!zOuz1;5Ez|;dbZPfBMd<4ZGTh&3T4+g~evXeta(Dh&sYQ4D-DIdEUZAl24x^Pzm zgkW8wgUZ-`73t?LgK2R&1-=)ZcbVr`MY8MFgk|)@>ewBxJPEKlcRCi2Emi|--seAT zB@6WiE{CgnvSQon3lB&M{TwVTw0pu89O_xbM7_HoO_z2b=y*LGhpg?VMuV&U^R$NU zlUa@^0~RSCbT?Z++>5Xvs{m5EwQ&kC+Ws)!VtSw9Gc!Dg5jeo2Cc;P|)7?6+l{jS> zb#uW?QY*O$ZM&Ag@b~DXv#N9GJg-oZ4q@#j@m9eYD|E2r_FU3Ow$?zf9e$J`%?S{) zsz=`AnNYGzhThV*$sko1vv?6k>;mIg9_9VcBG27+Nn_IjSKAuza82Medtjh%{hW}Y zm--rg1jF!%(nc16zMxGNTIgov7A^ioXX|D(3>jN(vYVmEPU7E6uF8t?QlXo+Po?-X zvq?~Z6~No-?b>el;Vj!kv*ei$CDkQ%*eI6|wnNww$K}2JlJNYJ zeEja#ngICZb;!lkSZ&K>4Z8@~)^$!00u#?FBT%ZVp-=)%yi&wd8NfXE$7Fi}b#`>y zI2ixPxXrE4qw%eF?OaRD#?pmjlOwD*gn9Pav{-AX`$Itn>Ze8VIdFQB+CrdLVK@AN zvR9o-M!htHu$Lw?!+^#?5Qm)uw<-qgn(>sroFK~QF%-)6x`Lv$BxPTG;3WN9bC12# zrUj|2xTQ(>pT#@0Q@zWFz zs96_*Bud86Fj4$HFshsY0k7*7DSOPBNSWwDHF|^kF1~z2&cd!PrEYun3OoEf&i9T@ zJBI?UGT`K3RbdJlr^U_+3-b({n%M<5CA645l ztjq~g!RDqZv7Yvc5gMSW=DU>Dv(BSZlC-HvKl*Z<(-Khi_hJM8MPY=-V3UDV#gg4kO%5JXf%q7fCY!(U=J0IJsKy;Fv`MOMB|h^MmNvcd_%dvAx-5} zO$i5Z{ev^_(3>AjJz%OopE3P0O9+`9AOD`)mX^#mxeC&DZvF)KC-x>F!st8w^TD5qqnA&xV4#v!cjaK$G+D>pvqjaW~J8cxlr2 z@m}t#m4QFRKYl%wMV4yKwy7c`ZvMdnJc9{b4Vd3Wor<&^R2SxRhjsGIvazAz$rSkF zSq9+?cc)|#?Ys$)H(@-*F9HPIdnDeALn3uU#nUj}fP+>oFyqR$kGS02lPKcT)*7eH zZVRy(LfEtiPUadx6TM-6#UH>hOrxOXqL?85dp_genfz9p@@)3v-)U}R?py=~;RK+i zXpjXP)sf>GAv`Jh^NiD0Pjs-9xz%JNGwN??dNku->fqmfS)3V-IY!oQ`3PX@Flxyh7QoVoiehZL(5lpgG z18IZhWQj+NTHR%8J*UU2<|F9tqlIMJC#v@b(m3$y_<2B`chsN6ahiVjA^9t>7GY8+ zfwD0Y+pfMUDqp))>qY0tY{_B24`{0CdTGH0EHA>>Vc#j#2fl7gJI3T4%SPHuZ%}>K zqBUfBi$>x=xngbk-k0UXTL5UbJA*m&xE|owkyXqbGF4JbIZTjMp=*mug<>mGhWsfl z==S)8ONr6hcKcj59ZDJ1M-I{Gb`f-ylm?hu!-X5$R+h4`B1Mwtrl_h(yYUzA?Oaa% z474TO9Ya{0@qYS9snRBy@60dAB8n`4qkK7WEE&x4?L~%@{`_}iU}Q~=b+lTy1=j71}UeRKD@LD#jOEK(5YjPwbt;*l3S!$?^QL>Fh4v^ooIZ2b!C8 zYwr2U%V5bVV%U;gu{|EVbk-1hB-n{{#C~(c54pIdw1o3_Y1r% zmVUx-k=k~R-qMzU%#s!kK>-afSf`XhvZP5YZz9>}2}4Bxw<7}k zX0mI*aIxgL_#|D;#zZ#sDY!*cFHNgLd#8T&pIxP33+VP5v125$uw&iE@*%i}>pC?8 z`4&^RPE-VKB3zWYUz_3gf5Y5LmP{u$$KaOq(!pE*^(qnIPmd&v!sn(T`;x`&R{klW z!@+9(WGXl0PWEi}PmErX;VS}fDY8)3+-eF&!GYXql|Oya6{ERDO6e0g$wIzA-QfYz z9GIjs!^yCLfEYWXP8zi}s2aC)Yb{km*LuoGTK^*EUhjS;_1m9SPr)`|40oaT(>~bf zVqiC34^>(~tT?MkiL5XD@`E^clb9!V%Vty`L4j?ykSW1{j8SVc?euF=%_q)63yrm2 zJE8xxRITWA4R>&84EQY)f44146QM-Ivz%(6A@WYkiA|-^?>8PJ89NQ8QJpuEZa|&h zts0VxOISexwKGVG_CItn_dbz9uQOOS#yM*Xgnr=L`VoDIPZ8P+wiVVA*3j4fHbLR= z5f9sCzY4E}=9SA6JegsQ$UbvctumNDM*zmlxu2y|_BH`&Qvz~sOc)nOsXM2VtAS%* zN~1E5ES^VlmLl0FwDdmG=4@aRjdIzkmp#W0)HgQrZsKmNjz5m#G#L*Ng$RF}sM#XG z1m38_@;+J=69baZ=Edz)aw^l>y)PjE^D>)`$WD085_w=s(ihOcZl1jd5KVJu5|KrHhW!vO# zC6@+TXlMzq;oNyUwu&Xb6+nPC?~&yi22d_%&cwA>>Eby}Lixw4M;33w;ugG-4U12I zCT|gFE9qoZG;DcR#O2LN=@%MBxG}p!w>r*V%)Gguj=D|t4AXr^WUXGttsx9h4J7K@ zaT(wY902%U9B~xCsKN$wu$*F$8&ZpS2ri8VVKO~BJNrR3#j!#3_6xE^P7uaehfTk@ zsyQ+r<`AkAo#fRKi%}mCwtN5fV=}Cfl?F;?&h3iCH#;ivvtgsFY;x#F?O zqqi8KskOHQrWyehsimQ$3| zVWSKFtB}e4-~JCx*B#CF|Gi_@u029+KB&E^wrbDXn-V+rUPVwNW>F;wHDjy2#SS%M zRkWzl6jfCewfW`u$M@fy^FBG}^*Z;yp8Gt{y?0nS6yi|DDnS`^?bws0%vzTt+p(gz z=D|Z{A+o2qeN6dbsJyr88amh6HGUAx$K+qeNu)XS?lXl+tqfh)%Rdk?2DVf4NFB-a zh{w$~|MXV3Qzx}(6Sl-9-bAVUr17Ci;8_K=nvD{&e8Z$C$A@g*6cJSRN?%w{`SKA% zNNzf~76h!j^c0pr3A}~i<;YI7aS3)cbU0?i zhl1mY93o$K6tTR_G5!=w zY5pN*ve~+Gzu-kC^X2t^e&zh`R)e4QofnGtoyNlbJ)N~i`FT&_H(t-)^Bvkkv6yFF zn&xJqyHOx>*D*&|Zl&RG{(gP{CL?M($WCUPKjZi?fEM80M-%6_Vfnz}`q)41B)ix1 zpKA8~aR@eA$7-$dd?jKkUFJ?&ICK_O>3dQ_Zx+KFH#G&^xTrH*mDN%q#19gZ zr?^QZoM1c~J~qEt^VHQ@XJ3J+O`^{(!O=V7YPTP*5+Tm~e{6IM(N_3tU<&C3Q`kpg zEo}j9|2u0I2T$e(Dfzc}i?lOHU-!;q-me<{ zxg8IjriY8+2jqHV({-&Zg)S7SV$p%NFDA&8_fGsx`G;o^^A>VXXSizcKS$`=IW4kf zd-i{I&I;vVN7Mn=F!T2-;U}WW#{223!AOb3Fc{DCA}01ctr1(VDq+Y(t#kDR9>8Ja z^;7*9hoKEVPc)G+nehP4LD$9n&=2fYb-*v{ClD~(fVNeaw^!={{J)rSzIiakjkK^5 z6Lp3miy?k2NtmK4tM9R&_34s+Rn&g0W)_U+xOpv`*pPS zH@-HWVP3p{XtH@iA8rldt`w$k7sOQxv5^1L0L#Bfrna8Y>&ye^99Q2M129 zBHMjAX19Lbbso;#qvG=f>%jeBR$n$e*H^S0TrR+!k}652 z=KZJPo{}^mtA$3->E03Q#y=1_))R>G*|X#oRDR^|_0nqF+`v zsXwL~KyQq}hR?5hJIOYbqgbf%bO#&#ul`Ao)!m(kINgPQiuliPw`fncA((s8D1KK( z>4-J~#rIvBh)jY>kc@u43Hc@Tb3|Pdm%Cn>*uQ>0d@C#%jxFX4hc7~+(b1Cubus4| zy>=U6o)f}ci;%5IZli69A3YCfixXq0rxZ`ozutcQ*XI2Q$@X9OS6L0Su_sP12KyW| zc@K9o2U_pXxo?&`ZSH?1<@L($#NY34AWM87_4gcHY)NDD-u{PZxy%+aq?V7-tEjb9 z!SK2EY=mCz=e>xI=$9LKPH}O0P>eRw(ao8u8sGaxHK7Obg+#YT$)G>UtA;gi%+b<8 zA_~OO^V3`=P!=n)TQF>bMMKC){`Ru-&E3{nu}?=sbQtsd)R)r%i9lIkcF?$lEyI>v z1|+Q8*M5}uhGTtWa|(nHh)|k=w`SuzQ{rM3#g{9fmGa=Hb?U13)CgP6r`ke{j+T|` zbjSes2Sk4Q>QekNCm?X<4jKB~`^oFhJ*9Nr34nyuSLXOU*eCkc(=N4XE}jYsUrMO* zI`FjN&Ep=_9z zyU^%x!*Xe3b%@FUo5DPZH1ESbC1QOmzX4x$HHbu#vs}^Qh{9=L*Q+C(vD+|e(V7_ z&0=@s7IUu)UHIMksu$HFgJMto%9a!ZXD~FJRvBTVNkKO$a+vWW>Qkb2{ek$~!V$gR z&5(_-n)$xf5FZHhh#AclQVNnLczuf~#n^Nt-X>MWzEyQFQfDlc_yLS1U1}zXiEyj- zCr+1=Pmgt?jfz^Gr_EeJ1>hpv_vVi@aX)TJ9f!KZ6=ng^u7MY-G%G!w6(}0ftKbUE zgIWebGiizHr1a7|n-aB6&yM9iS4jRr3i<1VtbL2f{#6Ou1`l4Z-wBtYo{U88v(a^* zFuPlF>j#!C(q9uVuGlUHHI3NEF+cH}fO=~B-+d!D3kdC*KC zJD-o&{}3+J-|ZurrlorrSTQ@E&+$@9pUVin-)G@o6FUb=4gwN<^8)to^&{#b!jkh- zg;aV4{aD15`CHYl0iTUqdPjb@uRgC2@nAXeNeT;MA6`Zla3`25yEF1Bm%4lr*Mq4d zu*^pu8=q*U{&a}=D!TQecHr%w%2pMG#Xf%B2>$ahQ0oYNp}((0auZf?DXspDg8Vrp z`8M#h^81Y#6CJflVrb$HYS7DCr9da!+pwqj{Hx|QcX7+)aU z8rAV)6QzGNbVe>AT_U6&G@}D-2H*NkPU=o8i6&ExsO&1_4w}RYPi`aAcLe7^wnsZ5 zZ%`}|@-sqZU(VRqb77tk((v6!{k^Uql3!^u?CUlAQWWOI?`B?rEq|VX%1+p{2%TX@ znAqxunhPwm-+<@d7;>@dq^x%C+K&7%#r1qo>AB~Jm}Tx?^;XQUWpnhjAF8xI zyyX#-;2EV=6{Odtr_Pzq_G5OvIX-ygBS#5Q(Cb+ZtHw{4GH2+45PnlgJ>PhG;(L!h zh&qp0zTO!bv1$<*i0ZDSroF!t&#n$Y1rTK(Y|5$^?ey6kiES7o6PCRl!#l_UsleO?}&1-q#EG>&xt3AAmThz zk{Ow&7kO_rZ}(=3AtZAOKdjltbt-7zeF2f(8(wz5I(&8dv5N0_ps#nx{&}%!yRb6g z%USWWXBk1jyzfC!2ayqL1fQ#3;IRCM_Oo1L9&rT7({eX6Xy7%HLz{aQRe$nbj(3*LZ|{%ut{X3@R*XwZEblt3i@c`)lE87AyjQs0~HS zsn0SfNF;DZ{y(9%-Uaco;jZdziTDn{!)nYfM|KAUz0eWJoClqKu<5f5Jd|g3U6jK- zFW#*Ku$6S2>Df7@gF?prO9h>CYZacP<8f`*LIhTrL}uZP{CZ>0R#3Fz!&`k#GHIy% z-y-=P%|2xQfipcqK-aRyW{l)lP=+*aNT9+om@J5mF~!OOI!Fw)qA_#NNQQ%C^e(2V zq#*qR8-q4)u+$C|$4Fo4RQLUKo3gKVMG$;Vz{&hz6~XB4@8tdT zR00L|mW4Ooe6&tT#JM4SU&bQbx}I)%C3rSg3bSq=B4lp={_=8skqi7X(XG=ZpDVeuQ^A9;~T z2pSu6SKoCGJarfVyIYVUNy*QiX7ubw zrEB&7kz1$E@`nHNw`|0Z841U2dTbpZxc!$y(fTNFg0Ba3wLi|Iud9L;`F6+}l%CK^ z;Ynebb+lWR%x)mHW63yyI3eLuRV0$I`Xpp^T6+uDMgbXpDIqNUbS68(I=T}P5aHO9~spw z@pg9%jv6%B%}*v7v5ncdMUElQyS_>vWeiQja^p|v{pH0@rG+mdsZSf;!lDfS=OrMZ z_kz8Lz)qEj7CYBR;ooGgwFx`zRBJg8({7jTIrhW}`MIwm;auEpV75QL)@xpo3=X*- z6QGy!>3BG0X*P*QZZ#K?c^p=-x9zQI)FsE=p`}6~d=s#s0X~_A@Z-6Yx8R)gLn`$+EP6_yM{EEc4#~ z4YHJvPvhgKjzv3-($iY0cCEHGb+nan3gJ<|kU%FVDsZPdEQSLSBqMr>`Mt!y*jU|W zf&tZrj*{L^2YtK+xf5InZiQ;95~L}!Xm^zm&0rI+IG(PK7PpSFwl)WU^u1%96~r_R zv=|;5e4AR`mhKI7TVs zn%u%as3XyP<4c|3W{!FNHv(4>A9ZaSay6dis-c& zr4fw8y-$5VjhPsiIvzoE;*fz5A9vnX@brO%+K<^J^C3Qu0IGYka^?O_a(vQ&kpb@k%vE6)f_E=_8)#7-Wl z7v?GhqF*y#>@Hv9fJkSN6X0`L;8TF14BBc|t!;EVN#clJQcPk?NfT0_il_&eBGb(k%;7}wTT-&}Tl8}b-a zxbQHEgeZu-1>c04*2w$m&nd797AA7OAd8WoGVCvob>McRycCk(1!c4m3QjN5)2Juw z^F1|ft{|LBL;6FzAu(7!!Q@F7-!S?4f)rP`bk}a556ozw=qACYquksGct?S8k5U;J z00JdXuIm!|<=-{s?k$3b8y|m#jZjy6vURRA?=oAR{<`Af_7%BC28!nC5fmY`#wGr? z@s8G)to$2aX-}w$gH9>c?>oWh@LZn0cAKEC_NK6!@`5!&Rvv6dHTzQH>Mme@em>=* zxVj$KI~9;VB_Kc$-~CtrXnl^EKO3Vk7am#EwWBT3b=kL-JRN2=~|Hi+bEdk^Qfm#~MSaUw~dYV)XZMVAg*{ z268c#M2E|eMO7v1Kt=sn-%fohvcI`AU_Fb2^K^puDT>!q<2)RRgNdZOf+}k6%dh(& z%|kOCFPta|OOh7rxm>-hQw!qC4GieeCUe(OnkHKG@8}`g;$etOKP*L8Mftd?oQY_Z9Q^x z8eIQtMhqiai|{nf+07)|XOW@|99(3s4kqU0tTWCX?wX!p?y85xRQncDnN*xW*xHX1 zVOjso-GzYf45GSURz)G7Pouz-0!T&hZl^MVlVn%NjyU6U2 z?@pFHt>s>i!`SujaiG}cu)leZ_B1L27_ObKazQ2z1xyjTQL0S;>{DmF%wVAte0>Qf z3j;DDD>bZr(`DdA-98)40g2ETI(0i98KhXaJ6Ywg&Y$cxH#JYIAwOuL0>1V=}eLPE|=jy+U++hUzTw7p)O>$*$Fuud8BD{*kjWo(h0<2PRv!9&< zZIz^Z3U^%zDfSYf(7L?3NZ#y4tq7}dk>0^fCGW z)C8@CN7NE|imH?$>k?0`i_-aO?LYZ$-GnqtW)D7Sg+5S=;OhzL}E@l*F$=!mF$_WwUPHAlZ za!#4p^N`9U=9qXf+X3oVz)eAyB#;fP%*kPWD6?~Q_aGB;_++LnTDmmkj+UBYz0#YcrN!G9?gczIl(S= zL*>{UhpWaZJipxh-6EOCM@ENr69L%JzRVKny!YIeiEsMB=8)7kup$pj^?e%dfr*h>i)#h)`MEX02O zAggurxNlBeGdLHVJd6e=Ym*rx1KQVH9)Ip26*Sq9XB$s2eSd}e{w?b5a_CdF*ymA7 z3ya~gGHP~MaZ%FHLJi+e$`*lVN>u7;ULxtZN#=-on54p##l~|f|9uKE+@5-WN73&Q zaFjAy(v~5o7!^bI5&&42?F$hki_KNoU?7@n_9;Ly0M%k78IE5r;X-1zTWZy)4wU0 z;$Zygz>5JR`iZop`S zo8F{~?gWX^PaN?eE?Tm%LvHmE2L31nRlE$^Y7T zeFd@=NM4|oQW4#p63=R&n5Ngk)0v>rbDKyrX)5|22;VOEA=NX68RHUKyKqM??jKB#p>V>Z6<-^go5!IX}lCcm-#bB}iXq`p`gMzv`-`p6)O$o%P|- z;y$YqoIf&*`PZ7MUb|ykhg%%zX5{*wD(3bfBvL!EByeKq1hjx{qOLu&Q( z%p<3H8xQ3TXi(HwD6Z7Gj+34ZX&lhN?)6dAak&W!nB|agI$hKfpt=A0!F8WKR-J-79nd@o+Op?_VxT~hCl_}gcaM(Ob;l`{xeG0kTlR{*AlG~0!ZbqJd^J4A) zDjOEQ>O`8qlll3Hs_wKW5(e+30?2uTr4?o%$=Ny2#0;v4%2YyoDPMgHap1nWJmr)$zMk>H3Xgi@iGn~iI<;ARzA$dpKZLS zLRQHn_o$C=T6Y+nak`5;kBm~&IK?-(A8${0G!8>4*O6Z~F=3hIsIZfwt(>e^H%ovHImi!m> zhFbR&_|9;-r|$4WwdsebXL?>Rana;)KJGe4ETvBeB|DYW4(z8=LMqd<?WnC4=84;$(YYfz@lCJ><$N80+R zx?EWGV{gaCj15UEe(r|bj%V!r8Qp-CY=4p83!#CC6{eguxE3h6jD(Gu%cWW|9=1gu z14)c+H*eR%BZT(@ z!4n_J#1|y5;#Cr%sR10PLU!Il#S;i`6Qk&fb~23$=4l) zo#!kK{|UvLE*u)eI4A%79 zPm`GD`aXb^&f;zKk9glxJfqM}fk&VZKbr;AF-s6}hZovZ84 zToD=?x?@_YXG#zXLv_%7U&6=#KH%CVN!KN18`SN@sEK?!MV>vQWHSE@RFxoQ&nQRs z9B6MHt=+UvV-yf0;+~Vk1JMdtdC`fh_Why#UJ)4S{ekaWm!||52U9HTEPcHj-^cWm z-oE9@g>6xaC+XRhD~ixW?Q5OAesJ^6wFJQavh`+r#HbJAgyt5iJ;H3d25N85Z#*lm zWk&uh)nVaa*T7{Utx~_-=EJ7}2Q*R^sGqjM6w8exU>dVZY3!K&1TlW9bo?da>W;?!v(n>pr|Sa z7idaEkQ~{zc#PF=Im+9;a{>h43$skK%!5<7}!O2vwrBHF;*rG+cbx3L}kJuQ{Q|FJS^Ms$APC?V9RRXryWJ(h(JSi z!NQmLWybYKwuH{9fj_9H5UhbH@drWasvEhGw(`*2yPIpgDv3d<5ljd(uAZ{bpi9@) z*cY+(CA+9Lu<=~V_!SJmCxY`4#NbY|eu!4eY6{2i{8UUbFyM&_lXoH|Rd9onXfZr& zSLWFn&h=JI60Qt25)!1HEQ@#hZR2W8l&&lMo*%chYlM1h<{w7+S^gCR1Y? z3DU$$X>B_m=Mwo?%g1@eukUj6E6pvF0cG|@B@$!D@nlHmv40-+^k#&jmf6%&qBS)+ z3C6UO_|>*<%0*6%>Xr1ZbN;pyW{|la{E{4U&i@2}s_x$554JtKD)?IIQT|UQKsEg% z#mNIraU(DyzT5ZU21yfRAtJgKciBs>G~@wcD$@yljF+EKdWkRRwZjAW55%S7nfpe9YT z-phd@W?8x&H(?E;#eDHRo06wp{9G=j56=GIcD4Dg6lUdhi5YaF-3mw-932 zO{~rcua6?AoOoYsbw3S&WNG1*ly#Y|5+u0L6Ir`~U?tq*6+c;1`EssJ077wPW|9^7 zLJdy{x%m>V*G~SMv({3<(oU_3&ARq$!V@b^Kd4Tvn5Zwy=afCE4}2)$lHEg<8(};X zC^pEH&L|=QN@fWZRwD#J$$-Ac$KaSwmsxEI)t1kf7Wf$$n|cX|t5%!>e-5DjC;o>a z`=-kAh`j)D&H4lL5nO-(A*7 z$MLf&)3CgXKrM&`4XpYX;smPT1TR}Zu%0v)LSA9Era)>?V<8%H=E3Mi&Sj6ZjprZs zw&Y`l`1JUm;8#1^(&lD1Z%A8g40fED!Zj4EcNg5VWAqPBquChKg3H?1w?Y=<$VirO ztblFJm5N0m_Ke$1{hs2w<&{%-M~<3SyI1XcZpw2r2MC-F#W!T5vJtU{k;E$SvLz8o zPg;idR9H%IG5p$voB`p9C-4S zTP+v;5UIHp5lC{rs3J`iiog)Bp0KCyoL48k6Q*KJogyXplQ3$(3H+^R@26>9mfn)u zw(Yw8*T_2e8y4b#rM7C1{7#}ZOzVTGF2suZ7zVxHAa&Hy)ovS0H*fJD1^u|-64%z{ zu7UOSRXtqyg8!D$BZ8DO?9G(zd4^cr?@7fWh?Pk&&vr?hu<;L_+4>mCh#c96!GEB+ zZFGizAWJX8Rs9ex&vFMOjUs3&_Y26VmlmY7&-S+xEPPA9L<4gVyUEHvCL{sam^Qyz z6Zqa`VT|dGeDG*4dvo>z{{=F7!^g1U8czdK%@N1@TY;v(SGfTp2;{x((7d9S$bH9W zNOW-R72BPFSkmNe<6i%JZ{f1nLV+Aakq57n^5h;}A;j^B0OXhl7N-u@uR~%nNdINg z5w*HI@R*?0z*mX3H69bZqR>^w!#{FeU&BUWo^z(kDps17t9*tm_m#eT&pDnqlr+Tj zMXV4scvc{Te&0r_?oygNLgWw&@b;6AzI!tK{gd%PF^8giPu$|*zM7TuI|`1gifi7i;`EIOgsyd$IT>B-ukeO5xerBm(`sD&BBSc02xGgX_L!2Eh`1ab zS@%V2dHyhyLgT`PA^^a+omKa+CHQ9cYLJirz2gV6LaToelh|Orfc&J&vqZc=i1rwY z*VBeSM#m;62=B<0plSb~u3YLuUweh`B|cD{;aXptpe~oVNl$s7B0v=RS4sVcElkCY zS@1Dxp~an2?f4vU)Ek9eHgHRB4*JZFD0_mRvgqDlDy)*U7^lE1@~%ydm}|$HMNP{p zcv&t_kj~MZ+rc(llEwqLIjQ~ya#oBpFffiGPL43upvK`Rn%3o;?f0g&?}ENH9fo{! zX?atEW(2K^6AK@I4eWYhTYGEm3(c4K>{0f8nrx|Ww4MP*e~>&W_pVo-&En**VBUa~ zlt-xhkA2{U;{#O`oKEC?1&ara!F2|6DIcrE=OtzcAT)~o1|2n;p&f|k= zJ>cVV#{DRXWqr^i`^hgIm5P50?dswL7l2WA21C^LYN)!B4ro!`7a84PEf)@(b^$fQ z&*>2isK&x}b4FJezhcTENR9mJd)_H4v7&zsTP^vY_5FwfD!nI`?J9$+cFv#~x^D$& z@EH68gKyN-9#2?3nHdlGL5cYo^;TO**?Pk+pNzz6lfn+ZAY^-g4*1!bS4OW6opcF; z+?&;wK#|=aeec;@Gex{Tnj(C|{}3ZDpYJLdKgHkw5Z&bU_w?5J3i9887X`?ccBvRN zMr7NKX@5azmoImP_!3Zr%{#Wh9IPt1Ao29g6is%X=W(>m5;}}2Fk}zg?#POU)(5jM z&zAY~QJy!{4u6)pJU9{fXkSWZ)_r%A4{dY2VW6&9@#7c!%vsb# zDEHH`(2A2l-XC&!x{!t@WZx#*rX+3vM)t%Pw@_%l@;|#X|2#Ltw_u@ZFQUxZm8y@B zWSI*tAqqFG7DPO`K+RR>`^#+d%}+7_>Ufyw^--r&r0Ycw@|wXf>N+_XUK??osuq)D z>{Wkmlj>*)3+?ynyQjJn0`wC8YDyG~nXIP)CuG*N+#nb?Ay%%;qOVbkrm|z2^c*h% zvBib=GQl-yNj1V=716!U!xqAO+qmg~Q_Oa>`DWj!?P4w;OgNgyzE)$PAITKYqN2rj z5Z3Cw>GjE9j7t^on=jD2&&Zcj4QCMfu2gk3;sPkd3;`D^HF%Z7!`5-M%++{kr-eEU zMU5-x4z3`$jhbC0n!A(3uO5p*b$)pZ#P#COSwG-jFr(;s2E!G5x%<-xSKb^_-J1u2j z-BIb?wtDh0ldl^7&aqNvqV8(k;2j(R4_A#qPuRq|c6zCIzspZ4)?x=D9$5Rvl6W>j zP9Hf9E?w5*V}Owg88~J0?QSLU{r!YA!>%5a!}U23epn2tT(w>5p~-4=^66{vtevic zG3aKeYIr2GOxr*5>Zw5KBm`)Se(&CUATrKs|4cWSQWit6Y*}^KrMBi}^TRfSfWqv7 zMevA&5KB3H8-HzoOYmy#QGM%26y7gLgH>>94=sQ%lV08vrx~3vXA*4!Iah!;`D8Ei zU`siRil-Z|?>2}{5OL;im{;!txCAgIPB89_5qu&u$Fho_m4EUSwC8ydg!V#fAByhz zyzP*Oo(1QtZ$Dc1D&XFg;Jd|eRGV}COuofjzPdwKy}Bnex`51fK<=_g?hi!wkm?bl zdY@@|7N>wUAFze=Yi=k8pa9m!c7>=B;P64my!ZV2rXLj(VN|EDf2Zfq-Ox^X_{Uvrn?`xP1N+Hj-Ij!Fr`2+`)z$120v?Qm1ZTsRafZ#%IUrZ=n-Wqn-`6)=XY5!u z8MiUm$0rJ?|nf)0PX^S0EwXItEc(7sv)etGQ2~UvH!j`E}e_XYSl95LKoSj zE9&J|i3>4xH8pQWs59#{S36z?y71&3olE{Y+~qK9GHrWXkD04nnFS`gETC<8iE!*M zj(WqgZ50h6eRH}X^n5r<9E1eAeP)SMk$E}-5Gq*$*GN%J)uX6?U8cI%&qp0Df2Pmn zWmeJ9BD0Aju;f2uC^6qvPqZqOe2d(ozdOc}6QmxxCMFHnc=>x8#8C`09(0NL_fJNWMv?eA|K4ASzzUy6U#4H5bghE zg{(VJBzpj=Wya3f01PGa_b8wYCXy(sb_1ZSLhGQNqCoon>fPxr@qokDHuL|?1d3VS zyPvHvz%?be0qCpbiLZarzvW)4nu%Ro7;`$0W#d{>&-omzhR(@gokh!J)o0ziA8U2g zjvyETI#J=b4eFG^`ivU%DSUYf%===p8OI02ssiIbg3^hMns4>q) zYo_)oc9m7BK0V2aOI^1&{_J;!e^UsmJrHfq^7M+E4B*MHj zZV6ugH>Na7xdK;V1vQ6k0knPn8?~*8xTLj|&5GRU>^V@P+N}&3dkgsz!Y-JMBP?Yb z78kp!``3xdBwT{g6W@?a?f4aE=6RVvrHLs_)UYBrxoJ^<|L5W&iJ8NqLLYL~0nP(= ziHs=Fd1L4{Ctrukl#C52Bz{{}_g`~KOT&r`W4auUBE{AhS1H?PNXh!Lsl8wS=G(l_ zid%RlAxab4%lN#19kMsmF_t$HKbu5aCD911X({P11!eq&6X;mQEBEa8<32`ouuqhQ zDbC8nZGK-7L&DmZy?6JpizEU+LzXwUks}Cy@!X@Sah(3Fwx9ZJLct_O8^%|$PbJS7 zRFN*FBVc5^ERQQItGG6CjM#gIcC*k2^efk{t3Ml0+=U_75iAtWu+GpCwj4fF=7BRF z?JN9*O%gY^Bvh{Ut54#Hq3^EyTVD28z6rJq6=Y3<=zxLau-D62B^3S_xY_385?UjM zpJvxqymiBkg_WVitC;;RH60fvOXJc7ZREdU?%D_e-zIPodm>T%LcKA=uSa#E8YZRK zk1Gb+YPi;-?UqaHDI&jWkNIIUJ0482$+ooe=Hu%Qj}1M2o`JQ{75Q=ukdJ#b?Dq1% zdEv5-GjrLZ@*~RBhmra+-Zhl!~E?vsKe@tF8Xx-8JdxUcTp9uSZ4*WC6`L|*+<#!s> zm$96Y&tB%Wd5ZqU4_Y5y;Vz2B@9br)E$hV}d{1(P8(0%a8eGp6oV(1PnE+b;2;Sr4 z_v$6KA}sBw=>8@vuE)FsaGQb)J{V<{(S!6H6b$d!Z$xKS{s6$VuTf$(7f6&mKBN~lr<9DPwVkeX4kbUYAZP*iaLO^hLLXg z&o?!`YiRoXo$7KBRq|GR|2k8qX^9GLDwal07Vyw1jX|2xwR-V)p$EEA~F z_v)8>J1x_PxbiDfOf9j9&qzE<8bb(wmO(>n|234u2n}}Cdo^`G{)xah4eejn-`AqY z_33=z(Dd$CpDyEI{|~CNF#uUnVOZ&W`Eb_?7g!?$w;_EV5K_VO22f1EGIO-jOh7AG zepK)6F3~#6&4tGU!0AroGKc-agq6l*8O{YDin9|OZOf}NOscJPn%nq_>lvAvnOEJ; zHfB~ZMyvFq=H-cS79D!Wz1@@jJgN0{UmQb)^ZS1DEocv*k#OOIsNw{^iwkM)R9ueh zsQ3ZhTZ;NPLjO0Arn+{Lww3yYuPi0bdHhQ_tInI@nNk`K?9b;Abyj{O@qY4<#%Lsd zd@*fjh`$aUi7#&mvG&RfCY4v_jXJzT|#+#HNQ5>c{ z2M)#G3zAbUpx}l0C~EgEg2H-|wR=9uQ@fM!@*-G2$7E4(fyY}!#x`Hjntv*oH2(zj z=;{39m-sYt#QGNdq>49RahuEhak%k*_^)oWVD!_&uNz<84$m6SkcY-9O_*#OCL@MK zQNCfQ#Fj-jNRUW3|8rfwk&?Gk@kT+)8_z+V=c-wruQ(VX_*zdiJdG2!K4S>oIy~L^ z6k36AxSihl{Nz?ku@)P^i=UVeFPj!J+DR-*6$s?9g(@`^Sx)pZEhVVeMT%Z1lf<7i zB%Pmxc!RQ7)Gzx|@@yDZnWlQ~q@$r~yb09(!!2(`Oo2#r5qa6(kI2n{SY=^Euq2nX zPMHPs9|mHGU0&qs&XVKwW9k#~hbQ$^y014S0-&Sjy4n~mm%bnBL|y)PUvJ9RLSATn z(#nVnd^ORhNX_%&d)yH|z|e(QLpx*i2foPILp3hK4%r8+mAI7&Oy8k9nQ2jnPE6(ZA9qEGYCx zRRrlRHA76Ztf6|ZrhVUY&l_pAF^QFPfg8F!kM(8Yku#~0 ztyoJ@q3YMMu^>n3HLMSZAb9r$)XfGT=T2p-ZpJ`Z#qylIP-&)nwW@Wd5zE0PRP_l4mCFZ_SEuMsQe`X$rMCwB$1PlMUNVtn2dnd0xf0-LaEYGaJavi_RBx;uLiul&;%s-C<50?a}IUu_6C zba4z_a189+V%DA}Cc-2UT_tQ+1UUzZe*gV4{lK4qdxu-fa&No7oi~4)6;czN^^=x? zggA0B!M)8)9r0Bl`2?GoWX7+^)ZD)ukk2ad(~4MCT9gvLc;aF7EkfG6;FBc-WBxqc zX3RM5z2RCLm$JhinRu&j4|AQZE*HbDIS-*Dx5zK_iSrI2P5C6{&YJ-%=;r|Zm=0YX zOGiJkPH`Pke%>a7sQk@HTki-0PS=e~W-iXDH9sf?hgMGa3+xEdyP0UP0;(cYQYgzd zuzV11E#u(lLs@TbyOUTq>{n~+?`1s@#4INTC!gP`kH@I|3sCKz$A=0))v)h+&*MIv ze>bNSx7eF`GF|>E5tQGYoqeK*>&MHZ`G>~>sWP%s=^I=PJ5FxO2r&)#)F&G4NVa6?8fo~@N+8&RoBNBe%&r%wx?~V}pd``%9cAo1qE`7hLwD^UY zku6zaR$3d6Dt6*>o0M9r2R$~-ELdv`?a!z0mSJPzrViW%H}dQA`U(>EC~TaJNqj^> zjywh&%6Y2@m74%vCsWHG@}KNF62nN>^Xpq(8 zPj7^r-noKW&hsqqC%mzd=JGTB+;k0ZmFgu+-w&cc+fk$RY~IcmuV|al#D@*V!0fxI z(jpWNZ3Mgb@i}bkHl27~{m#QT2J(0vf+72EI9F$;Mg95ce;m(wCiSK|$l<%dVC-1n zE~2k}8EPb^>tZhwjtTRcWpbZa(f(^sroq~!eEPdvB6eu^yrA+w<$Q4GlY`-sw%XvK zy!;L`A1HLYG>YK(_g9GzUmKgH_SEvlCNA)cbX!SOxphxgntn*ih4}<>H!6xl_aWtR zQ4UI>KGWA0b(M0;eCoSAF6)}VZ3IbUfU}AVI+L$J;TT2uhNs%M2zahkMd{~=KQeT4 zL3l8_C5s0{az$<=LnD(d#@v6|Q8~kba}P+?Xj>f-XDks?{ka11wJ?2Je3BRXxTnQ`wOoe`DXnZuh|9?zeB8TyHmtXxOKT5fc;2amhf z=wN4oLO?3=Ustj%#g6~{S%A#+z3g&yv{Jq<`6p%{J?ny$0)^MMvG@eTv0P{})3Ee< zj*@PBT8m~tYif_5(cVezd~wwvMCO<{x*Jac@O8*_T6$IeAYF=m4temgLp|{9(uP{me+R@pC zvL|O*pXQoj$HFse{paJy$iJa#UTK}GDhi?R!4&L>q~ld8h~Bm30tQ76w>QVX*h(n9 z?CY7j1aq2h$V*^SG4UDe4RsL^c^+A$=oj|3VZVv6i**|uv6u^MuE6_I7=j-&$H42x zzyL@^#Pn)zv&^?~vw0^7y(gjL<<@*ai-UM-*;TmZqv~eRm=aNkI8NWlF8HK0yAM(k zfS8Dwc(U)ZM;VEjXt;j!m>k$<7h?;CE6jv?Ge6qxNm(b8Seq-&*&CdoDDM^G&^O_{ zjzp6*n?uuMpM=ePUH(^uhh_5r|0 zb;8=wE20J6J5=1v5=DOOnxf8u zO{}1V#Sl5h?%HizPWQE2_d}{R{;rlD2@ywsT!l%d49-gaWQ?U_2o-6YBpc7ks=^P+ zamAonMav3nzQZxhcMYtRoJKRD1a|p!t)@yVL~W?W0(?bG!q!=pF>|x8tc-uCSsDC^ z#ddTS&?1$?PGoVOUZUYK*YN9Ih>(5gv+sMDXNgN}z6y?JOW8)%J79X^kJ z8ArF$oRiUZxFJDUI|sg8t0U$nqFNK^JT2%e{}^eevC#ITu1fCWz9d9D3MeEIDPbF0 znW($%`V@NdG4^+rqG~70e8)kHvxs|(DMh_YVY1oZ+kzd*4A+!b+)g><^D4)qEjTRJ z7M(1EIHqjOXnPqp4kYpxZ*OZBz69Ueys&mo-NI+3Gpb zS9$qB%oYM93#n%N8$iEW2LqE)7}`7_m0tJJ!T6|e$zNMIYTmmY;C)tm1ra@6x+tH{ zH+eU#)Xy`0IRh(YhnZLEw|9ZaQ9BOf-FsSs4TVZ$vvhgW>(@ zbN)H|4}lqW0u{!(jV8Lygt9g=G4x%j24n@v8g<4JtG+f>1kOM8NSS~bi;9`2|^zLQSW|8wKc$I)3sQW5>hqNxgN zAU16F;PnK!Mm^~vrEsMn$99j|Lo7_vI?WjrqocehWzr~VD~IEdyr1?mT!(cj$MbT- zUe?yj;bU)kNRZ+q6%CMJKqcfV%5@~7hyB}4QO1nQBK>}D&88ro?`vQRuuSf~ zx*uxxW@yB2@4f`UTUKt6x`HI^B%9c?kj^R8AWT03qc0qpBGa@2*x$N~{uy9aGi2gK zsy)!Y>*}^tV;Djun>&Z6B!v}jvIww+#*B<8?-|pZ_&zb3amxJmkC2o2Ie@zxm_Tyh zypqwty!qXt@uw`0fbj%p1ZKNWe|UyI)_F%gOa0W|3s$j&D>xB! zM40=RxKlR57iV}UY$P<<5q+)_DuozFxF0Il>`s7x3~BbcbG+QDH}7Np=Km*vHbh}f z)?n?c#o7xXByicsDJ8jiR)d*&4g<|7qRD<;B6~ICqTqshw^uo<@h9>7P(cBTr>V=5 zG|T!t_e|sgZaKNVe4NcfDCft{KjLk_?uv{>b3e4!&s&v!%l^w-Tn}ah67AL+HHK=J z-=oCvG}1QObM&Dh)^R3@Bp9(cd=+m@t4*pWGsjPX87(hYVG6h~7 z*I-?hu0sMPUqDI$wiPijUB8tBI zT5xI=1Z#02X_R}B%ZqVo#r(yW_jIf^X_P0vh=ymKI|NwyfpN6c=|!%%$Gb1uP(QDF z|I^6_MsO=%xQ&%Z*;P47JCS9sW{B70LQE;nXj@L&<#N^?w4GB*+~^|H-_@$r8F!ZC zxo1#HjvNP&^lpTTG!F1-3`@G&@WrIgc!<4h-sIi0tupW&&&?8pTtjiDm9vtjv<22 z=mhw_g8!&l-F2pHXXMTGw3r!2bWqi0BD3|fq2slU5j;_BEi>cH6ScXzZZUlo=n5s*k0p z%*-K^U@qQ!G*dMbb|s=6Bawtxvfp@s?G=`|UJ_c^-_QhoS+OA=-c#^JjF&|S z@(3MXIUb|1&5rjKac>W_mK?bp@Z}V1e4kR*o~^waxr9bTy*s31w9#QDS2G(0_=RrX zNJ?5e3mQ`~so3w;B?rG!yl^k`GQ#{a=bN8$Y^&pnN&g38L6RrbUd$g>nC_X&TfB>2 zY$s8#L6o7AVp4(ndqfRVr?r#0t3^ODo^APK8qC($D3=${Z4-+l=P=1@5S3!W;g%13 zEKrvs&uv`XK(5Z)9!?I?%y?x5yc_KsjrqkQkZd5X^nK|ARY@6kZ9T53Lo?dvwJ$Wh z216qX$#y@4{?>n&W0bYtqcx!7sLLuueF;~;WN@2boH=2hnT!U+` zp@k%S$ug7lk4c3RDU>wRUaA!Ac1ynMUctg-y*TXW9;b`RRg?DOdm~Jz0BKlV5}_HN z@#olRPl#R|XHYFTvgSaFBa|tG;8&UtNktFc6q&Y)1+ra&1_X>tqK!D)pNY1Ub@o3{)#{U36&3z=Ltzfl(nuh& zYx3t*cS(5t@V&W|n@EoNC32e(8&{^GO(gy4F2P_U#~5~5>KYJn(MGuc(79N5L9Ufy z{duKPqjc3STA#9NX`Gvhm(RT$sI0?Dl1#z^P5Hh>f^N3f@C8-YmkD2RyO`HX|LVF?coozvhPEMp1}ygVdeMT zCq>`uXU|)A@L2~h@>Dg}8;Z9$BGo0uJI7qk^X1xB;Aqo#SEWS1#h!NzhWk$uS zGrx=N@!nma2sJSWIG`%pg-G1)F%gEXcsN*bi6y5NIfm^!$f9ky>jpOm!Lz2Gft5L5 z#9rizwKL*7U5DssoG2MY8DO8~Cul@nloMwtpU9WJ@BgQe@!RAn1|!82lt}?b}S;cAW_Hd4sCPeM)NJ*YzA*xL*U`eINmiJ1k@GuuPQ$8KH^rypPYVi&kV*$-BhFz^RzNOn`6vdUHuMLK#B;oi%mi{7+&y@ z1T&i{xN2igHdB+ERgmz|=_^LEDQbes)wLRFn3%oiWF<#VS5*Ao$-ozQ{B7XhQCN4X zYg=y?`k4v{fL|;zZ&UdjI3x=Hef#pRf;y~(<$H3b&d(8CN_Mi3*dZiZHbP&-{?5q@ zs+zm(3LJ63Cwcs7&Pz?qO;?2~?~2~YaI(heU?;&QC8Deda%sYnc{rjx_!9?bLU zV^VR0$Z~l>Up07ysG6_18{)>!Mjs)j_b>-oRl?Rg6u|CXJu&yZ^_am8cF!Es2L};1 z#n-f0WRa12Y(v!UedM+})g)i{UNUeKVW58}_$u`;=OprBpXZTfK0ahX;GfPx5e`TV z&rg4=4O5|vA$-7sp9=L)1S;XnOMiZ$l(k`_Zi8$F)n10D{h zml1^)i7miETLMvgN+5ru1re=4X4Y7AUu?;ZDL6}zSFWt@!rg{1 zxNA%^oo@_BE&;5>f7en7rDW~PSIwbtH!plU4hSt))=YgOL=6%1{Y`7sD%8CH?OQeHFtmzCM^r#1zWEk;yvMOw3Zw``_M5cDgEX3`v$HDj!cmbW0q z%BBbrb}qVdN<0{xGikiOujL=15^glk8UYJCwEf2Zjz%!F0?sEjtgy;>H3Y7-a%49;wnOWezD8~UA@;b3t;55E-(hXN;~1+z{Yxu2%= zgo-u=$7wos#!3vLT$%hCk4rdvxsuMLdvgTVef8-`iW$w8qc_%d^`|bmWlV2}I)fouFT!sslTC247sXmK zQ}g8S?pDO4s7D57R0D{RG>yy_0aG2vj7CJo*rejQ=@8OUx41}^&eJ&Sw_m=Oi>vMJ zAD1iL=yKu(>n8ilUEMyVB!b3H=3EPhCRy1sIer|7+$pmDSrM0j)I`G)>V!`of5ry3 zPK{^ByWYjkzk%ggQLapu_s}->YV*22TqkwQR_ECQ!Uq7B zT7N`5?KyXKDi8sDb3Of4)^dIWSNg3MJlfjQ>!q=$KiFl7g_NAU61I&FxifLu@$?~% zI_R+5s+v4uU*K~S31nb|^A6kHtS}ERlS82skGJe+_WV(g#;A3dkrm5m|M$!8gB+Ikw^PVK1vY!NWyjor3c5vQdON@ zazYFk%iJ@WhDg&~(1)0rgBQhNN`;!9HSjBlUvs#{4lrIh-npOFeM`<}3giP7x;DTz zZ}F|%5u(MQs=;OOWuW!R{SRCkIV_3SYx}kF>M^z|B>FrqF-lcZQ6o$ZID?y|BU#3j@D* zTRcRiECPJT`inkEVlt;l5u6(Sqp?J<-0>M0tYm8VEvN+fjTe3k-~a1Kv0x5#zHxbL z#QHqECtzDWvePBxD)!r)Q`6dcAiU(INTbi*74Y?qZ205ZrgZf^9=AFx%Lu99T zhvy4(PQP`8QkVmNmdWeQ^~)MI(|j*zwOF5G_I&EKrV#0c@)wtV-Wf1Vl4^w@Nz@mK z7GxHma|c*tbE_H!-1C^+Ye|5a;WdFn+x7RkLSq#~+e@xie}1o=8;Ga%O#N1fQRnRG z0%oIZD#)h!M-Me4A7tCR6G9|nND#4)MlmJ^TFIDk)fGmb{6Lpi|JmK=<{We7|NW@OM@QeTe~e&TR$$QLk9L28MAb zwPdASeI3?J!^A3lZY75^|AMhk?-z5MROMdYvGqVK+V4B(oN+*4Od6Y5(_vm92a!sb zJ2F?5qx$uEEkY~cu?<`Ax0FWB6JbOz!p6@xPuR0F3Tr<9h<|(-KF4>tK3#n)OcTOo z7BSZM-ljo^Roe<|K(~lN#6d^6mw%{Jc3jx+!so!i`~jb9KKAU8qd_k6VvS8?0k#8` zzr7Ljc&t@nV&)^n*|T%{^QZ-A+Yqovi)j9GSC8?1NyfxgHx>qmxdc*W6j=-odTgoT9@z3F|!iW_0b2f*$?vLn>zC z+G_ZdE7wbOMv!z&bsblEV54r?_((}%`POE*@63jANXdLK%7 z^mouXWY*q#Aq-&T`U+5HYYM5zx^tm&+ z5d#%?SBoVz#))N`x~Ei+hhA+5Vfe>4&K*o}@YBJb+>=o@qKVcVf>n@6Af??rX}JAT z)~3lF34wx+t@S9AX?fgpUokNY5~)XwIFWr4YX~c!+&u3Hbni(_6tB|BZHAu@LGBR` ze17)s$&ze`ru= zdbwWj#P-XS_l$86iBxhk;To|6dnpT>;rFI@?iL?-zZEF)0^=wA{(+5H9G4#TdGVD( z6TtmVrO>(XdccG79X~5@y9GVTFD}=4JZ^Ta7CoJ@2gHZ}@}@m*P6dIOQk-iHKAw&* zD?N2C~rXt3?mC>Mk@T9F5)kHcBf4M}zMI#@`484pcx+e?c*xwu_UK z{V%UgbQ&jdSuBfU_xOS++)j_j+Pl>fU+K7~nCIG!l^2ctF3~Jx5TfFCKp8hMeHh4k z(7j}Y0K4xo&fvMi&W{8qtv86-RxFECNFFoxZk4F5wErkiqd_Hj2!>&&nVMyqUF28} zNe<0(NrlPuXumXgF8z6@nide4_6FzSVA-VpEcdMADGY!3TP1`EE_SzXM}sN~TZu!L z$)&W;j^8&@lftx9zSK-|-@&KTuZZYg^5}xvkfU_=^t$(AMk;drhv8@ z=49}CyLrk5SiD&Bw-6!s02+2I4mT=oh1Mt09Q;Ho|5g91Z&yohn-d%}I4iFA!u`^_08}hPH@fQA zL`|Pt=5y-q^V`xVx>Hw}` z#V4`15r_OOt|u)7&6YG@j#A&Qkdt}=s}7Y-&l3(1_%G5noUC{TY%X*G*}`jX5+y(I%eYge*ym^M#x{gh z_Q5a&##My?n^wa7Ty{%(WmHPqNQquKW|FxGT7mKq>M~Mm9reUlr(~}Tb7mTHa3)~{ zMX@f1RFoiLPkH=n><74^^Fq_}k|E^c7j$tKCCkvSVtwVPY6{>Djkk(iEP}O;WN3GP z>NEJrfrFAyqAMH5lL%iNd3urfH*U&%cd6xy7bIN2jp6RF23$?fKDacUIFa=U?1@#^ zH&5T6d<-`qPo_zV?QL*JvggK${GJu8bKuK}di5xpNDv`L5NY*xboy_jC#B8E!l{UO zK|TD5^3Utl=ifjjY!~OhIOYs#<=*^lUce;^6>v|yy+rkPUWK3Iel{@mj+Hf6RCx1h zI~BpeKyQyR{*i7-oT4OC`|+e_akXVRhmY4L7Xi*1=MjNQ6o>Y4V?V1KT^@(iq{c@z z_v&vLL2Hu&=MF>TqONBs))PNuRD2XJUbr)>{ zNBhSrZ^oVHH)nQx^Oh?dY;tcEg@EeQP(u_>-`G~x) zf1xQHn5J!fj(_@1Weo0S`{RqU`bkyH=lNnU_w{@rdozx0YJ{DUuydx*+fD%Q@0uN*o*+v_9# zoA+f;$B`+L@bQ?*GfMvx({_6JEOf*c4o%$4do|zT7CduEJwHaQN+D0fCBIdGN(bi0 zN@OAul-r$?MWoW~Ty~jcoOLmL0&apO1NwYny-QWldfM8%^0tFYP6qQ#I@32VrilU7 zfaB@n-1V{mxe*&R1KCKeH#w?N5LkkBs>aCjYrT@=36Eezl;J(cm*&~pZw|9i1R&lg zJ!%I&FxB2wuEV##D{fL<$BW-w$gAeOn(xBwydM5nv{V;tKxVzSWl@gH%CMd7MH&hU z9XO_QT}A)hx{=QPM(fMNxt!0OjZ#fOP+m{_olQ*P<4155Q^=2j><$d$YmN!}#`~4cfcEgp4}wh& z&-ORr;gAEy)F`v##L5fS+U-2QjSJqaT7K+&*@mfcr9I2?<<6XV4NRK76BQsyBO&=~ z2myUay6z*Fi>TXmBBRt0FNV&rIKsc5H{zciJ!i2(V1N+|^3WguZ)azsk0a8mxvQC; zAtM8h3&V~_7LKjdTSj+3cS+HaBo)wi6Un(bl688OVhAv6CH#Fo6U0CFY;K;J1el#a zn_N`@w#B!*g9LE~M!&Rwc)8qj@`Tb;7aM4S5w3Hn;tp-@V!k$$P=(_9Br0LwD&S68w_?R_Svb&_ zIq-R@(!I7=-1k1x_U=nIBSdV32Q=lUF;X62cFUcjL*0q|b!P=9mHZebv;`*+0o_~n zBbqM~RdHy%aGs5Kqx-Q}f*`KfRrTq4?i0wXFX-h2+~Y|zTz zD~LmAO9w>9ztK~Mx;&l1yEGnCDA%{fMDBm`s^(>!U{aUk@ouA(DsU;2$s8dQCg4`= z6;)VtAng?B6caG1P_83lEhkdhVG+EE=hZjr7Z3ma!bC(RbDkeo2XrD_tnT>9C~nyG z14sW()9bWtH>0>Tn$#>JFGj$RHDQL`RIsXWoe6*H!;JN7^=N#M#55=|*hj^Bm`a z7aVp{`M27#|MPml-KMgOFEMCi?(PxTO^a!Vb^TMg0B=3dsXp$rW(KW#^nhPvTD=Ot1J09rVZ*~3ea_uu|tw1vLJpA-81l}Uvslt9f26&tyXxv_FK8z6fO=bU2>2MI} z%y0eS^Sm*lpf~*tej(g+MD8NO-#HIFpRX#qib12-yQoCPCH+~#Sn{zONyayfle-iY{?@VCDE-4NAWk;r^`gubl>u1iT&c*yJFQ$8$z{I*NYh1F*~AC@!XR?m zw_>@^4UXu-ae-vzzez66xR}g{+q*h zI;}rj$ncoImtfU4zvP*J*9dlr!FHd82a7f79E`9mwv>QMP#jY1jkRc!rog`?t&=rq zF}Oa9IbXX49Ie$o9Z~sjES|NJz^k{Uj?c{w7G3CIt+^Ik0&FLMbQ!T|Gaf!raA>Ht<1@JFqKp+>Ke#X^y48 zzU$~uB+y3bUjIUApJHGK^x|1-dpG`h0mNL|g2vo+PXmIWZ(tS39D#yFLE7K~>%HLiP z3fD`_bFV#Zdz~kx-Q&l}Ufyg$$Ic#AR($qyI4N!BxnGoTBn^@!ycMrX%6(3W=;O{2 zbVW8Ojz8&*B;FTu$@bj~lBWtF`AeRS7?+QK+y0r(_u|OE&>|6p)L9{bd+rWg?L4#r zoM8cG49(-5h%UzHoJSw-@)XlIg>2#jC?5BzHs?=zptiSyVwa=3o6CW)w9l9SY(HP` ztFO2XvwQFV!IT=E9&fF&E*gn_X4D!7e;}3JQKfT-xO<|z(duy(l(k~(Ai1|mP_FDkwgOd z3%AD!;OfhY``xPlHlD7zkkdJIn^8UWm0Z5qY4gJ==Y8vW5^A~Y^~qlUY9oxm#cG#O zT8}2AUe2JR@PhmIMfvyIIUK5AxQRO!e2Vl*vd&tST=sg__7l8A6ovIkPlLcn@&ySb_$1DJb5M(d#IX>+O{3zxFdp>RzO;TGvz}>Q}fA~ zKm$QbN^PHtKrqe1QnU>|R@5_j6&sr}yWYUsZ!yLk=hvHYpP|)xz5>c)*>&@)@HeJR z`u7%=iQbDx&d)D0vp>MlSOBv#q|XGMbP56&@gS%V$OY{jLdReQ1Zi0#1qFa!j6cJv zgYL%juHuo}@H!!&&*B3@e^y2kds19<>(x(x~>?c}7ZxG)8s z3xEVc;*rS`&-_8yrN3?&`e>1ST(xcIu*#`B{`s6e%HIXb5+{tukE?d%0`So0Q%+r? zhNfy$cWAWYDcSe~m;rU(6cCMjD;kBcj~iVWR5IGypdbSBGEz%FVHk^!cBnj+vZZtV z+6{MIhGZ%~(zG=bH93s^)+pvWF|G`<8s&^`LJ8r#+;VA3~nOD?5Xw z=|q6_%8eq+fX5Tt+`cjS_3$FQbG&)y4YKD!Q=nhKs5LnL=>Z6KY5IbqJZ-j@4+)3( zUcQclX9Rd72>20C;Q~`fZTDO+R{Y=J&znYXmbu)=zeMOT%5A9-mQ*&VR7LP_PA7dfeg zR1-7G=43xH{1J8!yj=wa9$C297(JX-x_QwL-wAaz38W`2d###7Bd zxCn(k3B2(;Ar^1#c5b;UY+#6g1I!DDo>ZhCIRn#M?;#PU4>ko^o;Vx$ck35x;;2FY z!3I}QCC0hp!0!8E?HJu@Fgf}KL>>lI4dshnDmEr;baKe~iU}5U^ zSOIufLYpBz7-a@q%Ym1~&kfZeW(zqW0e;uld&zIfgFe^Nj2r@) z^!Kxt990(pcGn|()`qw^;;2^m@dpC;1$Ey0F13p<8^zLjQ;;L8<{{_YIbv{XnijC6v`P@$T|;`C0sSOhoL@q1eN^`&o{1s}*~y0NXdGMLl%3 z<&S!_ub7hmS-XBU{)(d_9h^GjM1&mqeJUAMs#a=<@={8gLf}0CS9Ne039_G#8-erNeyr-P#r0bvMpNZdoCfi$L^##Mb6ibT~&ivw2(uvUexkR}GYW08hRx zz^mqO)E0>KUF!%lCN~hq&#|7EBcTP5|qZ zlfn2K?I(_H3*pOI9|aebbmfEmL`^!XjxddXDgk_r57NTVr4rk@aSL}o2W>|4fU`G? zQNt&W;yf{8<>>{3`GKU`y`=9san?9BwY;#W+DZ*RPwZNoz@(%_%@31n(p==fYHP!9 zZ=E?HTT#jD52(mCpV+X&DsYYGaSfN8(|)#!aL^#wJY}5pQiO`AJ*ia%sP$tggwwxj z1%QyBIM{Aeq2rbV#H$F}>F&$T2rY4STofj+Om|l$%v{ zAm6ZYh82z+i2;(}1Os$A+K>rU!s%Yb26J5zj%P2TvXwZAFlE2;j5=(I6%za}mjDx( zpcn3`!1}rPvuY=?AsJ~H++o82{OCCL6K5%dZ1YEfhh=;NbG;5c=fe*L#M`~^@H_Ib z2@!R(1KF9|%!WRptMf|?4@*m$Y7mLgGB}0zDvhc7h`jL#8S(|HBL%oRvcLP&GK^`R zT$YtzY}u&3h`dB1l&?P|i;VoSMuj1q9suP$QMo>nG?9|dJ@Fj+%c=q3e+Qk1vh_!Y z!J@*c>v>fLsx!j;__A9zpm*m7`zMT@9A>2FJ(I81c#u9w;X98bcmG5eB5Yca{nw6$ zsy)t$dorOPl>bPjpFnd+5hA7t%|rU8>7Du zk6;SwfTZ7gr}@=mWFbAk2oCThIJ>jAi+0YwwKG^E3NYV}%pAgQ7K!uF)|ywM{IyyQ z@4vE=^&Bl(3m-u%v>Md&V*L1|kJc}U(Gj>|E$XfN|awz*v~Qz6CSW~Q8?jG3Q(%ssxt4fa_d1!8bxE`-r}<0`L4=?jN?` zLoS1!xjdB--2=G!-yXuS&L*WombQcpey&&D*G>Rl%HfNqT8{-h6k znNCGg+&wAgH7A2#`Xa#raC!wB7$1)hrF^sF*p}RlkAigXE`6ta_3y*pjDYp(vKZ4r zl)MP{5!`;Q`m}O)u-tE16V6t5wxrm2ut$+b4UBR%iB9w%Pmlf3jz0ekLmq28+7r2e z;ap_Hm{rzczU6s)BdT40jI&|w&%@ECEeX;OeuM7T=kPzPpB$`0R7@uwo?EV-LE9{W$LZWmj;`^U%DgC7c)lH9>Q{?k`q4jzekYNuc)+rW=v zU_SoOk++Dm5eG_|VgHeO+WPG+Op7-6^N;&3wwAQW<1jsOfzl2?=A; zX-TRvvl^<{3cofPQ8-I8IxZ;?6j={$Gy3j-bdSc3H(*0_(!oShI!eA~y@Grbap~2+S_Oh8c5k?&0cT|Q@4Xd} zp8BD_mx+bleY||X<3C-+9w{=)o(>T9{)co$&7zEdTQk5I4P2%n$>Ni#0xcSHng#rTSXKT`J5w_4Y`?z z20TGY2pIOp?0vrA^NZKWZg=8ZVBn=B{DrCGdhHJ9#Y1H~y~~4L3OOe-&&$`MzRA|Z zsj;kB4|{pK(XAau%(E`v6J0kx2`HcZUf0|6ASnyQArrD1dN;;tsHZ3RLsd~xvHOZa zF_i!p-Ey3fNAY?)u5pQjZ10~qo&3<37#FXqhTQLX;&WO$1MXv`E}3%yz864sr5hV5 z5qgxr@{w3ORBx`MD03((Ii>126sL-g(D4V^$HB)8zBi>9A`4LH*w<-L%6ag>=^6RW z+d$hcJB1p|bly+)(OiCO)*)ZzxhFmczQZs6PZs5I!o5jJNa!71oSfd==<(XVy!=af zlguG#DDtFKFXD8|#~}z{Edz}L=NhwF9-cQzsk?nUZiKjD>D&R>c6KIT-k;JEsb~KE zG|Nd|64X2;(!we*T_&rf2$iM@CO~Z58KU%+P?4IUg+mRX4xt~-S4byliAaAL5X_Zo zt%wB`;UL7!YQi&~_Qa#<{Y;`ae*VfpQl(`VAJOESKPZ8S5H~A?_8maY?I8+2m6-25 znZ*iW3*o{HQ%3IMQqWEImNey}4I#*6uP#(V)M9I)J#;LtEZC5wDPu$sm0A0mTSm@K zeeS&Qd?j0G?YsGvNdCs{FBihhS(P-pBSHZAOj9>lX1s^p0jQpvz-#M6IOR;J_*Wi( zoMi6x&`a+pbZclsFu?h<+uU4B@A6f04KGXE`L4N6MLJf0{MEK1Uk5xk3p(5LOuYPj z6*ui1c6OLXRW9mfe*E4qrJFY;^kLFWd28!34^I@NMUF^w z`8BFkGNo|`B~=%(Ola&cixki)yF(9Dr(O5N?<^F>IyT-I7Jm z*VmT~wb}D%F8z>~u*CNq+`P409OiGVjc?*J^>13e?Inkig0HWTVk(>Y!|e&yzp}zY zw7kkZ5C$?5HV)3g!2#KyZ(Yu6~<;?1dQbw%xi zp4+Vy$Yw<38|O%-VnBdsb91wYhX-!cbGK>fV@*d8E!@*ZU}7-=>M5R$?D>0-3TqIo zi+EOEn-R0S)76o@%53G6lau_njTJXPMmW>i!DRm|06CQbYsGPTQMy<}xFS`8ONpA` zSJh{1BmmU7+;?pksukE0v*Z-}TCDuFq>qojmTo(fydef#aE!N6OJdIEB)eg$QOlp` zxV51DeJr9FJ*jzAjjw+k{@KC?2G4_o%$TH1xukSWF{K60G3Y{+vm_P}PP7|)kw} z)u_}N-oYA>{~WM-iRq6+|AWq#Gof&b4JsfQK;n>uwLF$Y`=bmM|HI(_Wv^KwO&AJ6 z6$`}%o{*s~8}CTEBJdUCF#G+VyR*U%&ZG6nFI&Z%_P|e8vyn2 zNjQdfnoPcbO)M3~!9Ls@U(Gr5p2JOP;fILC@)s|ZZPu?92K8VQ&slB9#Tv9}K5kq( zx$dMV)1nVWJhsf{&xss5F;##_f@4R#yvQJhbE_t?dh0xXXiI*Hl#30cQ?5Pcn zw%GFsyUGyqWa*EmqLK(KQpp)g>?-Yvss_(_VokbZT~VkudPXSyBQ6Xmf;RAg10n0L}M z@qUHl&2lON*mYGgD-FK{g4Ix$Q<1r^kvEDMWNlp(5Z%sa|3iLX36&Io9Z_h2c>*}F z-TYaOcu0N@Qz2acfYMb`)2}-7Ofhm8_N>bqh05x~4mCdMFJIv2r@p`2i1or+`0tb1 z7>zz$lE@*c+22c%JYH!(W41?2?yiYTCgz8Jkx~K#qhbCuLSME3*Qh2aG4G)Acaeo3 z9919ezI3=e{|d5r4Z60tr1)`bz?$0Q@T7Nd|bjHGz3u^p0L3wEd}$sv4C%DYkEF3>;QQkW_N-D zpsH#Me}vUFG$f^^$(!W*8V3Xfv|Wt}bKl@-LAf(Z3cvmhYqYkpLC1LUc1QQQ`Bmh` zifT?DB0nMRrAk$+n)L$n2(?qBEeidE_uQ_Ruua_Z4pY|A_X%MKk<(L^`8+UH}LvK`^f`Q01LHXW6LE8N=&b5=hhg}2`beT;{2eKk|J1&VVXf6zrb9A5}z46nAPHEAvqHO_Jp8C#T@7ptz zYTxAd{{EP~oGH;Q7U0##?dt5n%@yP?+y4n%sG@hwlZMQk#)>xw9`w{E2W~Te{smm^jjK{ymeRg< zWY=%==9p^m*}n0b;ER358ztxu6;xKP@LoZO!9GAyB>nA7GBZ`wOga)6Y{z%J-63dKvuz=`KPb&qhpLysy|!d|S{c^HHpKHZ zb6P7;?s>fMP&?~(DlW?Le`vbuuqxW84G7X8AOcc?QqtWaof6V;=x*s=knZjV=|(yZ zNH@~m-QD%=`@631ud@q#_Q2VBX6C-q^l2UV;Y= zYClX@{88Mdc2o{DqB?-n!e4eC&0TQHl6bDtfO%rpBn>AXI*p<$f!tClQ@hGC$z6{# zhx;;4(;)F+*$LYZCDMn*RMBhI!#sOeoqug$dQZft{WJ4|pqJLybXeJVovP!J5|fDQ z6O2hShCLS(@6NM*s~&K^QYrMQLw5Gt$2{^&-#3U`IP!eV=k1~bz4&Fd-FgA)afjY= zqV!BYN$n8U5i)ID6;xbg-iA7LsOrC~iv~nSd1h>#wsYymbLrI7)V<^59#ZtrqZzzO zVEHwu$zgZn_Oa>Z;gE(w)!*S@s@PwcjE@A1cQiqYp3Pis_5XNuKj{{(nyN2zp8T->c)X6-@6A z>|&L^pL&aPdAcCr9q!33oph-g7n7K%onda~+II3BQ#EkO*gASNKe>N=Z3s?WC*|uM zCJ;+b97zM}uD6U#V-qq)ri$++Y1~};bTEjxLRU$*25BolPQI$wAj+!OcW-i-9iD(O zR~Spn?4x=;xh6J}KY1e?dV@@t;oj9-@CRoM;5W&h`Me@_!RpfLs-)|E z-nZ`025x1vNpAR9&H@CI)~}`tLEl;mq7db;&TeOa(i86xC4grf}lVB5{|ifvS>t~OXFP;o~(j}TmLFU z9UYxA*-=TmmWNUAR|VQ~pqzMX+eA@4y6?qL0x76d68^89zng=6-k(y$5KuOhyJ0ljsykll9g4-HLw#Sq~7pu>4_YRDdX%V)ehl0pS(h05MWZBbwL^8loW^nEgok$N(z@*ZpO!4qzbAeZKJ3hT~e<`Q?Wgf$gzL2;|8J11_&j($Kkiuxtr*loMp&^v7$%t+BJX>SxuaThr3*|L7mn zLe#-fHV~aNC$e8yDbH*w*d-SGbdN&M&3#fzeqg=!}usHLZ5^{;*3wx+9^hMRxjvIDHyP*!S|FR<3Ex zs8ug(HUg~GlGhz~=Fe}Xp;t2*wq7LIa&#{wj16tz{8{Mk3_$HEQ7P?xBI8PN;3C-- zbVHj2;@{XD9}^=toTtBzA>-;kVvL|KA_oZ5rE(`waX!b2u@+vO@UqjT7EcxI1RfI! zcqWSkVK4(a$n1c79D4f;CWqBr2k<-#!&#dvE-c z#Rg2D6joFF=j++1yH~u(-|f#U9)k_q>RbW0H^jNmqMUMaR8{n0oxk`npa2>~ElF;u zW?*38%gC<&V7!&54kp9wT*9k=W=<8wMC)6xzevqF`g(Q9 zBI+3gNg5)JrOK$k*%Rw(+31WmvK(_w+4Tc- ze`JY{?Fp&NkB-;KOM#>3IBj>W40J=iwG=i<-wXOa87y!Oz-J!>h{=YfqsdFBeDupK z%AH`zD{|~k5RJ&4@GQ-*rCW0F%mx%q;L-AB#ST56p-mPeg1N1_4R2gP8ZssD!dvcJ z0NJTch2|yNS2{PB@z4mys2hAD>I?GR>-LAS`Io$9x|Fm=hSk_60%im{PB|K!$0)}L znGZ&r6^2Cnil}nC1yVXTmin)#RIbPLc>Guc3jj|?)2=AjgkenDTg1mtYQRF3rSdch zQGE8GTX!By^Rb}f77cM7$8J2B6=X)*3`t-uzE!^YEktld>$}<$u?@HL+x`>AIo#Rf z8zQa`qO;Rtc17=uev*K`(=XP11z(@A^yAH=hfO@NRHD>>yJBDWH2CIg-d-!*KUMbOGIaT^5D~5@%?A(FMxNp=F(5YeA!F%&7>PHHhF@$)y zgv`Xi*FBHVH)A^LJVL$;Zi|{Ij9MAd2n3aSJ@Iq|vdOEytgp0{?P516s6`O3eV^HF zYJI9aA8zT{91$RhYd78Dt+m6$e&HW5ua=#Zr9r!&`k`f{qr-uh?t;P2XuIp`K#Ql! zunS}X39<96DLm|1B0;JBqoWA`VbkDi?YCGyeBMm?PMBVCs|e6Zg{fSOZl;V6k|llcpf*^T zsG0I)fW!%Z%B$;0e>M}ICPmfaFc;v2le}z}y!@D45HV)GhMB6K$nxSBP14{iGdtBN zKBz+N^U_m$-HAZ)`MzDqSmGc6Rl2t(*#(UESsZHR_lG+r>;pX(e_%;1QgYkBVU>L< znfi-5-UpbEdu2t{%Qb3(lQg7kL0b<1uN3^gt)6}s@#Ca}d3yGEKN8m%!lH(2;FWuT zE5 z$aFzca*E`lJDy1aWlbaC`B|8Z``|u9;ZT8s{o&!k%+fM!IS|F=Xt`x}z@KP3NWbbb zi|jJwQ4Rlnkme_m9afTEpz0O~wcIo0nu2R`7uY<1q1r63AL^O;ob_Q6Z|wKk+?(oZ zxC}XX9-Jg&KB`v&x2h@>pc!gC|*c8ao8aWR*wvsSv%$t9r=;^sn*I|i+3J9)O4aEMz zdxsVfjqS{F)VE3CVf_c5!$^ka+u8*CK8Is5GMSf+2*G+jxzKVOnaO)2@gx|yoMI+D zlhibVdyOlE&+x*O6NzTRKtEd)A;>q380sx5J@|>tBG*{aP+-$b!#K&UIUOS9An9^h ztz(K)_bXnv!?4NysPUg2seM9|m6;$6*P9P5bJOP0*tY@Gm)hT8?LGWJgl37LsklTJ zBOLVdc}2CdjjZ+(HW@y;IicPRKRG}vr-3^WhpZK5hu`Xolml}0+z(G)YwpU$eg^Ns zIdV-Fa-O}L*zv&rY#w(uM*G^zCHiQj$pYxg!HniH(lNHesrppX)QYg9?vm|G3a3@O$vn2Vs5xO@=@lB$5=k+9eVwHo;^)Ou5XuLx z8(9($q$6=4;mi&Skyb33t^m=UZN$udGqQ@shM4kR!<)K`4v~&ykgHw(b+N#n{m!J| z_y3CtrfS^AtH1hO<~pRm4@CVIiAYkuFmzO`QH?UjkThCaPVP)gLla`m=j`mg zby<92tD~4RyPQhD%jh>LDP&YUhVYwxTRdhJ_NQt(5w^K|LD$x_Oq>&aWCgWSUSH3@ zb7QZ1msF%8`Zpa-eTFZ}XR3?aaFpWv4`NP%Frk~X&hRR`sQ7w~!2Kfo0``-~48hjE>QN&9AsUQ#!?p%PQKSDeVp_7-0v*dlTYP*v$>L25 z{TRmL>koNow9<#Ii@vNdWBOh}?~MUd>>b3pdM~`&B?rv>{CxaC@tc&v&jeWr1h1{@ ziwz2{^9M2C5nwF~5rv5+H zBc(s$t3Dzok+H@3dy`S>oii*IGxqmNHd*F92$D1dql2QeY~RyVWY4GKi~quWG5#h! zWL%_IxcD!I+BP8v6`a_%?!51KFM@<_^1-C%eKA|*H#OVfLla9|%wf2Pu&A3sxQh8NA}!9lRIX`KavzOTyhE4seh_Ay!(2GvFqR2IodSmC;-Q6|O4`?BOIB@ zOT5ar+-7`Cfaiy;|8gPI?;{(RuNS3cjPRpRGGqO_dm+%dfUE2bEL2tot@`lM(NT5c zsx5=E^T4P13LOmbKEmUtw%YOK&xjPd8Y#czMLv88THq#+;4KlAbACi_-&Fk=mmdPe1c z^bGxsNwPtC*Sg2}tCPx3{;Ow$#1IsuH~xXUEC*?6`gD?OYNqZV9!4CKR=h5|*}R;O z0D)w?QI-DfAPtCSb+*M?-ISit0AA$=E+!cD>-!-?xwx+A(Mtpu!DuCh{p;pQVJgU^^F-FR`@_3ZUT_aPw+TwsF2NjyA)>bR9L5k`d*>^DcH$E=stjd!CX#=jVACTdHZEa^I4m!Sx-Xn?gr(fid9hza8T>2#> z>b@LUmH&H@G;uwcVkz*ui*9mN@rQ0_f{$%~-{n++giE!xQ%t|)W&aWyV}ZFM69q8@ z&sp~q`5S%9ex7&2dMN%3`BQ%;_~APX*w`Rf&rxN>erF~c0g`7tv3xh2pxv4Y-H6# z`>7c&lSd-v^OXNGysd{*d!s8vu$$&{nrGn(LC{8g3V#u+%dkuKZC-oDuL~c=Qy{Cf z&9hLRAFmz@U5N@FTRP8m1@0oHHI7cUL28BCdAV8mgf}-nXnz0Kh1kB3F5T1KmD`O6 z-auib`qEk3xLefHIAb(llDLNl;v)}sSkq`q3^DB$kEu9^m-7b)6QoS{HqsnVE-V0h?!WxsD4$mfrtTpZOd8na5SOx`V5gr*z>cyb$4vE)9p6@H%s z$;NC+b%sGlLG){ALJrbd^eeEkhd|q|?$)%yuSYTYkW|NQS0<=9Nv88B6g#O+DlFA0 zeYoGRuO)@o;SLZ3(+*$H5s>=>Sx7suTvP3^JF0FrT8x-@gz&$3q|f~Y4S)J6<;SNH z&c;*ZDX0>lnZob1hfVYc1@{}*9M9l=9*WMe2+OV#2C-*kYXGg=c7hr;4GqCR7qFt3 z4!lTX94~~s+~ik7D_bv6m~Jjfqu$UfZp^}=j(!sN0k=|Bc$7xL0d$)-dWjnD^ZK&Q zLmaY>p1Sm_?B9#%w+_iW0_>;iZ^PA%>TcJ|C+h(Tl^ReNl;7(7+b@i<#Ap@jWn^M9 zF*(V)_OcQ7)os1U!en%>(#tu!GU<3xXR|YmL8|z*{f(tknLlY3mPX5iQoXGQx&m4M z#DvmELc-$JCeC`V=ZEX~jJov4+FJFjt)JqDu$N$z$+TTu9c*Jf*=?{rLR>RdLA1zi zi3N~nAE&ceS4ho0D_ycni|Xn!Xx!#y=~Fw?>PoWzri2alfMTL8=(7ZuwJP)D4e?IL zqs0A?%qXwrsYlR?)I9w@>&S{Hc^|BD4P1i(5vnMsu~v927r@c*j3?6;Nmg ze*a=1fy;t3R3F2!*DN%Pz#tN*Bk~zPvLE=B&StKuB>tq&`;H^ucu^!VXvQDu7NLuw za`7EWQiaoXfEZXj(&XoG(-8QXJ48yM|JJu^gOvXTslZqQwX)>vQ((pV47<6;hZJ)X z0yHfae2(K4pAdRuY0Lch>D8ZUpm-67)ZOvxQrbwwwR8G_z>>q0&&-m#L0x=0n^ zrL2fe*OkS7@ZhwOUJTcYCzPlyl3a;Z;rcg&C}dbLOcU>df2v`nJ?AR+y6E;I+)Rts zy&Wq*kXV>r%P2dvtpF`Zl-sD6j5{G~INL^obUSRK*!Cm`tOJ2)JVW^buxB2*`$;6M zA|PLE{TNjgcJlHWf?T3)pLJ(P2?%+NRXMGpD3Daj#y1=1dg>b&z1!RbBT9y!65f!{ zf?4|?STC?v3F!c`TlICLBB#;Q!v=+{#j)0~*6|N~{m~?SV!uIWCS#Yz&%HAGipf(v zx&06K#$QlAB4QBfoh&tNZEaQkC+R@>ko7_$n29qgjgazVs?rV+!lDPLwi2vhNQd8f zQ$GwXk?F$BBj`74O6*R8MjsMG6#zF{s5>s*3x)^Gj*1&Nv(?Nhud16aed>$69xp!U zQ#JUab$;x6QZr;U>0jawFF#U9-;VO@Tw(@ICNln7K-|(pwT}w?9pS%Nk|rv*%}3B) z<^0vZWIir_-W=;F-8MNpq%CjH*612@RI(-U%71;Y}EhN!*9R?CMLb!xb;Bkk8?@eGhK3?Oj+1da-<}aCuxOd76GQfz=70OF=61H|yuas1Pgpvmln!|U zXx|T@=XvT*7ll$KQ2%)eD2mR%T*-(cA4R8zyOF0RPsdKLBaK5=W+9WQlPd`pEt?bL z%9Q2Kkw7dk@10`YU11yXzLq(R0C%jqO1JBa@eyL%$|vbM>mFJyb|xWz=fO7<21rRs zb>=Q&#Mt+%@&zt(YIbM6&Q-sEaBZgt&P)I3N2l)_U2KMPVqIbeo+k?uXhG@7E*6DU-ZzI zcUCh!+_Zn{YH0i_Z9bsiKcTcus@3kz58{C`-FAV*5CZwZbWOdwQpSk;esMqx(Q2|l zF89J^r#;hSENq}K=uhDnh#JR=* z>AnmN;!s0eZA~-j#Q-l1SitQ&96ECuNRd@p(f9@CWZ)m@X*cgNTl4*`Dn{)3z)fH? zQe%Z;KPhVaiLR@l+t|$U3clJ(Yc8=o6#9{;nbJr#l2GfHd_rz?Dy322SoGg$3UtU^ zJ$+X*rMMB&|I&Y+ybHLN$~xM+8ytU7Sxzs~mf?rRh&Xyv;{u%Qy*mllULWW`|IeUL zERXF+KwWU?SM|4{V#D9)hmW&iaouGx)=0&%;FZi;-sSJf60GCD?NDq_cOsRC&#qC< zbIuyMxNyuY3w3`tVP!wLm8?<)(hD^Kz0<2+QdSR1sN3PgzU|$_T}>#w+r2C>zOY-i z;sxJ9z9?cApg4}{%*D$~v~WkgomG+>F>7nq}2n5sSHa#0$klY z5&^>|EmJb#YMtp-n^xsXU^@QApU|)m8!tDkJAxZnxQ8(CM|#Exb-%q7>iL}M8R7gg zFR2p&t#_rwP!dlCdjE|gbs^a{d%Jn# zBmlO`^z>z}K7m%P#_e(^{_%C_hu>mevokv-wcbDZP7*gOR=jkr?;`O=Uaya<5=eh> z|W=kR@dCf{!wV{Mj0E zEa7-*m&=V8Vppg-Ztclng|1nIN-g`2>xQkOQ6x>%IDTC24bw0%Jrkn>Jp9 z0b&v2@G-;IUCdMlfGPLQ{!4a9U%sW%uUYG0v`Wf1Sg2Wj*=@8!)CT(V91O+l0EeTa zT%15dWc1nvKFi2qESwRw)uJT9fHW%{*(3=EMIQ|>>?g44!4LiQamucnmVlZ3KM(uY zy8WJUwk#hHhRc{n9Dmn)jeBhvWG(@XT7x{piq#-;n3mWDQiJSbs6g{^_MaS(+&5Lw zXAwNBq|P^0wwtO1nte|5 zo^f6fRS7j&SVD{Q)6(|GSi9ci1F02W7+sN!JWfT?!|(C-+i;OE^8aDc?4}X0jbasX zioOKWfLFKIL@2iPpfF#Yl#5Me^A^fJhp(lx9HoWlFFP>7dSPw>s0~H&zz=_GCAFgF z`a&=GPtC+)+pmf&`9pc%N|+M4XGr zWH6q_ze|6~#^skgyX6cW1~E@}Ym`+{)-6N{F@J_>&;-P zo{fWp@(KW<!N%VJp3SKWDBCujq|d<^0i)W>C?EaF zy%bi(-?L%|TG5M3m(}I3V2936Y9;%$b744G+QDn#_Ao35sdfnm4&i((y|0KDwQ@IDS0E3p(IbVvH-Z6~$)B)UqQzV(9h|A9GfyPj z`kLWixohxUJ?JX?m{*g&`${->xv|1e+g>T%51?h19pp3dS1+sEb={WWNY3UrU_!$c z>lJ$A7|i4FyjGa|2N?&Re@LRZlB&Gzexn_DF|nN|9Q*21a(K;U5z*(ba03E9fFxeR zmc1m~Qrt0JO<`+@nAoykn9r99KKf~d!a>m~8C%45^sAH~R+YCQwE5KHhu0$cvZsEJ z_RHmcj0`MVx-LYrPzyrDW%sFIt6Mjj82fE^JVvC1RB8d*92GCn8VVMSb zpMB=ulxpPl;ATBZaT)5xyNlZo_+L7lHL{ac3TDE~O&z{w?~-Di6GYKlhv-WMdDh9c zh}9B>*bwaw_qz(SPjxO7$EQjnfaV73dR0w$mifJyrw=iKyEpXo^lY4^omrPVBl-7@ z8^6xG&3=QH$c;LoF;s17`X-96o||mAao^>&t7J@fbfu8gM7+9dm5U`Ng#_ z*2}2ar>r&?<5SZj0U+Px8s1b6hMp4iSVliZwG)C~`y_TXuLt1=|c zYx5p2C%&s)EaQ*kdzwesQ00+`leA_~@mkXCj!hCOH_ zQm5nzl~W1*qyxB^=eHIpLEyg?t2;d|^k01(PRs1_HMD;7VAAh-Lv;L`%1p`IUBDVE z!R-cb==)~%L0ffoP?y5xSY~QZh*$X$a_N1}D%JZCb=kr&km1JOaba2QwS2jo#T=w^ zj%MPgdXQ_w;Rn7szWfcIb3=&bm*6d4y#3qya(DUqtqphy$$ZWGbxy81z-4G-9uat z@O9YYJ(er7>)Y+m54!Kk94^d~vL#ak25ZwI27j^TZMLB;WOEd8i z5I6iCkFRakBvhUsIJN^?Li|O36HRRUWzJmXpnuG_*C1HEWb`am_(_Z zQoIX{HfO;!v;3GW70-;j;4WuHcyLn(pzra13}h(& zhAbH+@e56--ynN!j;mgh3zI^;`Z2M~%Za&um;N04CcR6xyz&eAaTR-ddK!oQ<_jfr zh?J}Wb{sxjDRAaP*Ld~^rWShjh-oysb^m?)DGJ=17aRiS^^{=K{<{FY`G)ehikEK(`2@WS+=#SC@YIUAEN^A>iJaV{roWJw3+E~a^E3%dbpN&xsHG<-L!9AAiC3x_bvIeS!qs3+0$>o?Q4N zWkn%osSa^JS9=u=jr}iepJGSXzWn#U2te-++g~iX9ZZ1rdBeWQYEZIUEpFUQqt6rqfEDzjdCoJ=C(Ui|O~&b8GRdni z0!wzvjFMk;&byEN1WW$=P6380>qlkM&c3(Llu!8gA4B;fFb9W*rnR?mc*jK7O2)L~ z?0zm@92pu^SsM}yX1@3O=TArCBvqOH^acw2R#R4O#d>WmXx@na2Mli$NsUJC#GiL0pid$1CY?&RczOg0#WQt>d%Zhtee zO=HbVfbGnR*%Le`M^&uE?}+_nlngRpbmaF-q&aqAE{kFsm<*dYrbVzzDvOJo_t}`8ofH#+K2y6V zh!mF~4UPZ%#%4r#D9XInqK`@UVjvVy+hYQ*RgCF;{3Ca?r z@@!aX(8k!jQ&m>Ol`DAcw;{i+9yX*gY)XkIiEs#<9VOLDN*00#)k=~)nC)7Xg;PJ% z=oZI*4Jzx2x>dw5=gH~wMVb4JXoXE`do?o^oFh47)&Ru+ED`Z3bbpD$3H$=+k(ykn zfS*>qJGy!BQ?+ZO4H7wf*vhy(I_^>$bj0fQlcMtFAm~l2J{3+ZA8s=Bm|Bx8{cmnX z_~QRPvg>G*b~uiG(AN40{bCC5c18F}Dqayo!j}_jTwb_;oAcY#!f#L@_+~ z?TM?L(N*iS$qr7=3y;79!ppj&H%i+d$R_dBdX<^>)Y@YQW{>iRaD?LvKXQt_ey8{j z@|u79d_7fERR@g{WRUVbag07uwD+l3J`tpE zsr5)zw`oZ*_Co=kv!2198C_&b5;yNY>%&ZTMGyt}zx(}%_~F?Akhmf0ITCotQD_(6 zyq6C6l7KmG!?jJPqC!s*d-XQ#ttDr={f#09FHdj)X#?!`GnpifFV8y}D!IG3J6AI9 zBiF+dG!2~`Np%SE6hHiuGFc9W#ng?ZrA2o!xh^h2i!p?)tG!`o0hv4Shn$Z#!z@k4 z>!$xe-KU^$EXcf#KzZUq??7abnq$xunneGw3_>!13JiyMnp?>!pl1+T(pH3!02bmpHF^&*Z%vn;L$0e zH?w+N^W3Q3cU}IEA)Se)q&Oy^CE1kr^rw#gwXP#_O0oyb$LFW7FQ-dRvk>r{@+gW* zSIukZt~lltq3?Zm=NVvQgjFK?Re%SBRGJ%Rb?x&mmG@T9<;>tp){ zmhKy?-q!urCiBmKk{C=^j(Vy&z=PcpIYL8dmFw6XxIpyb+#Gs|qRzG?hma{w1rw&P z1xtdd)OESk+S;R5pt0tHOMDy9={|vn{ZpBbwm2y=&}4MS*}Jh?+6iZr4xF|WAJt94 zKfB7rs|6#66F$P9mghfU02;XsoaE&Ci&+W`E2 z!Q32}{m;C3#9CpzpRykqro)o5jo%yG*2DZ;t|cPzFFS6}exi)0RzaL)@w^X>iOLr| zQvboKt88?XD2+gCO1M2Wy&^DZ&ASqJ!`pdh5Ch6g-00KDYLg!J8B)44pwXaRl)wyN@G^h{LUNMA3Rn~+K! zY@JCXuo(I{ccu^=PWmPZIo=mHhooT--^N)AMiOKEZ@k>#fnc60-^7oD8jTVQZSqf7R-F9JkA%4z1!EGa0Sw`uOz1K#^QI`R!BxQYdFFm zV5vB)b#B33$#y7#4;@{2I}jqynMNWtzWr1digs#R)?+KOvVEA;lj_clPBY$#O^c*s ziHAL}`(4bXvlG$Ss&$>$BwM#TMoNp7yL*Qx=osuUA5~T!v6rYUVGg0^<&lir6_m8M zg0eWe8pr~tbCSY_hE6ue-9p+fUdEz!t1$yzbGORUmB8d-XTx$6@7giFH{7xwiDg8huZH65{ItPBRRQS{;|I{dg|OE{Q}PaIThfhgDov9GXkM&ZEfutuA zTF%u(TI1ztJJCN%G&X_TcTrGhHgPDWFanNDo<@|&Q5v-s<8utW`pk7v!AKk1B`K-f z*({8b^y5z2i;aopVM_oE0z#M;%*wsZVNGUJTGMG8+KIXsJB&>IDy4j)zx6^Z1HGW& zGf~!95gVGkqK(Z@@t1g-LR5NfBS7mltBp0vwq)?}b+>?KKlTJwAyGP~jC`Vzsoxgc z)A7B2uP>IdxvvBXEP~Tlp2%UYxu4>s8Hh0w3YvX&NYp4im}sMGpZEEKgX2{OmEdVD z@%9qyrIONDNjZ0SwsuTfnxr%vNp;*Pnr_oC`8nyEPQBY#FZqw1%QF;c zpP8kiY;`KchyJy>+T5DFA6b9BBTqW4TAxk|;RMIVJUkJ%J@&Fkv|N>%8-6hIM1?u3 z!%gBk4t&#V)tW(IzQ>J>ZJ1` zlNDzM;M^Y0J&8HM^cx^!(Su69( zdP4Sb^`+46nLjRY`3(T`{Fnx{wzX~JrZGqQNGP9Ef5QZ0w5pvPfGPMrfQA!i47g&> zYvNaNiu0M5{keHY`S*g1Kk&Qr%Ku@37I|I~^6=B$><}hhVT1L~bto@O7HWFOW;-jmg9&hYK58ghZlr5D{D_Al z%gjlj*^ke;q8!sx{VNLToTF%(yZXj@GCK4Z_0mN%UUVRk3!_a;11c0zLi?&=0E zRNee4MQD`|cv3s3ceP*FF%8&&F(xqC**oZE8Dbg@Mu3MI)bH?Zn9T-W^dR<2gW|hL71*;@@=MV7`V~Ewb5$>7J`cwv!xS5&=AZ zTH?zQ-yv^d);f#Zva?>V{lqt0SS9|A>x9+9iYPe!ehKrJcscx@@BOkYCQZ3MmL-^# z#_M7uDv$*>AxFLOk(>w4d+^$JeNskDk||S}TnllaEG#V1@$vq>z2e%bNP4?&Xn~{0 zd;yGc1Mq+5k8Xd9qa#MLkkB1~`G4GrMrD#KuF-Le2^rBqB(nvV-Bsi2Bn*s1kH_t% zRVTj}V8n-VxU@d5L=@9hoAF(^ba(fB zUNPxfNl^3QT3hP5O!k%#goR>|@`fLzI!o~$@nJq!-|WQ9Qdr&`m(I&pqQbm*tt@j# zL=-A{^Lc#rSo0y{ln33-$bWtgog(;t^FG$1vO96yebfD7dl8^IJ6XROY4^4|svZ2% zW;eeOOiDWx!(;>_ZWP|t^!c?j=T9N0i*ic0v=6W!{OTZmFw{ z&>N*bWt!6Mp(Gq1#8TAulu%v%2Wn6$Rqc6i|FnDb$b8%|X0S7y!jvNGdd&Ib=T<*f zI0?U|4YS6 zmD|wCMGQ0U{Aa`1Kl1`v>5XSS!SU!We60K4bM)+Y*ZWqg2ztY5LuBgAcN!%%T7_GplXe%!*&(B$& znOL&0Z2;;PVYAzYzVnoEnDJGz;alc4?>8iVs)ac7*vA9uUxZ zGd#LvpM05`Zi3KcX->_K*t%UD;UXgDJl0v7k4VW+V?VGnC!Jl7v!Q)&^Or$q*Eyba zWANT8=lw5;`>2tmI_Wt}^pkp5iHgSc>ZJC-Gx!U+_(n!00NjEII#K zIU-p(9Z!h3EBnSLGVbPr^cwP3`<2o2>Tz`mHh#^Iv*zjH{*l)DY*briS=5sN#SeDn z0>GsamHPYMgYKPt5>=W3lA#*k#05?!pPrQ)$^ioETPQW3R6<0y4in8O-Uu!)Fn8qB zSjvQW^z}mk1C7`1vP&b_+^gTP$b8>0wo%QW0Wa}saqfUEDJuT&} zOqWd=rA16EVVskUF02hcD#Xrix3303kCZCiyc4U1en4tc*ia=P>4CKqYu`ZWM7GK4BbT<+?rlaXA4x`UpM! z$V?)GWnta&!YHhB#mK_=oKbb=>0S-$O8E@~xN*~-p~pPkxjRIYwphm8(iX6=th3_1U?2UAiSGellQ|)hVMjcn!Pz5K*<^c;w^Q?d-g6uwxt#dBUGz?Z}4p zvuk>(>Erekmu^q~0X5bAwcfxfM--n>b2%K~UVNCwMJ-b$?~67UF>s5PRd4r~Jh)9C z^j^nmf49CVCS!Ya8ZdaH!T?n_Z5pFh3>Vk;q}*zL@ef9#w>**GB*m8-Bx06miSY;z z6$*oLDwsc-!9k_Un3oo&F!xgDGX2zX5CRTpN)K#A1F3*~rHs@4KrxN$f zTkz_w{y;ozvV#bAtp1~|=X;R4?wN51IzGR@dE9q&sU@}UEC*ES-=gFDvzm^r4P&Y< zHQiLkwgXd_(~lCTmj%XOi;9wthLe&8$Mo`cDtw=7{@A=W6uo-J=qm18XF_X%JKe_C zP5GE2s9Tkmh4!am9M^ez_Pypt!R#6;r~tt4v-KW7vd#(COnkCwQV1Y4d0IhwGpML@ zL4g(*8erXd0s!~h523n!))i3ol%k4X%G*-QGf6aoOeNuNlmb_KXU^59#bzGdXFZ|6 z-e3Dv6I%bdhtwXyFJjnHo)0O?moBPcC}Iojt~(WFTM=xH#=w&qUHXsioFJtY>6qIB1WYUp8Z5Dn3ZQ*MxwG=(J9Bvb*kc(7W`LqpC+0 zL|Gu@&~y>u;2JsLIcN2!%NkEPjIQ*smgjdgBd#}VY0^Cw*@{SEqiu`mo!zl-bd?1J zUs>^>>QDVzE*GVrv)&Bi!MP$C8~@?j{FVQ^%nD!PFp}PTi=MMGRVg$iMA5z9=eKI7 z+IM{frqou_;NPn3&2HVvw+y@9mKgmXXb-LdgErlxl3voAV_a$3f16h+!uXixPt`&t zt1fBNk^=g0sBeC&}2~)LmeQyfmiCNIxCKB60!F-zthAu$> zP2lGedErYEHs`2bufoJjq}VIjld9{5H-aHA5yb~}`DD(40LE%Q$p4Y{)lpH!-@a!E z=}u{+yGv=5?(QL_LqwzxAR(O!3K9ZJHwX$tr_zFybcYPx@D9Iw?|N_Df8ScL7|xtI zbI$&Lcklh#siVH~Mb53i9T~U=A|jexlA4MR;Pia?8KZ3a@lp6Jkq$JE4neqM1)y&z?aDBLi=nngs+;W?Kp`4<%_r%gRXL`8n?1WT1jv#k?RHd$5Db9p0GCTgHw6? zf87o5BKc&|b4yjM!GjPM78Z_wqV`-%QML;1*m{BU=?_DMx|CD*VDmz(k^I3fpMzoh zu&vSu#_W>zHO_t)B{1@~3@>NDhaM-EsN6~BRsY!ku_{@n)8{ZTCXof}7pfXqnL3-R zvWGupIStS+97vbPw<1NPp;XPh9@ISld;$M;r5)q`?6?!r0?Iq4u+G+&(oPRH7E7}1 zUX978^__ZEi*#Ib8WE{iyhnjcK|Qo6TLB`feP^F#C{S0nY%G#E1B-RZ$gAn9JUb|U zFnTkSI$as1W)K#@LkmKlb|&aU{iz*0R<1Qw<IBQdCR6T2@rf2T!}*DIt2Mqtdl?cC$_ifDrCEY&x%Xi4T`^?l9G{;ZE+OoD)at)xY_en zwYa*P=>Ec;>3D}OBza~JnjBZ9#%NKb=)$FMt`rme+v=ik&M@v; zt4+kvd9kf+bcT&`{VenJ+YAnwc6FNGOPYlC*^{_qMU(6soa+{DZ@;5LY4-0zHEs%x zdV~Q|RulFhc=`C0{QM+v>6$qqTejWGbBF1KYAui&Tlq_?#JB4u#$QB+1-T-Jbg-Vy zQ-x#So}Xvpok_SEqXL7i=XhP&^|GQHU$D+e5na~GqSt+ss7E5arP+pOY6iY*I2}d$ z|M}kc+o9k6yC5ft+v2_=mNlBi*Lt{D&6bhYO0<1M0SdgjlZi*x?Hy zjh22&omM@{>ra*j&+&sRyR23{7$>zkMoP{R4C)bl1|=22EtlJ+%#4gMfFHcQuDZ(s z*FQLf@8>}Usya7A$sD{%H`EG+$|$+c@cK&CcbxasH6y~{_dnu^5{kB$69C6$>$(tj zj8$z_+FoTThc<}HDEkW*bummb zAYOes98X82dv%jYbL1?e3;xksVxu{Yct%frsuYpYp735_22n!ywJ_njpUnCf)A2hY zN=MBc^AD_2N(~cx;T%Dq@9*S98y($hM`JbyX7%2$##^0Rb~F?8@oDfZ%gbY2#A^Ay=Rx10_m(BBlkWbEQ1WID?o zGfi*rDVtG3S6;}8P3@(V{!}&?fJ4sBkQd314WAuC zT?*ls$QGS=LSb5N*)p?65DFo17UjGmNOJ|uJZ21=DHeEvkmY_ExOT%J?-hlWoPhQ} zS#kfPZ>Hr{rsZJF{I%4y9bE66^IQl%DX(&V*c;4Tv0%j?@)*%!pHttD_=21m9Zg8U z&-{#B>qnGivtYx!@hcDHYxq|Gb8|MLnFm{6bCxHJ;O|^*MKg6EnX8LwyX4{}6He2y z>N}&qZ|>M7|Hti{#;LDnM0GZk3ABPPXy=)0Q}02UMe^~%?(Tzs42msw`nSG6<%5pS z3bi}a`JP=uB$D}!EG*ej#f1ZRkJAVhrQoCp$@X{sc8~5Sn%x`F(GvtKaW6&Lx0@eboKNEY`V0}XG$3+Z^+Cs1#hj(9H(P#r(#;pecC(7(|(1e zg1=1oJ}{(uV8*Tv=5XpF(VyNz-wKB|x30}nX_+g!gCH+iLnkg-xXyV=Q4taw4&>a` z2SS=pmJ&y_GVuc@%?uX6yZ;W2P9nR(Ghn032NpgzsX!pLDuRI=6kE{$eY!nS8a*|O z4kXG*Q3%MlZ!m^}^V>%-YFTSSjBMNx(VqXdnM(3)F#x>x*o8Fs)rRga@!! zS~|SG%!r=ynOEoq*2c%zk)r6cN-Co+1cl|$@RheTMXpibqWENSo|YO_vKAK?yZ1s3 zNjpY&zkln0GZ!%Ut40TlLm>@nluK2>SiXDv+6+O#@Jrle}?SiiR0F;4ORjq-l1q+>LtawV z(QnVdQ`V&niV{PD!1~7Q*1W`9PgW`_s_+#&JiPm66p6#O2SD4$w2=TS^|NxX`3#w0 z$z{46?YEJ%@y4pxp?rplE4ntAo!iP<*psL|{_j9_+qt8U33Mom@k=>{m(pI2Y^-NE zl57LbHxdamLK^-FRoM;spO4y)4_@uv4yC^{JJ$=n77_@&NCB+pUQu3+C_L5F%+Q~w zI0^I{xH|kY>z+w-8d!CG9a!W3_j~DKfQpKrddF8}JvCW}!1kzVR5=d2w$5MxlFj#Q zuTlr3xjRC)HM?by_`)`9)Zc;hz#g1wp4>a)C!T*;B?`$%=NB!>zHiw4YoGWddE@+F zWFM`6^L!!=u3K0&uC(;mTEImEqr?6biHQmIemUT3>p-)C-13|SvA#r^TjR;B=C#0! z{F)jv^Xdau;sjzcRW+KiR1{2XczzEusS}JrNu2AtmX&mCKTb|@8heR$^A)w09wzPk z3G{i}^1Mw77l$3nPcL$1Ujsmgz(D{DL!1FWlC13c@JAJC<5tGp3kp)wB)K;aVA^uO z(&qrz_kM@+84SKZ+}j6PAofMUwh>N@h5tQ&*)PXYq_h8lkB6TdH$a1R^7-rPeNZc< zrEzd2QHIXb>-K8Db>C(o1f89rmO7#Sq0<#Wpr}O9{^RwT6}sn&@;)kk8S-(@s6yMa zz#+pg?*+~E}jl`Su_>gwN*#NRx{ubyPz481D4JfmlxaY&M7 z*eipa+{1@_oB(saXt_{EzB5rh7F=5j4ZMZ4?IVlGaP) zgG)A@3A!6=G)G3Y4ui}RZ=%r9tRW~!MjA|KXXm7x9IfS*75mv%a^@{qKB3|>#xlAS z@%Zt+UQ+J()@OZp#Ifj={=d1Tw@OXsy;{09Cd;qdDuc5xi1ih$f zjYH}Ejlc81#q$qmMfsq$zbm>Qsq#hr14?Xn7*wL2^ag`qxrf>#%~frdT8u(s+vmb@GoCjnd4Ms2eUthytU(u`yXI}E4bQWM))w|E7l2z zax&doxpkXaXE+q5I}iep$XB=&6I}rYe@&Hg{EU2CoF_QJ;idXFWV{|c;QFO2Wj0V$UXBNW)jvv< z;UyZdZPrvGfaS;FV^vzrHU_jAmYY7CnVBK|uu==Ai>?U6yu>kwb7=JK99xBdcu7e2 z@t|r{Emfx}ZCU12ay)G_0dJ=%{vK`?evK30t3pRUL_KeLM%@ zdZ0w|LzbVo-sMv<%+%wMC8A2k#~cJxtHEun-Vg0LpE8ivNZX)q!BEXBX_NeJh;*3` zTfm}K|5ovYJ4d%0S6O_|^?ISUeA!E$t&AtHdHwcV&iuO^=ryr`9>a2af=|kcG=_Ac_XZIs`eJ#otxp6{)KWv5O9a5srZ*Mt2wsbW4&Ob<9wxt_ffG>2Rl;y-#0lYd=S+a?*YPFeJ!Dl` z_%*{f%q;*hz`oR($97J`-@hWbielZ9iNY(_K0wJF2wOS`(WxekRCvN-B=-?A(~H>R z)=gCE{g^S&Z8k^}q}{PQP|2N#(<=><+8z5-Sh5;Xg889f;1twzgaXb`>keGm3w|8? zWxxJYxA*E~$4sf^xnU{UoC>~^vcgf`bMG$iz5$jWl}WVd0P!+?>Mq~d3~lfaB|v^Hq=97Si_YEZaB*`UkcUn>oXTt5wpRbt+zkn%0K&4VMwV@@Y>rTSgb9BQ1oltrqI^W1asg6m;ngvuuCBhOuS!@Lgrwv>n6K172SWTNfD*m*ZxLX&;lhWo zkY$W>!vSJJGfmsUsKBwCviD-lBq!aak1j+t`^>a)Art_Lo_kAx8aJ{keaXsAaYmX8 z8-7B;_dUmMv9zUy7UC>{$FwuEv(Mb-UbbCQ$BP@S2fZrbJD4x;6>ysomWSakwl0c# z%+sXsHHL+ucugXkW)EO%uk%%x#ew7LBacSmB@nC*mO##aTbuntX!tyVCJ;6TNjEq^ zU^D(z%cu(#QfYAr@|>@E;vTQsEYC*72>W3iO~_|tn^{gaEn~=&^-K>hTYAVqUaWXo zjK0o=rZSr_xL0_-KDVTA9w@m!^hxdWm1Evs{+$BQ0GkOsj|NlQyxHRCECXwA=Wo9#laSSfu%Y6KoU zf@nGfrD#&6&IU8ZAS{DV3IPF6AZ$|#-E-CJeR_d_ab@X(#+|c_7ANKhX$yG8EBfg@ zH++}77h=CSv4iowmWm+{>MI(=qd#FJKOvJ+v$=&ZNTbu;^<1ObEtxo*9-Pc18<1}2 z)X%OITL?_0&YV?auh>>oZTpkLq9!gu$E5`Y7~EhH^u;zdHiRT3Z*HqmN1~49I=-VB z4;zpARN!f7K**KRtaiaEShED8j@0#UqoZNKCJFKA#57~TkSm^`#7%d%6>5EEb~4AT z55p-s0j1fMT2|(>;Zf!rkjN4@wlf`IsQAcdukfx!IeNJAQVMp1$cj9aIa?E5oQ{8i;swUICFkTMYxdEejnadGjnz`+Z^P;9-8$xG~ z9@7s1%gdynVn;WF%pRRK>qZzAN?JjC>NSoW=N614Hj+%k*0+)p%tU38uC(jpA*SP( zz_y>#*~L0yWs!pKvd(4?^-HWL5|faOj*Nt4WKc?jrC1|9jzn(p?W3v#{SSdUA?IGuWL|QAVtT#vj4aN6Gi+C_-?56X6w?wV8QcA zohgrc{9U-;i7?{dM9*v3I79!xz4-W;HlxPhlarARQG(%TTR;izz7#D*X??vx^#$@( zhvY^$mbDTIX}Lc=2SJ8$o%qgxRnJ7$uKC^a+Di-KU)`4_}*? z(Y<(qg%YAN4IV#G{BmVT#668$mL18WH5a$J={R@2nhN-8O`XW>v~3&tVha5g)9_Nu zmEp7eWnFEPPU_YFw^u-)m~FlG9r6v2$dX2KAB;pTD`TJ7OOJiYQdO!Qb)5^Y$)SUJ zG@-~5K-#f-nhwS8vskeqe8`ki3aN5Ob#--8Lpe@HP=bpM+MUT*d6c_9_7OXO9Ejp5 zxV5ifFv^jjW|L3|20`VmhLZg2R$&>NhR{AZSg_aIy-h@0u4h*!aVLPglH>OvN9G7u zl*a@GP*zrM`^$%T`{j!R67k4T-!DbK+7Q4b`;Szk^06axCdl||Q=S*bm%HKH)=@tu z0M4nLaEFib!~{mKCqjXCfZ>#vA_Gbtyr^&|?RT!nUf74Wmd-wfMf6rNTI9KTQA~T} zKyVu{2{mNjCZhn@@WR#riASeQK{v?_T1#AyzZ+?YEqtgbqhQ|nVq#GIm%cS1r$1dS1_nO{nc8jBu>*ISVw&KDge9*6xY0X z=vzBHgZnOs%BP^@$L=qSG~3j$i4qnyOo$-9ftTJ1bOCdJ1wM14*)VdaA5lVV*NBTG05_u?uk{8aG8{pSg z#2#LZeC5VT(}vzy@%(sw8oRrs7ZM_EFRqm5lW@&a@tTSiU>mF;tnsjujM+n3G2rEs z&)XtJTWP%acN8B_E%xB}LquorH&~U|?i-j`L?Nrb#HnB1K3-CXwT$i`0tE?ecT6n} z-ZyCI61!Y5<(l2n?PP3`K({GEUvc|`Wn@{M_L7M3L8Rh{bJ+bJDpqe7+U+NIhvdVKdQ9J~uiHY-VbI_|k#iy5!djkGzL@nmvP#*R)%&06a?|ygb9|%=bHNH6ayk7XW zunf(DMgw-IYkM7XsNEZ3famU%0Ib7*g9_2#bS47;<+Q)%-A;K!#({8v24l<}6(B^W zm&V&Pz`fW%_Q!8BppEM2BuJx;;{ORUQ=$MEL?2@>cm(T3K(Ts5MW#DY$;!mUw-uE> zL-GSuF389x@$f4(m3j7SXizF{Bpq~A{nwCBt>5=Nm_d9zXL!H%Hf3860k?5_Pz zn5|J}5IJI*=883eS`42&79IML$(Gs~L)C4k zme-OTyr@k33g@Q^jg9n?rHFKblG=Ih@Z6FS>SJCHegX zb*LhZ&r6(LNnH&^L~U$*8b;PlL#v>P80lAS1Mj%(Exut}fhB9GN{x3VbS&fu0Kn7yEJ~B~`_7(a z5aE;qFI?V$C}!QYU?w%sliGjkU2;bWH?~SU@hw5 z`FSRN@+}b)Aw3!TrNYF{iF`15DKzZ1)25n1RFoV6BJ6|WVZhU`ozO|1?I@1o3?c&w zt3!&{d(>RtXJ+MgeWZUWV=5a_2#=Zqk|Uog#iQ80hU|BF@kgA5H+O4Ryf2)d5`~PE zvdK~~E<*Gu03}beYD11l9(=~(S^Z-1E$!p) zLHg|V@CBJzUrc7p~pb#AR0Vv|(^4_lCIx#k;?OqM=bSVna>Uqdqz%W1&4vr#u z7jbvinc0|JHnpST*^<)5Cc8yH#hPR4!OAe+h8bvR#3OSBsp5f z-_A5713IeQpOm1X=L&(QADILF#^W9eS=CNg+5aRL!z6LJI9#K_vF1ttbTx3g-Mydc zw7(rTI2JdRre9z(WIODTb0vhA15%yU{us^hq@CfW-Q3=l53ofg)=kk_`B7TpVvKM< zzD>yUeY+icm7J0BHknBY1>of5q`7)v$m!IBCyj%XgPdxp^X3lm^lxh(j`;M0IH#5E z+-6~a0R*^=5Mk-rLF6GW?&dzaDMpwi8mZ+Ts0}misa7$P6~%=;5J+`Uj`F<@2Z*6FT0fwrnssA^Hd>=PbaJZ{}ihz(MKS znMl}_hj`g0Z@l|+la9Y02&E~34Lqa3T0DI(1%>4Il+w@`y_;|%4Zg@q zNc+J6NDrVBezsJhOS2@Bt|a*8w&G|^lw`@?7D;Pz&dJT~9m)q7Hyx4zg+*m$q!kC_ zS~A^*YUy@z8Q4}*$|52nj)U23e*Z9VLX2-ED%LHgMXy82{K0v66@)(s=}yR9HK(z9 z0ga0t^=!1MmM2+(e+C(r>xL?+D$IhgOZ>w&HU7X)w#JoouF906CU;V2#Ei01S^m5y z4U|5e%BK`|OftKI##I1Q=nR2${P35_*hB*t>XPk$_`nM_K$G7Bx;t2!q?|Fd9K8mg zpOls)eFD=~QQ*S6%21N$=p(eY;Z1!J_p6X(TD!qm{0-kv?9fblS7s`_nVO{f4jQhL zM|2c|!}ruGvZNz#a?&u}AhkUvlA)B>LdR8|;{}7Gs}m})nM$lftLsuyL0&!o05mW) zjhUM>f42J*D}rCL+oDEzv&C)(B1#lR$jMWul!Jj1^5$?omAqqawNN5y#iBPO&a_rLxq01pp2w|OHd zdrlJ@s|M*5`k2At95TVXkIpiZr^OU1G(NT-{_{^?)DNF!-yW1xrMB4>4(DzFg3HYVhrS3LT%}QlHLeONI%= zkHAn;DS8SDHs3Z;_c`_^l(B_s;};2C+&q}@5Rvdl0->msz|y)*@U<@>Yib&ageFo` zCeWt`l;Zx9hQ{nkgpUV9hi7Rz+~AT?R(mp#>P|kSR9Sm?!Bvc~d9sYX4{g=C>@`*A zvXUOfEO$pjuVg!de_x@2gIGZ$<*Cj6j>1F@T16XdhPlXR-SSiSx9qjX1qtIF6gZ+m z?b35rG-18bo{eQGtdnG&Ah7x<_ri&^131$KAL?_46k``l!lIlP3`9)#OAVzyrE|&< zZ5q?`%Hb@&Z`O%%2ZmJta8Xg=MJ;tk^=&VV*$}zk{&>CL({gr8oX+l8Obe|ur zyjboMfFKtGxZRi6pzm;(};Nle}H$eJh(Uu1p;y`_GaqU zkb%{&TCNYogB#tbztxstOZ4|=WPFOpVbi+AgYQaS-!rkkpFaCicTROB`qdj&AFGir z{J0-aa9Vm*DJ1u#8gN$r4H3_PV;HkJK_k^r?@V8V+ibWJR7_8lh%RgVK7+7SK~*02 z`{O5Mt(FNZxf4(2=qXS?(MMQx+q_H|8xurMJLK3*RS`7?Hj$srU#acRx6GD*N;$O8 z@eh-CyE|MnHAk4o*45$C$ONM}IX&#C_MD=Z32p{j@As_(G@TwLA{3lSpPA)P`z&Te z-r<#!8gWF5atbL1NQYW=gk#mXX=L!rQ7Q!<*}FyRLQz=A6ZNJ;0@lmeckVaxWmZeE zG4hlrf&J6DS@Kg@pYXM0?gHDEj2;tUTZaVf337^H>{6u@Pb{OlF;(P~sa&HA zyiAOO1fEJ+9=^qr11NaKz71?s(^vLZSu<4yoVmlqHwVG% z^8&kf@iPhGL6f34lB+Wg)^=+H@5~`xad_DCh|i;J z7fIhnfm68h)+6{gYbGgu#WUcxtWQrBin=BQancgEQy7?h_@Gdo9?VF7)07A~VIj5W zu8^86OCje*>;IHUbM@O@P7dbCYi(~|2xV(ZFn)R5W6U%oJ860SnUlP6@mgW1fBnOX)pS0P(&97pj8x=fdqJr9UfW|eNz4;ci zA_X#4m1&2UpF2ReoS833GR>Gr`2s9jJ)13nv{rc%In2n!#H7)4NnX}A%C=SBV+Fo* z3d?aBv;{MU?&e zRc^i&NFQx#wc9fTS=r0Fb`x;S&q&fucR-PeAh!;*vH1)?m1?J0oNF^vrGvSimVID$ zKoU+98bZz1o9V6Qg!i$R{=VJ#a4FCQP7zVp{dR((>q;3_A1>pa0Fpi4D3z4MR=%8=Ak* zUHMqF#Ll$eS!zRujI>!qmVe=tLz5-Pwp$9-I0>c>pSlyri7^^I${Gu8*rAcCQN#Yw zY4`5A8R+ZhLfLX?CNMiUH#4FcEW1}D7<7HlAYyp_o!`~_QD+xTiLmrPHA!rc zCl1RJa=>4b)duzS-axf7#Psxh0cGLgXjzZ{8I}D{F~RMvzAPO-%O0vG!PG|)m#TmY zypK^k04_ko<&Dk|u%Cljh=IEZi@nvY%6-=E(wjirH-KGc2Qy%Ak-d!z;F%rXZ6=x! zU#{3MyR#GlWT@!{M$}=002a303MPzZ+5uCYR!?$JULm#@v!;iw=|S33^tTGRD>=N7CKTE0?!D zlSYH7jUrv-_3|ZDtQb1suU8Wj2;o|RkaaBp-F^Rzjd!KIX`t{(M?Rv?YfY6=y%{oV zOcbInvtqM$DC9>)Gdo>Y@vVRO>~*LOOYi71yu*89sIQNiE9teWjJT5zv9MZ9Cr63s zZq~r|(&ygPX-k=D%baBV0ma`hx^-#V?o)w~#JVsb-O`X{O_JaxfjZtnrhUYfyKF0| zS2J971|wwFqxDnZ#ajAM@Y=m;{o=Y3Bc$~(Dw2RcA;ydThEx~g{scOyn6fhNGy%Dw z{L!Mm^IQMWf^A2?ZIZV}Tc))OGc%mKdz4PEUJ*@UvHeEFdAFNKYdK-Sj;${&@ez+; zl-drG#Ge(G5K6q_Vh zAT-d^O9iY^0{h>gcF_4Q1_Ok_t>=Uy9!HRyLAgFPUlKFjmf7;$BOv$^&x$plW6=CL zVt0o|W3~RI7ADd5;m;6|h_dyq!1f*x8X6y)dP2{fa_RxL-uTo&^?JuUvlKa!&FHVT zwj{%8WfCAuHy@G%&~`_b7V9OC{t$DA&V05a{=D{sQ1rHjfuW(zl}4s$)AfXo zi3wKiFYS*qg!01|&TMQ2uX(1wBAWhGzd}OvUo)war=L80Kk4ILSC68zjpAx>c)S!vuR?cLH>RFY zz@VJ48cDwvc`I+SD3Vld!k&WDJv7|5rSUnN*`a8x-VNGQP;M?PijPxCTo6*Ap0vw5 zdD%a*R_)qJdOFg5CwRCj7s7t;z5lP=1^C~|3y}|>q$r?-o&}$DT;7w)6_Rjz^fBi# z!Td%;`!WvhVIo{K$Ds!{HjAVze4ui5g%M!PnwYpLxB{o@t(ZeF`M`?+H?u z*Mwac#DALB7lr-huHGiczm1z5M=_Bu9%9gQJZow(cQl3;#&5=?AObqNM>kM6YmFK; zvu3%ajH>M)J6q9FRm@>PDcMts`0)um%G6nmmO7oP zSH;2nP!hzQb8jn4hU@0qfd4{kms0h3&FH9Qxln|FY3VTJ;$!UG&X9_xqNZ0(65liM z!S5sVHru!F8ct5ZC(G%~9q;CYzimDu{+@TOsdPcouvzg{A^@$5_etpBa|Km*s>fqb zw57_aB<}j!tYs z^?4%xgVwa1Je-i3t><&zG&bIO)uSg0AJ^1Pf~gM3F&t^^#v|AyAa=kSMmC*M5dE6ACoG-YH0dj*_>69d0SiC`?3O>nt39~RS*h6hghX?on1%t2l!sVwRbE~c8bjAe@fGlVo_vspYX!fEd6JIkDMM)tM z>T*|NKWu%(cz}pNbhzEt>Fqs%N~{IqC2$_@RYTw7aHrsBu` zL?bKClTg=d6E`1OZL9c*Wqvf>6N)v5uNzWp=3GJz13te99mPQgrf9f@I;QscR2XVh zg2Yf_NF?eQ$x0q9>iatRQ>S`ypF?3y)8!Cj{JjQEP@2x5WN!6=HDg%iKh_t5&A&CI zpitAFYu3V)yR|S}17;A?ls?{_ui-h-%prpr0&f69&K5SNhe5|d+Hi|RMT>m3_8v_a zwq>Hk@2Rhpy}&L9h(0g2bWwrQGMwnTAdcu3Q}04196Q~;iU-kRspL6l@4_o)&dMO4 zm;y5&Si@>;X4$LlZHb2=k?)|~3>8<7*z}0If~M)C1oN`a=t?cdf%&Z()9Ui^gmXu_ zfuX%8@$3+U{g+eCg08N-pPHW4*BF2-1*W(LsW>6%J%hzP@<;4J(d z9(7CY>i;|M6`z*$l@=#$epVO1&zqte*c#4~fEw7nta{=ehOevY08pY<&c^1Et0=XN zt!+fZar1=pv;Fy&2tv57Zpvb)v#aaV{rNx%EU;NSxnW;r*&yDV$^9U5F3Kht<_w6vwaCUQhC85da3fUICjLPIg&7o8g zm5>n0eOXJ#875N6q<8mg07dh@Z;*>vvBm2^UqRpu-G?%G_LVOIp ztD} zkWx^*1kWo|q!_xs($jJ7 z+FhKTnOo5Wg@pdjRP~}5wAztOS8>n@ef_o=_=W^|Td#1bw)yq7`%9NjIvo8kPp*h= z+D@vj#c|eYHzHnq`Nfx7*LuQ}Z$^D;ocp~sC%UdeOMb3QG0=P7??!Ln-@68n>tE$~ z0o>a5AJpyMSSEfT$KmAahjIv}H$N?UW1gs+rhS5}w;Kgj3OjcTC+RpsZ; zSsnN(m7#{BUim)-Dyhs@t_uhYU!H%|>~C*edhHI!pL~09lcKR2_~rv>o9D8AOx`a| zEh_P?nfMHkvO{c!FKh5c z7ISz!z0JAKoX=VDVJInLGsD&NjWM(_cgO+OcSh9s)%7$?_6rUoUD=p|%V^TYQW^TM z;1j=p6Gr`sl_#^#i$&)#{48pBb-LI0>sLW9*3Pq|FCe&=q3&Br5y5#YMTTQqW;ymlCF}ags>zJ+cv$o~7!?2r8bqFh zV_Evp+|GyoCEKpf&Zk@gSOx$xynY&eZs^MwYz9`0j-ecx{lnm&GtZvVQ{bt&V0_^< zo#l}kF4b_|Jh-QYYP%Y)4QJp*150F;^7L6FSA|#-)(Kj?BFVuqa#G9u^lt5Br>Ud| zR9t0di*ox{vKl)$OWbJ$@s1L`tC^^9e?wlIsM8p86=NSnoK7o#H+DjM?{iphk@wdsR2IbEv~yEpo!IuKdn%()yuWNq@0pm>@mX z;Ody-rV#4(r5i;Qtx2v@$uL|Ve;(QameDFjpS8QU_omKEdVXnUX=n_7xq+e%o2hsV zSFX+_yIF#qP$6S(VrOFtU(A*34nvJiJO2(|2P!O-ZkvE9XjN8nioCK- zj(MA~{eYmR-QLxyYTCulFZcPG)GTh3ClM2|dCHNPRkd8UhGao1vumsa~kp+G6cM%H1Mr;Ls0+T$n~btpcv!OY(%kk8;I zRcTLel!_3(0_owKyXlA)C(}DW0UP>%8pG5sHpgVUvGmW{9%#&rzeN1 z>hcpLlk2YJMRcw%{lR7B=*M{&CB&ioJ9>J_7Nv4N{PBYKf_F;eRi;)d+Np`L1YZO@${*3it z9jU2FFy#|w-~zg%9<9B4bA%8E6v84?X0K^%%&5y+U}>h8>T0U|m#h~k)x&mcJmc1C z^!-Q03G=mQx`2(F;uxX;LmeA|jg6fo;>`}ln49#MdAPYr>FVy?AOdy4Gg~hmfz|^D z$V34UkwoLI zU%FyleZ5@ignZ?n{N?%lM*Wvq{w;K=_%tMzd?qzdtB!gFxvc3!Ef0^k&WJ9P9^Z{B z(Oci$-ZTbY2%gU0;`;PTzp)6&X>Sca!-Zy3r;+b0P6)E3KyoOY?|T5c)gt}> zet#u*Q~%w4)W+*F8J_AvZ$f+wZ-G*#;r^}0MK+!B$27BvDEG2q0}nBk#Jq!*DeOdy z`vCRgPeT9yJ;x;n<&W0>T#w%yK2hd=|BmOH9&(T!@j6%HhkDLa}*8teHdQ}s}<6v z`k*o8V@yYxYv5QG^E5s&7iUoM+BGliJL@;scKy94=V0n7t@;GwO+Swr3a#cl<>$42 zG`%l!3A8@jv-;$4(ks(1AMIX2@y8~~sg)9x@kT8Ag7GL_+e@gYYrdePgH7AGFA7$w znf(;N_^)qQo#-MLpmt9{8uMMbiDdL#fH;y%;+hfnH? z8x*1sRv3b=12jMKJps<=zT_bgbeEO1^B7Vg)*+o&_<(YdkcQ)#W-IBE$lueoM0>-- z{c**nxQpIFrGEN20T|Kg`N6j(2brsfU$j~i>*^28INiu@x-E^2q6);;4?I$UU$7~Q zq{w+OUB`6rkJZvETS7B~GRwLQW-lu67$u7LbNdy6j4EQ^SxHCbg*GVn7HXPQO02~? z=Ju?voSv~>?z(|=fF5;0b90t$XSU6`4K#Yt6-5fieAk6;eVOs}^8ulv8#4OBbxIEx zUKZq^rIG6p8XGkD2mj@1-m=2G9V`OtKpTYGlpfmu`*x=}WdB;$L5tnUvExTAERcg2 z5VQ1i?dUa)1Iebzq7B^PgE|`i6fxUBk6clj=!(*zv`5!= zDV=+*9l@ygVwx0HVtxH$tF47pJwZdgT`M^?{KVBvs1c0;it2M>X=PMB799Pjq;np)AF=b7Xpe|z?m#CvyI z5kmX=P=v z%-w}nUA;+idU_Pp&xEQ+1GX%9cH%+fh~G>&pIqi1k+kBg(hzE4Hq6Yv2=QjjCbWBc zQTBXU$7cVXaoJgne1`rI#YsW6ThPSq3?k@<*`_x4WWX~xxefR4%}!JSLmq6RoqIBwk>DKw68r^EkhV`S5I|@G?>YUAhTHG(B=nMBUp=Os&rlet*r+-%ggVX5eXT0c!X1YH? z(kS|tcxuPZFm3s;rilzM~g1eiRdK~ogj$b zYe@7qN_2vV7Q;dG5=8Gpbizc9GV0(Lgb+PZhUmhmqrW4+_wK#xzPIil&swwAIosZQ z_MGoN-|zmm&zDw4%SM9K6iW$*WwB#v8B$L!^{`cPZwz{UcW-*W4SM)w@i6Q=ZXnUi zAIY4@F#o%nu7lYpv3dA8d4gF5PrKsZd^W~le;hPWo7rEzEL_7XHHzh0f9_F~#|y@` zZM>p>*4XCXvF_gqY!DU^o>BcQyB`}aAlG6Zp2FuoFYt!R<4w0?s0^O?=0CG6`{4Y8 zP`LvRB8!97 zzGJaE0l;~v#~OP3fknz2<|u~&Gcv=n?elD$zFBvjpljwsKZTy0R*voSz?~l@AGZ{~ z9w@hK~M}YfQ`r-hVC^zJ>p@@{+}zg0s*( zPJV?t#pC1fBBwuRId@?({#~pF)iPDw1;gL^#lWOdakbKuyp%WcoWa}~gpYj~K-2GGfzB_WQG9{H9A15DSplKeKkftJoRl zemlZKn&uyRC%?sh;_u%#x=Y08yJjM|a)66-){EUT5H;Lg?uSYgH54XI3#pk>3kyd@ z2spF%#t7`b;rDA-VdJF|hv_k}8p6;==D{Z}9Nh|@J+uwvHpp~eY1%eRc5<2+21Hr> z9Ues6=9j-S9Hlc{t^AX$2U~=2J)3x9>V7{A3h;|o{C%r5FTIMq#3_yP~fE;Lnd zJEMa4^Kf7E`JhUoe6(C~9-`QUsPZgQst9Ze{0LtmML3C~1t}~biGdck5Yj;uwqq!g z!YTnICi>(_IC|U_E7z=J>fN{Z*LM&qsLD2SZdnt;x!O!;7B*gUG?pVO_K%VKkwjXD zjX$ajpSjAk%?~~$(Z(Hc1R%a>yW}@dRq6sWfnM3z)YkT>x8dY$7Y&fJMkVoS)NQlk zO!g*y@wcn&G0a-7&zS|2Fhqv9NtnXi*pL?;#$ez`N>Ai%;&euw=#g)~(!;|Af-bk9 zJc<#1R}Uq>r$$70IgEPzA<=p5e|=9jm9nVK#MH&F%~6L2`$3 zo@{|RnK@bh5Rhhba=%sgxi1|%Talobg{LuMv8*HMUk((0m=&-e)8>MDnm| zEu4<0O3g9)9efJ&H6mQW+WLc}|NaXOPN!WSFl7Gp^fb^i=8bjfY|DR z;5~G7l}r3d$mgO@$RAt^90<&^J&G7IDdV}Tr)MA6uL*O_erG*bVmn z+cn?GJ0kHO5U+nhy%K&{CrGz!ivk70<_|qxVslHh_2(y<28pFv!#(=JNmhg^FmjGi zwI`>h#|L<=b3%#Du#5NaDN<5Wg40BBeo_AuTYRu)5iun~At0}U;w+h}oB1TCJUv-G zm(p?Zdt~~v9Wkhyk@-T$+p$`#5=ox-=%{QgUp7vZwI7#xsVl zRiV`s1b87j>qwTq=X_lr#1$j|o2ECtVhnE1m`>>~25+BuM)($pD`yI7Qf^+tzH zmlnEm`YnZFV_IXh=kWN!367kh{Cp7(eFwXw@ZrgA?JzWYI4r}FiE2SJIO%sU7%SuP z%llfBR_H?v%UzL0Vu{dro|vZ%FTfO^AZ5A<54erf)}-54uqIpi^+*wkaRKhbZteqR zRP1J#V|0=82$P}^BI4Itdit>%~N8y3@X29Fx*P%BkQt@A%37CF3kRIIZ6^2@NTCm zs|ckkrZsx7<~g_l|d;3#MIci7=9fj7TUelksn7ruhq;z0$jBevsm*Mb zvm#y(oN#5VIVI|MK@d6fheQb)!hWyOE><_qKf|h)DX40@*YoT-4uv&uz!iq@_yV0= zu(}zW3DW$&C1631+Eif+_Oz}zXPb7Vammu?KUIL$*|yQr`A3|_j@Z{3kLyc*qeW#i zF1L3MhzvntVn8-Bt7Oa*ac5zhZWm7_&-w~gH^V#mDD~YzIL5x;Pe5>=poaBhja}uIxp$XLeh`K z*JrO&#)?oW6w$Ux-__h8pW?TBk9IowcBCIysT8Ri0DCV=ad@N{F&gpRquF>}kg{q3PowMpMUp5NpN>FFhrR1(Ym--lB~z*I zjt#ZWzx});bL)0>se!rZP>g6KALbxW`pgzcoW>5eFy)L28j1OQ6*Cgkn!~#+eceKj zNMpe&Xa<`7+`+`P?qPFdIo}27q zqD!vU5A7BS@~^PEepnviYabo4+Aa7wIurwS z|J+3aihg>(Xn7E*t*s<5{PEACd_g=xgD=tsN#j!vnC??GrW>aEdXznP{uPu6f4a58fKo4uoNu;!(q(p31{BY~=3RDZtW zvzXAyaT`+G1-J&>qLO-U?xk7r>I)|n&wb*u-@*L@-1Gc;u~qjY z(q=ysaaOWC_2n0<#=^m-m{_4Oc%6 z<;%DoA&1PRckj4te6{)G!9@{VkGs1YkeHG)ZduaCBTsVNeS4iQiwR0ZI3qB&7h7x# zf?!z(mcR)Zx*s#8jIh31JeNPKI7KC(YhqzN7kz7I|Mj-(EAtIuA&sIAp*2ngnmJ#Xr51>iKs1vXD%xUWQ7tP)~- z?;I8y9Q~-RYBD7!wQ3i=#eC9Rq#oZlIQdu!f^mt&ON!as3Gh#dR@0&1xc(?;smf8z zZG7FW0qKk%FSSK4k6;CtV_1!?dmK73Q|IhKL6WtH2O1C%1gSXRh)vc4W>N6&Xlt^1 z&=RcWyv~IJRNY-Q**`RFpEjxDWbN%scrquh*TOa})!Dv3UxPT4IW<*JbWS?g>x=iu zoU>~^vBBcQnv9#+Tvq_A%`kO*TZ&%r`$?INYF)N*5rq`|7IH`96?|!|Qt+G#p%?a0 z!0IDP1<4S}8w65?gR9v*DBJ3w_L93C?gI)dUEsh9IR!>_9i6NU5)WyG9T_BkZ~hP^ zP*_!^b=t#xCCII0?775tltW}r&bWNN!Xn{`3j0d4noT_&i<@rpL5BJ#K3ne<<{YMI zjW7vmSM$iE-hAE_$f8iSh_Hz0hSgyQBrOW_{FoyCgLB6QuhpJ`=wO&=TRC*FN;jYA z4}e2%(@I1{5`Jorcg)shXIS~Ao2i6QxLIm)}$HzOmxhebm`wt+j zlp^n9;mNh%ji+>`@;T|X>5)Z^if~{98_^RZ=jC;z@lj!%8p=h&xa1ICT_J@H74cvK z{%X>LC14>USOjrA{>G{|Ax=p8A;2d6#un{08tH0S0k>h?`@b*BtG zZ3B-|k1(c9FD=BPg^uZ@OL%E{y0N?5az{xDBtULB|Ie3zI1{c$vPxj}j%h_UskkAG zBZn`i9y~-*gW?pMM)s|w3`6U;khG?4OLVGmY&xc5R{HwmS(LW-NKYc3@Wle}!-vlX z5Uf&C4D71T01}r6JQ{IsGH&deI%kn~jv5Dm!39{cwYt5utQ6L5Eaw*oBL*!uG5;N4 z>4_{v2O>(qMlcGfMRhAXYneZxpw7@w$Bi_}SDBxR4R6S`Vy?@G@7is7v^73({svy# zNV#oGQzwM6NVgBX>kk#6ne+(_9I_FMFzQfGmWgkxp(S>a>XNY+VtBjY?KD}MbaEsN zyNcVvJ)hn?&5k3lAa}8~EkZ2AkA6zj$1^9G+1e&K)_nlV)#oM_#>ObtJ!DQBM44{q zxu|jk`&E-MkBBlM(~L?{1)}6JQbk8EN)^SOr77%?0q*7rer0~sGh~r-QoNjn3<*+m zEPGhQQ9sDjw+5pbc6PawKTXDzJ(LAAUGraivy06x=t100g}i%ze+WCU0pC&UQ-S>c zoPcXmuRp-0czvGXrTqtj*$_Hcau^g<#}>B`O<%^!yEq326~C>i8u5F}r{5Xo#-^(> zI;Kn5!i06qD!tJ~DJCRM8xyxz;3!4^e?H-6``@ic&rG||wA=95wd{#R2|xt1Bd6{@ z)6+{*Kw@TQX38omz~U19@W6AQpPv1UK`wAL7yt&h;Mn%X$*ZeJ&r1ojKOkHf88I53 z#Y)1out}JVz?@dAuj6klA%0gs_Y|q2xbB55j_=kQKm)z^`sjzKm@yg27W_x!Kfs2D zq9PnPd=^@Mv5ZGdbEqDbnwt6m%p%$Z0SrkX@)Kc~b)B&fD~K6nV9ldxp-s8d9RRe( zOMe(QOTbT0+1q-dom#<+Xx^s~%_}`<^l$U;a^gYq*=Ku=l)=ZGCLYZCA|b29miims z))IIAHvieX1Ab zI+D8qKV8{pX>B8YX}d6R`eZ}vr_adC9LZnd4%KMgf^O&du*;r%ut&>^op&P*(jLQ9 zJ-a`sptOuQs35=LX%R)vkJ28`VVl0;FhyM6@~>l7K;qW`i%02yp6_OPO9X?CnuT%r z^{74sYBM$w-|RB^+wZdYTwhLpemk=Epz-Dg!b%Xt!ZG*% zor>B211$=;J=#jVehC>cMFV%Jsl$7FmGs+;-=V!~`ZD5#Fv!Y$8~OQEx@4hSV2q&t zb*8ehR?b>%mEsQaido=!>4lL8^pQQrg}oQZ@1Kf7v&AyL9sZQLR1<#(V1lyu#q#=) zh_%{BbciWj_`~Aq1U^p-O>bw>U(FJr*U+LiZ38y_R&_3aXZSA@oU-@ZKX>=O{(e}O zAZrL&78 zag=9Hg~@hd5yx^@UM~C_z==`LREJ`8?>axaD~? zeS+MH*LfTwE=!^{jb`gzsh4SDJG=jGq@PR@QA^7q&qfl=-wh!ECkdp>-rVZ4Z#E`Z z8BC^ESI7LecM~T?-tJA6%|XS+teTWXxXictZ`L~jvAU&v_6t%1XUf+&&7B%;K>36yjm9^KR(2feO9gOQN&5}t0Ja-E!Xd&VIksPtSN5h z(c2eL+L>o}3b!EctdFOeqjOK~mQD_kphR4VzKA2Mx)Nrpng1Sg+Y;AamWcN!O>EPu z&tjhuN>HYPVR)v9IfQ8WHT6XVfwgvUjF=QqIxIuNm8O&g^0$_%(>p zi=qCH)M)5Avp@UC1^lbKF4^Db=6K@zO=WQ32NLEl4N3DWe~j{Nr#Dz@W)lCfe1I~U_QyIB+z$Yl_3gpQ3a_y~^^gBn7b4Zl5rwIT9`4>vKhy#tJR~kFuB~%mi(N{j<$WTHa*lQ+kdn5Yt zgzaL2$mnbK6RjwyN3!|kKTnzeY$D1ME?p^*MH*Pi2IM_n#*>; znA@4ei?*+d|F!W^_ONCzdIgwv-K?v#FCY1qRXl(7)%15YrM8;(gpwL~@cQiKB@Nad zTLhb$FH;+cERt<0vN_?OpLv?;K7z;vy*PK@kCaGCe#68V6-Kl;Th|Fx8rD~kb6-4X zvurQIiETs{E|;)k7L^yPzc4m`c}%vEB>mVfx>tT8G%|N~WYVo%2Uxl7#U}gtQrz{Y zRWB{%=k)-?R|F1UGcTVGt(ic_SsXT`KWo<0#MC^$m$rZ~Q}?C)@{DiQvvsjMXeY8R z*sUa_L+ST;Af6TqM!AL}eu;^TpNPnaq&<2xyCrrpwiw7Tlf`{y*bs1~eoS+?c-@OW zo&L~!a=x?iG%N|j1`PFrx&mm*HJ;}aFjC8aP^K3*hSQ&XcF7}&m)<6+kkMaf6}2LH|%s zNM_MV9hVN7lDUJs@HJ|)AG4i)c@nR2u|E7JLPJ09wx1~lmWq&_y;N6|aN(Jd%=wXJ zk;TSz&PRu`AyZtv|Nhlk+dfFB#Wa7b#VIh;&&*R#Lg*NNtSR!TGXw|!CQBCvhQ%0X zd4_-BB)6bk|6G(EcO!{)`jz>dq?tqdyprfXyU zT*%aklI?L(XFL+Uj^$w<-|OUn`)BiU0@P$#kAmTCPif)ew&9*~iXEZdlmZd~wBzgo z7o^8vl})i}-vYdwo9#KNGvPK|xskDzc4d#GD);4#e5!zQF{p$vWqSEG{-jSDNqgnaclZi#9lV6OA{RW^X&@ z<@2Q5^?~rP{eKxgPn9EwT`&=%r*}0L$D{jmk9ys|Y?5-#{+qs0iHi=FIHxaa#6h(G zNHc{gM~^+J?2tuFzU$Y5lkAggHaOyWPZiraF>763TPDQAQGr;lb>5~L5 zBM!tXC(aJd9Jl7}Lnqv1ESzB4t7W%_a%GnX{w-I6H)m*?>7as=xTzr8(qhZ#{_EX# z+QXAS*SHu?wXZ=N3PbI=)D3SYeZp7y-G#Fpz$mtz04*raaD7+Fn-l zYG^!&*Xod-jm;B;ae$QSRv_Jp&v83_qwKWSbWws#1>cdO;jw0wqjJ|Mw;ON~roJR( zn+vi{jqZPVDf^%zFpNjdvBFg^EuZxMa`F8+eF`1>OhK6|Uw44-#93hFDeU_gyKLUh zDgr$u>TTFBvDNn8&=BW#BUbK2=(md;c zo3CAtXLf^64!-bmt014H$VU=o7?#{{euHUKy?#*G-L!O`Du;}9NilX+k`xRZD5$z( zYSBfaOTPmYy)Xs8lG@wbA4b=J3Gorq-}VN$@9q5QR)VA}W%#DvzSYF??7?`0Z9f@> zjwSLitV}G9?+5-9DXxuXwE--S+Wm>c7ujdO%yzy?nW;a{Y@(!?h=7Nm1v~U}FwznN z5^|Krcqj4`!WI%5U4hxZj-c7?F&l(>Zggg4xBYyy#ypb}aUO*j1kY?rZ-_PU_J5*s z^_c?P#N6+5RFK*dA7PEWQ7=NN;qBS~KJeKiA@l zb5s3zZT5UMc41?HNO-a^R2X{knd`P)$&*aMM#d!g7coB0F|SVU0pnPruQ2pr){~UX z{cYIKsy8J1;#;==F%bCAk%zen+0w{Ej$X*q|9jd)ExNgPQ7)gfHKPyj3I6YI?8>S+ zTaK+ETRs+yPc=3vHy86NdGkZ^ZseQD#r>!Q?)ZjBLmM9SN_4r`H98KrAon!Y<)@m2 zNY!@ma#hz-`b_UafP#|yWQNMhL6JNw+vy*#YbzJ*=T>_h8RRwJ50MRkDm<$jh*+up zIv;$D^q?_iY+`q|j`z1jP61g=ThP;&<4Y%%E%CeTV@O$DP##Lyzsn5l^l5tz*7 z1l>8nR%J|a>WkiqQrd|&mKD02kar$C62qAU&@Q}F`vK%d9Z?pc*S~aN{>Og*W4B%6 zM$53_H{q4BlaSS2qZN-%o#lPZM`=)M>%oO3fs=Tafn zz*1=q7tm*z*IXUvwZ&@2DTK$4UB$M_31Cn48+}y8ln9Yne9Ql`|Wbc z<}#u2=o(`x8^p`WsmOwWy+g+ELyTb?bdb)*_eb(0>AkeOI6l|x?%XTyM$UrO$!VBe zzeYV2K_frAFCe&}s959It<}!8(E^?9YW$DdAPiBMXTj>XL}7Z;jFh=sBT=GMAl$Sh zz$H1APwv9Kr+oBU>-8sD_Q^z)*UdHELIT(vHS}ya%lTZyhH8i{O%CI|2p>Ha*L&>dO^3FcI8PwirS#Pm^_3%b9$Y$7rqcSP%hM&vo z)AG?J*lO>92MuL$yUW9CQ4N5cD+wb{R2zFQdsuArd7>IvXL_ZOov69_dGK3Sgc4hl z8pr!s;vW71VvDdoFL;0YO%J74o&^kW%K_Io?nxvQ^rjQVKS;#|sRuW8s&58`Di8_& zy#Of`M`iVIBL{6pff+gII(ZbwWVDk92)B&`g#1@>!}5P;i2f*m%iBq}BoZTWYq2|u zMel-G0zYYwfy5>;zenzy^50JCR=6CUKcV{^Fcm^e{80dUc7+g6+;f@!8h(6 z(~WkZR9Tw&F>9x%y9j-j@S!_ebF-mQ>QADVX0bU*oH4q2jRL7)x*uk|%dumFoj#z^dWC9!GUtoMCaWI1FRIa2F3-azY2=C6}Q1e&sm z!!y)^LFZ9<17Jsum6`Yk2~A~tQiC@P*6ZAl5Kuy&N*w-?ouSr%LFgLYTCT31a=Dl7 zvEJ%o>-|i$ua6&xdQWTa970_FoL*bZGgL!m0$+0}=QTEx{<3PIkErA-x-2_M9!-xukmqoB6!|3dKNlePhO>a4~@z(2aaN?TW_*I7<4xIm5 z`1+7Uvk3I34tR06myIH)49xF!n!!L1eJGXn-`z&?3|q{`yEx&|&#f0+jwbME%EXql z05ywC=^t_4T}f>pY({=eJp>kMMDzz=-+1fsrPRl#dCe*tFwa%#QBOfngH&WyXj_Hu zGDBE_*@_hkcjt0^n3OM5STiDGB%~C46gpXE$8p+Iy74C9Q}}^R>q@M`>V0%lpFHCi z$L&)LB98z2KG4^Ln-+8^T01@Yv_Sli7NpS-2jWWnhjm7&`139wG~lILys6}?Y!(5{TW{mt z{1&M4=YjZhQI)VpeeoinDoou#mrJ*CgB>-|1n`}L12XLZeB_fa%xdj!#&tS9to3o{ zO5yyMDvvF(hurvyH(QL)0NE z+FJ9vdN{P7n-g>@x7X<;ArLIMx{|zp#{qx0YA(+GwLe0azJEELk}%*wAYz3T&7uP1 zw#zH-!<7wvn+6HAD^LP8R*Td;w+eI=a~2N!Rg}F)=m_-I(As&8#K-=%@cYCk5)gT! z0?-qve6Tf|#zP4@g|#D_NR^4RM9Ee1qXWExsi6PDqU7}8dnvHiVPt8 z(0lvj-ZUCJhnNMK{+FS@O$+vszs06-b}$IY+(Ca|K;!RUp2ygV2|Pgj%SYP4{Tkeb z4wp&vq9fUb_FCosJCec++o$_q5x|xdhX0`RZ}%iMenC*U{d;Y0^%0W%S4gmZ>0HO= z&6tl0RHoXpNf7wUjaN`zwZyLq!n^*J8-h22BgCd@4*w0=d#qmjI?_X`zw>-q$6Uvn Wc$62r=5av4KXqjtrB4c0q5li^Po5V5 delta 111912 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 Ns;H$ Date: Fri, 28 Apr 2017 20:58:35 -0500 Subject: [PATCH 018/131] Syndie Lavaland Base Flavortext Edit --- code/modules/ruins/lavaland_ruin_code.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 376c8aa9f2..c0dae175f3 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -144,5 +144,9 @@ r_hand = /obj/item/weapon/melee/energy/sword/saber mask = /obj/item/clothing/mask/chameleon suit = /obj/item/clothing/suit/armor/vest - flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunatley, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base without good cause. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!" + flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. \n +\ + Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base, activate the self destruct device if you are compromised. \n +\ + Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail.\n +\ + Remember, an enemy of our enemy is a friend, so also provide support to those that hinder Nanotrasen unless commanded otherwise by HQ. \n +\ + Do not let the base fall into enemy hands!" pocket2 = /obj/item/weapon/card/id/syndicate/anyone From 941246e8fe2f3d369e9c84723d183437b417f84a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 20:59:39 -0500 Subject: [PATCH 019/131] Tank suicide no longer gibs w/o enough pressure --- code/game/objects/items/weapons/tanks/tanks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 0595076901..e5ffbade4c 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -116,7 +116,7 @@ var/mob/living/carbon/human/H = user user.visible_message("[user] is putting [src]'s valve to [user.p_their()] lips! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3) - if (H && !QDELETED(H)) + if (!QDELETED(H) && air_contents && air_contents.return_pressure() >= 1000) for(var/obj/item/W in H) H.dropItemToGround(W) if(prob(50)) From 307f7b001d57ee34001124170b0dd75a32e07a1e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 20:59:43 -0500 Subject: [PATCH 020/131] Makes it less painful to add songs to the disco machine --- code/game/machinery/dance_machine.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 8c935419a5..3397790f40 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -37,6 +37,20 @@ song_length = length song_beat = beat +/obj/machinery/disco/proc/add_track(file, name, length, beat) + var/sound/S = file + if(!istype(S)) + return + if(!name) + name = "[file]" + if(!beat) + beat = 5 + if(!length) + length = 2400 //Unless there's a way to discern via BYOND. + var/datum/track/T = new /datum/track(name, file, length, beat) + available |= T.song_name + songs += T + /obj/machinery/disco/Initialize() ..() selection = songs[1] From fb924f1f8ddeeecbbd71a385de49cfef32c56db5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:01:48 -0500 Subject: [PATCH 021/131] Blood Cult removals and tweaks --- code/game/gamemodes/cult/runes.dm | 57 +++++---------------------- code/game/gamemodes/cult/runes.dm.rej | 10 +++++ code/game/gamemodes/cult/talisman.dm | 22 ++--------- 3 files changed, 22 insertions(+), 67 deletions(-) create mode 100644 code/game/gamemodes/cult/runes.dm.rej diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 296b248938..3a80ed54b3 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -211,7 +211,7 @@ structure_check() searches for nearby cultist structures required for the invoca log_game("Talisman Creation rune failed - already in use") return - for(var/I in subtypesof(/obj/item/weapon/paper/talisman) - /obj/item/weapon/paper/talisman/malformed - /obj/item/weapon/paper/talisman/supply - /obj/item/weapon/paper/talisman/supply/weak) + for(var/I in subtypesof(/obj/item/weapon/paper/talisman) - /obj/item/weapon/paper/talisman/malformed - /obj/item/weapon/paper/talisman/supply - /obj/item/weapon/paper/talisman/supply/weak - /obj/item/weapon/paper/talisman/summon_tome) var/obj/item/weapon/paper/talisman/J = I var/talisman_cult_name = initial(J.cultist_name) if(talisman_cult_name) @@ -633,9 +633,9 @@ structure_check() searches for nearby cultist structures required for the invoca qdel(src) //delete before pulsing because it's a delay reee empulse(E, 9*invokers.len, 12*invokers.len) // Scales now, from a single room to most of the station depending on # of chanters -//Rite of Astral Communion: Separates one's spirit from their body. They will take damage while it is active. -/obj/effect/rune/astral - cultist_name = "Astral Communion" +//Rite of Spirit Sight: Separates one's spirit from their body. They will take damage while it is active. +/obj/effect/rune/spirit + cultist_name = "Spirit Sight" cultist_desc = "severs the link between one's spirit and body. This effect is taxing and one's physical body will take damage while this is active." invocation = "Fwe'sh mah erl nyag r'ya!" icon_state = "7" @@ -644,24 +644,24 @@ structure_check() searches for nearby cultist structures required for the invoca construct_invoke = 0 var/mob/living/affecting = null -/obj/effect/rune/astral/examine(mob/user) +/obj/effect/rune/spirit/examine(mob/user) ..() if(affecting) to_chat(user, "A translucent field encases [user] above the rune!") -/obj/effect/rune/astral/can_invoke(mob/living/user) +/obj/effect/rune/spirit/can_invoke(mob/living/user) if(rune_in_use) to_chat(user, "[src] cannot support more than one body!") - log_game("Astral Communion rune failed - more than one user") + log_game("Spirit Sight rune failed - more than one user") return list() var/turf/T = get_turf(src) if(!(user in T)) to_chat(user, "You must be standing on top of [src]!") - log_game("Astral Communion rune failed - user not standing on rune") + log_game("Spirit Sight rune failed - user not standing on rune") return list() return ..() -/obj/effect/rune/astral/invoke(var/list/invokers) +/obj/effect/rune/spirit/invoke(var/list/invokers) var/mob/living/user = invokers[1] ..() var/turf/T = get_turf(src) @@ -898,45 +898,6 @@ structure_check() searches for nearby cultist structures required for the invoca if(is_servant_of_ratvar(L)) L.adjustStaminaLoss(tick_damage*0.5) - -//Deals brute damage to all targets on the rune and heals the invoker for each target drained. -/obj/effect/rune/leeching - cultist_name = "Drain Life" - cultist_desc = "drains the life of all targets on the rune, restoring life to the user." - invocation = "Yu'gular faras desdae. Umathar uf'kal thenar!" - icon_state = "3" - color = "#9F1C34" - -/obj/effect/rune/leeching/can_invoke(mob/living/user) - if(world.time <= user.next_move) - return list() - var/turf/T = get_turf(src) - var/list/potential_targets = list() - for(var/mob/living/carbon/M in T.contents - user) - if(M.stat != DEAD) - potential_targets += M - if(!potential_targets.len) - to_chat(user, "There must be at least one valid target on the rune!") - log_game("Leeching rune failed - no valid targets") - return list() - return ..() - -/obj/effect/rune/leeching/invoke(var/list/invokers) - var/mob/living/user = invokers[1] - user.changeNext_move(CLICK_CD_CLICK_ABILITY) - ..() - var/turf/T = get_turf(src) - for(var/mob/living/carbon/M in T.contents - user) - if(M.stat != DEAD) - var/drained_amount = rand(10,20) - M.apply_damage(drained_amount, BRUTE, "chest") - user.adjustBruteLoss(-drained_amount) - to_chat(M, "You feel extremely weak.") - user.Beam(T,icon_state="drainbeam",time=5) - user.visible_message("Blood flows from the rune into [user]!", \ - "Blood flows into you, healing your wounds and revitalizing your spirit.") - - //Rite of Spectral Manifestation: Summons a ghost on top of the rune as a cultist human with no items. User must stand on the rune at all times, and takes damage for each summoned ghost. /obj/effect/rune/manifest cultist_name = "Manifest Spirit" diff --git a/code/game/gamemodes/cult/runes.dm.rej b/code/game/gamemodes/cult/runes.dm.rej new file mode 100644 index 0000000000..696dbe5ddd --- /dev/null +++ b/code/game/gamemodes/cult/runes.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm (rejected hunks) +@@ -520,7 +520,7 @@ var/list/teleport_runes = list() + + //Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people sacrificed + /obj/effect/rune/raise_dead +- cultist_name = "Raise Dead" ++ cultist_name = "Resurrect Cultist" + cultist_desc = "requires the corpse of a cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be revived." + invocation = null //Depends on the name of the user - see below + icon_state = "1" diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 2876e80373..2411f0c40d 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -176,7 +176,7 @@ invocation = "Kla'atu barada nikt'o!" health_cost = 1 creation_time = 30 - uses = 2 + uses = 6 var/revealing = FALSE //if it reveals or not /obj/item/weapon/paper/talisman/true_sight/invoke(mob/living/user, successfuluse = 1) @@ -186,7 +186,7 @@ "You speak the words of the talisman, hiding nearby runes.") invocation = "Nikt'o barada kla'atu!" revealing = TRUE - for(var/obj/effect/rune/R in range(3,user)) + for(var/obj/effect/rune/R in range(4,user)) R.talismanhide() else user.visible_message("A flash of light shines from [user]'s hand!", \ @@ -194,22 +194,6 @@ for(var/obj/effect/rune/R in range(3,user)) R.talismanreveal() -//Rite of False Truths: Same as rune -/obj/item/weapon/paper/talisman/make_runes_fake - cultist_name = "Talisman of Disguising" - cultist_desc = "A talisman that will make nearby runes appear fake." - color = "#ff80d5" // honk - invocation = "By'o nar'nar!" - creation_time = 20 - -/obj/item/weapon/paper/talisman/make_runes_fake/invoke(mob/living/user, successfuluse = 1) - . = ..() - user.visible_message("Dust flows from [user]s hand.", \ - "You speak the words of the talisman, making nearby runes appear fake.") - for(var/obj/effect/rune/R in orange(6,user)) - R.desc = "A rune vandalizing the station." - - //Rite of Disruption: Weaker than rune /obj/item/weapon/paper/talisman/emp cultist_name = "Talisman of Electromagnetic Pulse" @@ -379,7 +363,7 @@ cultist_desc = "Use this talisman on a victim to handcuff them with dark bindings." invocation = "In'totum Lig'abis!" color = "#B27300" // burnt-orange - uses = 4 + uses = 6 /obj/item/weapon/paper/talisman/shackle/invoke(mob/living/user, successfuluse = 0) if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff From 29fd2c6de6afc51db27f08a8eb492290f7fc6823 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:02:52 -0500 Subject: [PATCH 022/131] Option for admins to show a song's title --- code/modules/admin/verbs/playsound.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index cb2d0553b1..ddc44592c0 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -4,9 +4,6 @@ if(!check_rights(R_SOUNDS)) return - log_admin("[key_name(src)] played sound [S]") - message_admins("[key_name_admin(src)] played sound [S]") - var/freq = 1 if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS]) freq = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5) @@ -20,6 +17,16 @@ admin_sound.wait = 1 admin_sound.repeat = 0 admin_sound.status = SOUND_STREAM + + var/res = alert(usr, "Show the title of this song to the players?",, "No", "Yes", "Cancel") + switch(res) + if("Yes") + to_chat(world, "An admin played: [S]") + if("Cancel") + return + + log_admin("[key_name(src)] played sound [S]") + message_admins("[key_name_admin(src)] played sound [S]") for(var/mob/M in GLOB.player_list) if(M.client.prefs.toggles & SOUND_MIDI) From e1883354baecb57091ffba8ea2860ae76bd9c062 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:03:57 -0500 Subject: [PATCH 023/131] Nerfs and buffs The Traps --- code/game/gamemodes/wizard/spellbook.dm | 2 +- code/game/objects/structures/traps.dm | 23 ++++++++++++++++---- code/modules/spells/spell_types/conjure.dm | 5 +++++ code/modules/spells/spell_types/the_traps.dm | 11 ++++++---- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index e9e1a95e73..fe2c0cde56 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -253,7 +253,7 @@ /datum/spellbook_entry/the_traps name = "The Traps!" spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/the_traps - category = "Offensive" + category = "Defensive" cost = 1 diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index 90500f14db..dad4e9b53e 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -8,8 +8,10 @@ alpha = 30 //initially quite hidden when not "recharging" var/last_trigger = 0 var/time_between_triggers = 600 //takes a minute to recharge + var/charges = INFINITY var/list/static/ignore_typecache + var/list/mob/immune_minds = list() var/datum/effect_system/spark_spread/spark_system @@ -30,9 +32,11 @@ . = ..() /obj/structure/trap/examine(mob/user) - ..() + . = ..() if(!isliving(user)) return + if(user.mind && user.mind in immune_minds) + return if(get_dist(user, src) <= 1) to_chat(user, "You reveal [src]!") flare() @@ -41,10 +45,15 @@ // Makes the trap visible, and starts the cooldown until it's // able to be triggered again. visible_message("[src] flares brightly!") - alpha = 200 - animate(src, alpha = initial(alpha), time = time_between_triggers) - last_trigger = world.time spark_system.start() + alpha = 200 + last_trigger = world.time + charges-- + if(charges <= 0) + animate(src, alpha = 0, time = 10) + QDEL_IN(src, 10) + else + animate(src, alpha = initial(alpha), time = time_between_triggers) /obj/structure/trap/Crossed(atom/movable/AM) if(last_trigger + time_between_triggers > world.time) @@ -52,6 +61,12 @@ // Don't want the traps triggered by sparks, ghosts or projectiles. if(is_type_in_typecache(AM, ignore_typecache)) return + if(ismob(AM)) + var/mob/M = AM + if(M.mind in immune_minds) + return + if(charges <= 0) + return flare() if(isliving(AM)) trap_effect(AM) diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm index 4785ebdc6f..f3f628e5d9 100644 --- a/code/modules/spells/spell_types/conjure.dm +++ b/code/modules/spells/spell_types/conjure.dm @@ -42,6 +42,11 @@ if(summon_lifespan) QDEL_IN(summoned_object, summon_lifespan) + post_summon(summoned_object, user) + +/obj/effect/proc_holder/spell/aoe_turf/conjure/proc/post_summon(atom/summoned_object, mob/user) + return + /obj/effect/proc_holder/spell/aoe_turf/conjure/summonEdSwarm //test purposes - Also a lot of fun name = "Dispense Wizard Justice" desc = "This spell dispenses wizard justice." diff --git a/code/modules/spells/spell_types/the_traps.dm b/code/modules/spells/spell_types/the_traps.dm index ca3da76617..169a38bb95 100644 --- a/code/modules/spells/spell_types/the_traps.dm +++ b/code/modules/spells/spell_types/the_traps.dm @@ -3,7 +3,7 @@ desc = "Summon a number of traps to confuse and weaken your enemies, and possibly you." charge_max = 250 - cooldown_min = 100 + cooldown_min = 50 clothes_req = 1 invocation = "CAVERE INSIDIAS" @@ -14,10 +14,13 @@ /obj/structure/trap/stun, /obj/structure/trap/fire, /obj/structure/trap/chill, - /obj/structure/trap/damage, - /obj/structure/swarmer/trap + /obj/structure/trap/damage ) - summon_lifespan = 0 + summon_lifespan = 3000 summon_amt = 5 action_icon_state = "the_traps" + +/obj/effect/proc_holder/spell/aoe_turf/conjure/the_traps/post_summon(obj/structure/trap/T, mob/user) + T.immune_minds += user.mind + T.charges = 1 From 532af461f1be63242faa594dabca747db48a940d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:04:00 -0500 Subject: [PATCH 024/131] Adds death checks to two hallucinations, preventing the dead from spasming --- code/modules/flufftext/Hallucination.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index cd034a1117..4c1328a38b 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -178,7 +178,7 @@ Gunshots/explosions/opening doors/less rare audio (done) /obj/effect/hallucination/simple/xeno/throw_impact(A) update_icon("alienh_pounce") - if(A == target) + if(A == target && target.stat!=DEAD) target.Weaken(5) target.visible_message("[target] flails around wildly.","[name] pounces on you!") @@ -286,7 +286,7 @@ Gunshots/explosions/opening doors/less rare audio (done) bubblegum = new(wall, target) sleep(10) //ominous wait var/charged = FALSE //only get hit once - while(get_turf(bubblegum) != landing && target) + while(get_turf(bubblegum) != landing && target && target.stat != DEAD) bubblegum.forceMove(get_step_towards(bubblegum, landing)) bubblegum.setDir(get_dir(bubblegum, landing)) target.playsound_local(get_turf(bubblegum), 'sound/effects/meteorimpact.ogg', 150, 1) From 15229c3ca1785bb6a77e30072edd65165094b092 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:06:11 -0500 Subject: [PATCH 025/131] Gives Backup Shuttle Lighting and Fixes Auxiliary Tool Storage Plating on Delta --- .../map_files/Deltastation/DeltaStation2.dmm | 4 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 14 ++--- .../OmegaStation/OmegaStation.dmm.rej | 60 +++++++++++++++++++ _maps/map_files/generic/Centcomm.dmm | 18 +++++- 4 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 _maps/map_files/OmegaStation/OmegaStation.dmm.rej diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2e275a194f..c46f6ea830 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -44697,9 +44697,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating, /area/maintenance/starboard) "bGN" = ( /obj/effect/decal/cleanable/dirt, diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index d841a0f335..0e3fea852f 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -72622,11 +72622,11 @@ aHl aIi aJs aKz -buW +buX aMR buZ -buZ -buW +bva +bvb aQL aRI aSS @@ -72883,7 +72883,7 @@ aLP aMS aMS aOC -buW +bvc aQM aRJ aST @@ -73911,7 +73911,7 @@ aLT aMW aMW aOD -buW +bve aQQ aRN aSX @@ -74164,11 +74164,11 @@ aHr aIo aJw aKE -buW +buY aMX aMX aMX -buW +bvf aQR aRO aSY diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm.rej b/_maps/map_files/OmegaStation/OmegaStation.dmm.rej new file mode 100644 index 0000000000..c23bd7e4c5 --- /dev/null +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm.rej @@ -0,0 +1,60 @@ +diff a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm (rejected hunks) +@@ -41755,58 +41743,6 @@ + "bvf" = ( + /turf/closed/wall/r_wall, + /area/engine/supermatter) +-"bvg" = ( +-/obj/machinery/light{ +- dir = 1 +- }, +-/turf/open/floor/plasteel/neutral/side{ +- dir = 1 +- }, +-/area/shuttle/escape) +-"bvh" = ( +-/obj/structure/chair{ +- dir = 8 +- }, +-/obj/effect/turf_decal/bot, +-/obj/machinery/light/small{ +- dir = 4 +- }, +-/turf/open/floor/plasteel, +-/area/shuttle/escape) +-"bvi" = ( +-/obj/structure/chair{ +- dir = 4 +- }, +-/obj/effect/turf_decal/bot, +-/obj/machinery/light/small{ +- dir = 8 +- }, +-/turf/open/floor/plasteel, +-/area/shuttle/escape) +-"bvj" = ( +-/obj/structure/chair{ +- dir = 8 +- }, +-/obj/effect/turf_decal/bot, +-/obj/machinery/light/small{ +- dir = 4 +- }, +-/turf/open/floor/plasteel, +-/area/shuttle/escape) +-"bvk" = ( +-/obj/structure/chair{ +- dir = 4 +- }, +-/obj/effect/turf_decal/bot, +-/obj/machinery/light/small{ +- dir = 8 +- }, +-/turf/open/floor/plasteel, +-/area/shuttle/escape) +-"bvl" = ( +-/obj/machinery/light, +-/turf/open/floor/plasteel/neutral/side, +-/area/shuttle/escape) + + (1,1,1) = {" + aaa diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 6782e4cce4..e6e1e5022d 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -14883,6 +14883,20 @@ /obj/machinery/computer/emergency_shuttle, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"Me" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) +"Mf" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/escape) (1,1,1) = {" aa @@ -64444,7 +64458,7 @@ Fa Fh Fh Fh -Fh +Me Fh Fh Fa @@ -65729,7 +65743,7 @@ Fa Md Fp FC -Fh +Mf Fh Fh Fa From b7f125af9b04aba800bfc65336f63af30818c336 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:07:20 -0500 Subject: [PATCH 026/131] Makes dance machine GBP requirements track-based instead of hardcoded --- code/game/machinery/dance_machine.dm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 8c935419a5..c160b4b8eb 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -13,7 +13,6 @@ var/list/rangers = list() var/charge = 35 var/stop = 0 - var/list/available = list() var/list/select_name = list() var/list/spotlights = list() var/list/sparkles = list() @@ -30,6 +29,7 @@ var/song_path = null var/song_length = 0 var/song_beat = 0 + var/GBP_required = 0 /datum/track/New(name, path, length, beat) song_name = name @@ -126,7 +126,10 @@ if(active) to_chat(usr, "Error: You cannot change the song until the current one is over.") return - check_GBP() + + var/list/available = list() + for(var/datum/track/S in songs) + available += S.song_name select_name = input(usr, "Choose your song", "Track:") as null|anything in available if (QDELETED(src)) return @@ -159,13 +162,6 @@ charge -= 5 playsound(src, S,300,1) -/obj/machinery/disco/proc/check_GBP() - available |= "Engineering's Basic Beat" - available |= "Engineering's Domination Dance" - available |= "Engineering's Superiority Shimmy" - available |= "Engineering's Ultimate High-Energy Hustle" - - /obj/machinery/disco/proc/dance_setup() stop = world.time + selection.song_length var/turf/cen = get_turf(src) From bd4c8dc6c33feef154c40b6f3d389b80f17b8f1a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:08:24 -0500 Subject: [PATCH 027/131] Replaces Double Agents with Internal Affairs --- code/game/gamemodes/traitor/double_agents.dm | 37 ++++++++++++++------ code/game/gamemodes/traitor/traitor.dm | 11 +++--- config/game_options.txt | 2 +- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index 992e10fa22..cb6609ebe6 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -1,22 +1,24 @@ -/datum/game_mode/traitor/double_agents - name = "double agents" - config_tag = "double_agents" +/datum/game_mode/traitor/internal_affairs + name = "Internal Affairs" + config_tag = "internal_affairs" + employer = "Internal Affairs" required_players = 25 required_enemies = 5 recommended_enemies = 8 reroll_friendly = 0 + traitor_name = "Nanotrasen Internal Affairs Agent" traitors_possible = 10 //hard limit on traitors if scaling is turned off num_modifier = 4 // Four additional traitors - announce_text = "There are double agents trying to kill each other!\n\ - Traitors: Eliminate your targets and protect yourself!\n\ - Crew: Stop the double agents before they can cause too much mayhem." + announce_text = "There are Nanotrasen Internal Affairs Agents trying to kill each other!\n\ + IAA: Eliminate your targets and protect yourself!\n\ + Crew: Stop the IAA agents before they can cause too much mayhem." var/list/target_list = list() var/list/late_joining_list = list() -/datum/game_mode/traitor/double_agents/post_setup() +/datum/game_mode/traitor/internal_affairs/post_setup() var/i = 0 for(var/datum/mind/traitor in traitors) i++ @@ -25,7 +27,7 @@ target_list[traitor] = traitors[i + 1] ..() -/datum/game_mode/traitor/double_agents/forge_traitor_objectives(datum/mind/traitor) +/datum/game_mode/traitor/internal_affairs/forge_traitor_objectives(datum/mind/traitor) if(target_list.len && target_list[traitor]) // Is a double agent @@ -58,7 +60,7 @@ ..() // Give them standard objectives. return -/datum/game_mode/traitor/double_agents/add_latejoin_traitor(datum/mind/character) +/datum/game_mode/traitor/internal_affairs/add_latejoin_traitor(datum/mind/character) check_potential_agents() @@ -87,7 +89,7 @@ late_joining_list += character return -/datum/game_mode/traitor/double_agents/proc/check_potential_agents() +/datum/game_mode/traitor/internal_affairs/proc/check_potential_agents() for(var/M in late_joining_list) if(istype(M, /datum/mind)) @@ -100,3 +102,18 @@ // If any check fails, remove them from our list late_joining_list -= M + + +/datum/game_mode/traitor/internal_affairs/greet_traitor(datum/mind/traitor) + var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "embezzlement", "piloting under the influence", "dereliction of duty", "syndicate collaboration", "mutiny", "multiple homicides", "corporate espionage", "recieving bribes", "malpractice", "worship of prohbited life forms", "possession of profane texts", "murder", "arson", "insulting their manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence") + to_chat(traitor.current, "You are the [traitor_name].") + to_chat(traitor.current, "Your target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.") + to_chat(traitor.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") + to_chat(traitor.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") + to_chat(traitor.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") + traitor.announce_objectives() + + + +/datum/game_mode/traitor/internal_affairs/give_codewords(mob/living/traitor_mob) + return \ No newline at end of file diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index c26945801b..7c0327076e 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -1,5 +1,6 @@ /datum/game_mode var/traitor_name = "traitor" + var/employer = "The Syndicate" var/list/datum/mind/traitors = list() var/datum/mind/exchange_red @@ -213,7 +214,7 @@ ..() return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. -/proc/give_codewords(mob/living/traitor_mob) +/datum/game_mode/proc/give_codewords(mob/living/traitor_mob) to_chat(traitor_mob, "The Syndicate provided you with the following information on how to identify their agents:") to_chat(traitor_mob, "Code Phrase: [GLOB.syndicate_code_phrase]") to_chat(traitor_mob, "Code Response: [GLOB.syndicate_code_response]") @@ -335,7 +336,7 @@ uplink_loc = R if (!uplink_loc) - to_chat(traitor_mob, "Unfortunately, the Syndicate wasn't able to get you an Uplink.") + to_chat(traitor_mob, "Unfortunately, [employer] wasn't able to get you an Uplink.") . = 0 else var/obj/item/device/uplink/U = new(uplink_loc) @@ -345,19 +346,19 @@ if(uplink_loc == R) R.traitor_frequency = sanitize_frequency(rand(MIN_FREQ, MAX_FREQ)) - to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(R.traitor_frequency)] to unlock its hidden features.") + to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(R.traitor_frequency)] to unlock its hidden features.") traitor_mob.mind.store_memory("Radio Frequency: [format_frequency(R.traitor_frequency)] ([R.name]).") else if(uplink_loc == PDA) PDA.lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" - to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.") + to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Passcode: [PDA.lock_code] ([PDA.name]).") else if(uplink_loc == P) P.traitor_unlock_degrees = rand(1, 360) - to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [P.traitor_unlock_degrees] from its starting position to unlock its hidden features.") + to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [P.traitor_unlock_degrees] from its starting position to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Degrees: [P.traitor_unlock_degrees] ([P.name]).") if(!safety) // If they are not a rev. Can be added on to. diff --git a/config/game_options.txt b/config/game_options.txt index 45af9610fb..356dc1acab 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -78,7 +78,7 @@ ALERT_DELTA Destruction of the station is imminent. All crew are instructed to o PROBABILITY TRAITOR 5 PROBABILITY TRAITORCHAN 4 -PROBABILITY DOUBLE_AGENTS 3 +PROBABILITY INTERNAL_AFFAIRS 3 PROBABILITY NUCLEAR 2 PROBABILITY REVOLUTION 2 PROBABILITY GANG 2 From 480b4db2e1fc20b178e10c829cc87bcbd28984c0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:11:31 -0500 Subject: [PATCH 028/131] Cult Construct Non-Balance Update --- code/_onclick/hud/_defines.dm | 4 +++ code/_onclick/hud/constructs.dm | 18 +++++++++++ code/_onclick/hud/constructs.dm.rej | 25 ++++++++++++++++ code/_onclick/hud/screen_objects.dm | 6 ++++ .../mob/living/simple_animal/constructs.dm | 28 ++++++++++++++++-- .../living/simple_animal/constructs.dm.rej | 9 ++++++ .../living/simple_animal/hostile/statue.dm | 2 +- icons/mob/screen_construct.dmi | Bin 0 -> 12327 bytes tgstation.dme | 1 + 9 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 code/_onclick/hud/constructs.dm create mode 100644 code/_onclick/hud/constructs.dm.rej create mode 100644 code/modules/mob/living/simple_animal/constructs.dm.rej create mode 100644 icons/mob/screen_construct.dmi diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 90c953a110..8c62d68963 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -111,6 +111,10 @@ #define ui_alienplasmadisplay "EAST-1:28,CENTER-2:15" #define ui_alien_queen_finder "EAST-1:28,CENTER-3:15" +//constructs +#define ui_construct_pull "EAST,CENTER-2:15" +#define ui_construct_health "EAST,CENTER:15" //same as borgs and humans + // AI #define ui_ai_core "SOUTH:6,WEST" diff --git a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm new file mode 100644 index 0000000000..dc3cea7f99 --- /dev/null +++ b/code/_onclick/hud/constructs.dm @@ -0,0 +1,18 @@ + +/datum/hud/construct + ui_style_icon = 'icons/mob/screen_construct.dmi' + +/datum/hud/construct/New(mob/owner) + ..() + pull_icon = new /obj/screen/pull() + pull_icon.icon = ui_style_icon + pull_icon.update_icon(mymob) + pull_icon.screen_loc = ui_pull_resist + static_inventory += pull_icon + + healths = new /obj/screen/healths/construct() + infodisplay += healths + +/mob/living/simple_animal/hostile/construct/create_mob_hud() + if(client && !hud_used) + hud_used = new /datum/hud/construct(src) diff --git a/code/_onclick/hud/constructs.dm.rej b/code/_onclick/hud/constructs.dm.rej new file mode 100644 index 0000000000..1ea29cde32 --- /dev/null +++ b/code/_onclick/hud/constructs.dm.rej @@ -0,0 +1,25 @@ +diff a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm (rejected hunks) +@@ -1,18 +1,18 @@ + + /datum/hud/constructs + ui_style_icon = 'icons/mob/screen_construct.dmi' +- ++ + /datum/hud/constructs/New(mob/owner) + ..() + pull_icon = new /obj/screen/pull() +- pull_icon.icon = ui_style_icon ++ pull_icon.icon = 'icons/mob/screen_construct.dmi' + pull_icon.update_icon(mymob) +- pull_icon.screen_loc = ui_pull_resist ++ pull_icon.screen_loc = ui_construct_pull + static_inventory += pull_icon +- ++ + healths = new /obj/screen/healths/construct() + infodisplay += healths +- ++ + /mob/living/simple_animal/hostile/construct/create_mob_hud() + if(client && !hud_used) + hud_used = new /datum/hud/constructs(src) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 81754efc93..bfab19ba5f 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -532,6 +532,12 @@ screen_loc = ui_health mouse_opacity = 0 +/obj/screen/healths/construct + icon = 'icons/mob/screen_construct.dmi' + icon_state = "artificer_health0" + screen_loc = ui_construct_health + mouse_opacity = 0 + /obj/screen/healthdoll name = "health doll" screen_loc = ui_healthdoll diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index edb12a3fef..b879f1baf6 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -14,7 +14,8 @@ stop_automated_movement = 1 status_flags = CANPUSH attack_sound = 'sound/weapons/punch1.ogg' - see_in_dark = 7 + see_in_dark = 7 + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 @@ -83,7 +84,11 @@ /mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE) return 0 - + +/mob/living/simple_animal/hostile/construct/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + if(updating_health) + update_health_hud() /////////////////Juggernaut/////////////// /mob/living/simple_animal/hostile/construct/armored @@ -268,3 +273,22 @@ /mob/living/simple_animal/hostile/construct/harvester/hostile //actually hostile, will move around, hit things AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP + + + +/////////////////////////////ui stuff///////////////////////////// + +/mob/living/simple_animal/hostile/construct/update_health_hud() + if(hud_used) + if(health >= maxHealth) + hud_used.healths.icon_state = "[icon_state]_health0" + else if(health > maxHealth*0.8) + hud_used.healths.icon_state = "[icon_state]_health2" + else if(health > maxHealth*0.6) + hud_used.healths.icon_state = "[icon_state]_health3" + else if(health > maxHealth*0.4) + hud_used.healths.icon_state = "[icon_state]_health4" + else if(health > maxHealth*0.2) + hud_used.healths.icon_state = "[icon_state]_health5" + else + hud_used.healths.icon_state = "[icon_state]_health6" \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/constructs.dm.rej b/code/modules/mob/living/simple_animal/constructs.dm.rej new file mode 100644 index 0000000000..d200533753 --- /dev/null +++ b/code/modules/mob/living/simple_animal/constructs.dm.rej @@ -0,0 +1,9 @@ +diff a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm (rejected hunks) +@@ -35,7 +35,6 @@ + + /mob/living/simple_animal/hostile/construct/Initialize() + . = ..() +- updateglow() + update_health_hud() + for(var/spell in construct_spells) + AddSpell(new spell(null)) diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 455f893a5c..a810d3fd67 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -220,7 +220,7 @@ else target.lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE name = "Toggle Nightvision \[ON]" - target.update_sight() + target.update_sight() /mob/living/simple_animal/hostile/statue/sentience_act() faction -= "neutral" diff --git a/icons/mob/screen_construct.dmi b/icons/mob/screen_construct.dmi new file mode 100644 index 0000000000000000000000000000000000000000..82dbe19cf65bdc3b3ffb964a5515b95f0edd226a GIT binary patch literal 12327 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 S0saF3L|4m5vqIz1%l`%K2^yOK literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 1647912f6c..f1439e8d5e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -137,6 +137,7 @@ #include "code\_onclick\hud\blob_overmind.dm" #include "code\_onclick\hud\blobbernauthud.dm" #include "code\_onclick\hud\clockwork_marauder.dm" +#include "code\_onclick\hud\constructs.dm" #include "code\_onclick\hud\devil.dm" #include "code\_onclick\hud\drones.dm" #include "code\_onclick\hud\fullscreen.dm" From 4da74143398a326efde068c0c74b1045d7e772f0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 03:46:03 -0500 Subject: [PATCH 029/131] Old ore processor cleanup --- code/__DEFINES/machines.dm | 1 + code/datums/material_container.dm | 18 +- .../mining/machine_input_output_plates.dm | 4 +- code/modules/mining/machine_processing.dm | 528 ++++++------------ .../research/designs/smelting_designs.dm | 18 + code/modules/research/research.dm | 15 + tgstation.dme | 1 + 7 files changed, 206 insertions(+), 379 deletions(-) create mode 100644 code/modules/research/designs/smelting_designs.dm diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 004ea378da..9524fc9a43 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -23,6 +23,7 @@ #define MECHFAB 16 //Remember, objects utilising this flag should have construction_time and construction_cost vars. #define BIOGENERATOR 32 //Uses biomass #define LIMBGROWER 64 //Uses synthetic flesh +#define SMELTER 128 //uses various minerals //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable. //Modular computer/NTNet defines diff --git a/code/datums/material_container.dm b/code/datums/material_container.dm index af227212a7..76de0329cd 100644 --- a/code/datums/material_container.dm +++ b/code/datums/material_container.dm @@ -136,7 +136,7 @@ return FALSE //For spawning mineral sheets; internal use only -/datum/material_container/proc/retrieve(sheet_amt, datum/material/M) +/datum/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null) if(!M.sheet_type) return 0 if(sheet_amt > 0) @@ -149,26 +149,28 @@ use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id) sheet_amt -= MAX_STACK_SIZE if(round((sheet_amt * MINERAL_MATERIAL_AMOUNT) / MINERAL_MATERIAL_AMOUNT)) - new M.sheet_type(get_turf(owner), sheet_amt) + var/obj/item/stack/sheet/s = new M.sheet_type(get_turf(owner), sheet_amt) + if(target) + s.forceMove(target) count += sheet_amt use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id) return count return 0 -/datum/material_container/proc/retrieve_sheets(sheet_amt, id) +/datum/material_container/proc/retrieve_sheets(sheet_amt, id, target = null) if(materials[id]) - return retrieve(sheet_amt, materials[id]) + return retrieve(sheet_amt, materials[id], target) return 0 -/datum/material_container/proc/retrieve_amount(amt, id) - return retrieve_sheets(amount2sheet(amt), id) +/datum/material_container/proc/retrieve_amount(amt, id, target) + return retrieve_sheets(amount2sheet(amt), id, target) -/datum/material_container/proc/retrieve_all() +/datum/material_container/proc/retrieve_all(target = null) var/result = 0 var/datum/material/M for(var/MAT in materials) M = materials[MAT] - result += retrieve_sheets(amount2sheet(M.amount), MAT) + result += retrieve_sheets(amount2sheet(M.amount), MAT, target) return result /datum/material_container/proc/has_space(amt = 0) diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm index a2e5e9ad3c..7e888217a1 100644 --- a/code/modules/mining/machine_input_output_plates.dm +++ b/code/modules/mining/machine_input_output_plates.dm @@ -25,7 +25,7 @@ var/output_dir = SOUTH /obj/machinery/mineral/proc/unload_mineral(atom/movable/S) - S.loc = loc + S.forceMove(loc) var/turf/T = get_step(src,output_dir) if(T) - S.loc = T \ No newline at end of file + S.forceMove(T) \ No newline at end of file diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 8b4903259e..e62392a8c8 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -1,3 +1,5 @@ +#define SMELT_AMOUNT 10 + /**********************Mineral processing unit console**************************/ /obj/machinery/mineral/processing_unit_console @@ -10,182 +12,50 @@ var/machinedir = EAST speed_process = 1 -/obj/machinery/mineral/processing_unit_console/New() - ..() - spawn(7) - src.machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir)) - if (machine) - machine.CONSOLE = src - else - qdel(src) +/obj/machinery/mineral/processing_unit_console/Initialize() + . = ..() + machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir)) + if (machine) + machine.CONSOLE = src + else + qdel(src) /obj/machinery/mineral/processing_unit_console/attack_hand(mob/user) - var/dat = "Smelter control console

" - //iron - if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_adamantine) - if(machine.ore_iron) - if (machine.selected_iron==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Iron: [machine.ore_iron]
" - else - machine.selected_iron = 0 - - //sand - glass - if(machine.ore_glass) - if (machine.selected_glass==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Sand: [machine.ore_glass]
" - else - machine.selected_glass = 0 - - //plasma - if(machine.ore_plasma) - if (machine.selected_plasma==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Plasma: [machine.ore_plasma]
" - else - machine.selected_plasma = 0 - - //uranium - if(machine.ore_uranium) - if (machine.selected_uranium==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Uranium: [machine.ore_uranium]
" - else - machine.selected_uranium = 0 - - //gold - if(machine.ore_gold) - if (machine.selected_gold==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Gold: [machine.ore_gold]
" - else - machine.selected_gold = 0 - - //silver - if(machine.ore_silver) - if (machine.selected_silver==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Silver: [machine.ore_silver]
" - else - machine.selected_silver = 0 - - //diamond - if(machine.ore_diamond) - if (machine.selected_diamond==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Diamond: [machine.ore_diamond]
" - else - machine.selected_diamond = 0 - - //bananium - if(machine.ore_clown) - if (machine.selected_clown==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Bananium: [machine.ore_clown]
" - else - machine.selected_clown = 0 - - //titanium - if(machine.ore_titanium) - if (machine.selected_titanium==1) - dat += "Smelting " - else - dat += "Not smelting " - dat += "Titanium: [machine.ore_titanium]
" - else - machine.selected_titanium = 0 - - - //On or off - dat += text("Machine is currently ") - if (machine.on==1) - dat += text("On ") - else - dat += text("Off ") - else - dat+="---No Materials Loaded---" - - - user << browse(dat, "window=console_processing_unit") + if(!machine) + return + var/dat = machine.get_machine_data() + var/datum/browser/popup = new(user, "processing", "Smelting Console", 300, 500) + popup.set_content(dat) + popup.open() /obj/machinery/mineral/processing_unit_console/Topic(href, href_list) if(..()) return usr.set_machine(src) - src.add_fingerprint(usr) - if(href_list["sel_iron"]) - if (href_list["sel_iron"] == "yes") - machine.selected_iron = 1 - else - machine.selected_iron = 0 - if(href_list["sel_glass"]) - if (href_list["sel_glass"] == "yes") - machine.selected_glass = 1 - else - machine.selected_glass = 0 - if(href_list["sel_plasma"]) - if (href_list["sel_plasma"] == "yes") - machine.selected_plasma = 1 - else - machine.selected_plasma = 0 - if(href_list["sel_uranium"]) - if (href_list["sel_uranium"] == "yes") - machine.selected_uranium = 1 - else - machine.selected_uranium = 0 - if(href_list["sel_gold"]) - if (href_list["sel_gold"] == "yes") - machine.selected_gold = 1 - else - machine.selected_gold = 0 - if(href_list["sel_silver"]) - if (href_list["sel_silver"] == "yes") - machine.selected_silver = 1 - else - machine.selected_silver = 0 - if(href_list["sel_diamond"]) - if (href_list["sel_diamond"] == "yes") - machine.selected_diamond = 1 - else - machine.selected_diamond = 0 - if(href_list["sel_clown"]) - if (href_list["sel_clown"] == "yes") - machine.selected_clown = 1 - else - machine.selected_clown = 0 - if(href_list["sel_titanium"]) - if (href_list["sel_titanium"] == "yes") - machine.selected_titanium = 1 - else - machine.selected_titanium = 0 + add_fingerprint(usr) + + if(href_list["material"]) + machine.selected_material = href_list["material"] + machine.selected_alloy = null + + if(href_list["alloy"]) + machine.selected_material = null + machine.selected_alloy = href_list["alloy"] + if(href_list["set_on"]) - if (href_list["set_on"] == "on") - machine.on = 1 - else - machine.on = 0 - src.updateUsrDialog() + machine.on = (href_list["set_on"] == "on") + + updateUsrDialog() return +/obj/machinery/mineral/processing_unit_console/Destroy() + machine = null + return ..() + + /**********************Mineral processing unit**************************/ @@ -196,117 +66,84 @@ density = 1 anchored = 1 var/obj/machinery/mineral/CONSOLE = null - var/ore_gold = 0; - var/ore_silver = 0; - var/ore_diamond = 0; - var/ore_glass = 0; - var/ore_plasma = 0; - var/ore_uranium = 0; - var/ore_iron = 0; - var/ore_clown = 0; - var/ore_adamantine = 0; - var/ore_titanium = 0; - var/selected_gold = 0 - var/selected_silver = 0 - var/selected_diamond = 0 - var/selected_glass = 0 - var/selected_plasma = 0 - var/selected_uranium = 0 - var/selected_iron = 0 - var/selected_clown = 0 - var/selected_titanium = 0 - var/on = 0 //0 = off, 1 =... oh you know! + var/datum/material_container/materials + var/on = FALSE + var/selected_material = MAT_METAL + var/selected_alloy = null + var/datum/research/files + var/list/categories = list("Alloys") +/obj/machinery/mineral/processing_unit/Initialize() + . = ..() + proximity_monitor = new(src, 1) + materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY) + files = new /datum/research/smelter(src) + +/obj/machinery/mineral/processing_unit/Destroy() + CONSOLE = null + qdel(materials) + return ..() + +/obj/machinery/mineral/processing_unit/HasProximity(atom/movable/AM) + if(istype(AM, /obj/item/weapon/ore) && AM.loc == get_step(src, input_dir)) + process_ore(AM) + +/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/weapon/ore/O) + var/material_amount = materials.get_item_material_amount(O) + if(!materials.has_space(material_amount)) + unload_mineral(O) + else + materials.insert_item(O) + qdel(O) + if(CONSOLE) + CONSOLE.updateUsrDialog() + +/obj/machinery/mineral/processing_unit/proc/get_machine_data() + var/dat = "Smelter control console

" + for(var/mat_id in materials.materials) + var/datum/material/M = materials.materials[mat_id] + dat += "[M.name]: [M.amount] cm³" + if (selected_material == mat_id) + dat += " Smelting" + else + dat += " Not Smelting " + dat += "
" + + dat += "

" + dat += "Smelt Alloys
" + + for(var/v in files.known_designs) + var/datum/design/D = files.known_designs[v] + dat += "[D.name] " + if (selected_alloy == D.id) + dat += " Smelting" + else + dat += " Not Smelting " + dat += "
" + + dat += "

" + //On or off + dat += "Machine is currently " + if (on) + dat += "On " + else + dat += "Off " + + return dat + /obj/machinery/mineral/processing_unit/process() - for(var/i in 1 to 10) - if (on) - if (selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium) - if (ore_glass > 0) - ore_glass-- - generate_mineral(/obj/item/stack/sheet/glass) - else - on = 0 - continue - if (selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_titanium) - if (ore_glass > 0 && ore_iron > 0) - ore_glass-- - ore_iron-- - generate_mineral(/obj/item/stack/sheet/rglass) - else - on = 0 - continue - if (!selected_glass && selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium) - if (ore_gold > 0) - ore_gold-- - generate_mineral(/obj/item/stack/sheet/mineral/gold) - else - on = 0 - continue - if (!selected_glass && !selected_gold && selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium) - if (ore_silver > 0) - ore_silver-- - generate_mineral(/obj/item/stack/sheet/mineral/silver) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium) - if (ore_diamond > 0) - ore_diamond-- - generate_mineral(/obj/item/stack/sheet/mineral/diamond) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_titanium) - if (ore_plasma > 0) - ore_plasma-- - generate_mineral(/obj/item/stack/sheet/mineral/plasma) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && selected_uranium && !selected_iron && !selected_clown && !selected_titanium) - if (ore_uranium > 0) - ore_uranium-- - generate_mineral(/obj/item/stack/sheet/mineral/uranium) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_titanium) - if (ore_iron > 0) - ore_iron-- - generate_mineral(/obj/item/stack/sheet/metal) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_titanium) - if (ore_iron > 0 && ore_plasma > 0) - ore_iron-- - ore_plasma-- - generate_mineral(/obj/item/stack/sheet/plasteel) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && selected_clown && !selected_titanium) - if (ore_clown > 0) - ore_clown-- - generate_mineral(/obj/item/stack/sheet/mineral/bananium) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && selected_titanium) - if (ore_titanium > 0) - ore_titanium-- - generate_mineral(/obj/item/stack/sheet/mineral/titanium) - else - on = 0 - continue - if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && !selected_iron && !selected_clown && selected_titanium) - if (ore_titanium > 0) - ore_titanium-- - ore_plasma-- - generate_mineral(/obj/item/stack/sheet/mineral/plastitanium) - else - on = 0 - continue + if (on) + if(selected_material) + smelt_ore() + + else if(selected_alloy) + smelt_alloy() + + + if(CONSOLE) + CONSOLE.updateUsrDialog() + + //THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT. //They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage //Even in the dark year of 2016, where /tg/ is dead, Urist still hasn't finished this -Bawhoppennn @@ -327,104 +164,57 @@ on = 0 continue*/ - - //if a non valid combination is selected - - var/b = 1 //this part checks if all required ores are available - - if (!(selected_gold || selected_silver ||selected_diamond || selected_uranium | selected_plasma || selected_iron || selected_iron)) - b = 0 - - if (selected_gold == 1) - if (ore_gold <= 0) - b = 0 - if (selected_silver == 1) - if (ore_silver <= 0) - b = 0 - if (selected_diamond == 1) - if (ore_diamond <= 0) - b = 0 - if (selected_uranium == 1) - if (ore_uranium <= 0) - b = 0 - if (selected_plasma == 1) - if (ore_plasma <= 0) - b = 0 - if (selected_iron == 1) - if (ore_iron <= 0) - b = 0 - if (selected_glass == 1) - if (ore_glass <= 0) - b = 0 - if (selected_clown == 1) - if (ore_clown <= 0) - b = 0 - - if (b) //if they are, deduct one from each, produce slag and shut the machine off - if (selected_gold == 1) - ore_gold-- - if (selected_silver == 1) - ore_silver-- - if (selected_diamond == 1) - ore_diamond-- - if (selected_uranium == 1) - ore_uranium-- - if (selected_plasma == 1) - ore_plasma-- - if (selected_iron == 1) - ore_iron-- - if (selected_clown == 1) - ore_clown-- - generate_mineral(/obj/item/weapon/ore/slag) - on = 0 - else - on = 0 - break - break - else - break - var/turf/T = get_step(src,input_dir) - if(T) - var/n = 0 - for(var/obj/item/O in T) - n++ - if(n>10) - break - if (istype(O,/obj/item/weapon/ore/iron)) - ore_iron++; - O.loc = null - continue - if (istype(O,/obj/item/weapon/ore/glass)) - ore_glass++; - O.loc = null - continue - if (istype(O,/obj/item/weapon/ore/diamond)) - ore_diamond++; - O.loc = null - continue - if (istype(O,/obj/item/weapon/ore/plasma)) - ore_plasma++ - O.loc = null - continue - if (istype(O,/obj/item/weapon/ore/gold)) - ore_gold++ - O.loc = null - continue - if (istype(O,/obj/item/weapon/ore/silver)) - ore_silver++ - O.loc = null - continue - if (istype(O,/obj/item/weapon/ore/uranium)) - ore_uranium++ - O.loc = null - continue - if (istype(O,/obj/item/weapon/ore/bananium)) - ore_clown++ - O.loc = null - continue - unload_mineral(O) - +/obj/machinery/mineral/processing_unit/proc/smelt_ore() + var/datum/material/mat = materials.materials[selected_material] + if(mat) + var/sheets_to_remove = (mat.amount >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT) ) ? SMELT_AMOUNT : round(mat.amount / MINERAL_MATERIAL_AMOUNT) + if(!sheets_to_remove) + on = FALSE + else + var/out = get_step(src, output_dir) + materials.retrieve_sheets(sheets_to_remove, selected_material, out) + + +/obj/machinery/mineral/processing_unit/proc/smelt_alloy() + var/datum/design/alloy = files.FindDesignByID(selected_alloy) //check if it's a valid design + if(!alloy) + on = FALSE + return + + var/amount = can_smelt(alloy) + + if(!amount) + on = FALSE + return + + materials.use_amount(alloy.materials, amount) + + generate_mineral(alloy.build_path) + +/obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D) + if(D.make_reagents.len) + return 0 + + var/build_amount = SMELT_AMOUNT + + + for(var/mat_id in D.materials) + var/M = D.materials[mat_id] + var/datum/material/smelter_mat = materials.materials[mat_id] + + if(!M || !smelter_mat) + return 0 + + build_amount = min(build_amount, round(smelter_mat.amount / M)) + + return build_amount /obj/machinery/mineral/processing_unit/proc/generate_mineral(P) var/O = new P(src) unload_mineral(O) + +/obj/machinery/mineral/processing_unit/on_deconstruction() + materials.retrieve_all() + ..() + +#undef SMELT_AMOUNT \ No newline at end of file diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm new file mode 100644 index 0000000000..2672e0e27a --- /dev/null +++ b/code/modules/research/designs/smelting_designs.dm @@ -0,0 +1,18 @@ +///////SMELTABLE ALLOYS/////// + +/datum/design/plasteel_alloy + name = "Plasma + Iron alloy" + id = "plasteel" + build_type = SMELTER + materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2) + build_path = /obj/item/stack/sheet/plasteel + category = list("initial","Alloys") + + +/datum/design/plastitanium_alloy + name = "Plasma + Titanium alloy" + id = "plastitanium" + build_type = SMELTER + materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2) + build_path = /obj/item/stack/sheet/mineral/plastitanium + category = list("initial","Alloys") \ No newline at end of file diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index deb8d34ffc..674825b9f7 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -175,6 +175,21 @@ research holder datum. return ..() +//Smelter files +/datum/research/smelter/New() + for(var/T in (subtypesof(/datum/tech))) + possible_tech += new T(src) + for(var/path in subtypesof(/datum/design)) + var/datum/design/D = new path(src) + possible_designs += D + if((D.build_type & SMELTER) && ("initial" in D.category)) + AddDesign2Known(D) + +/datum/research/biogenerator/AddDesign2Known(datum/design/D) + if(!(D.build_type & SMELTER)) + return + ..() + /*************************************************************** ** Technology Datums ** diff --git a/tgstation.dme b/tgstation.dme index 1647912f6c..d70d1bf7f4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1995,6 +1995,7 @@ #include "code\modules\research\designs\mechfabricator_designs.dm" #include "code\modules\research\designs\medical_designs.dm" #include "code\modules\research\designs\power_designs.dm" +#include "code\modules\research\designs\smelting_designs.dm" #include "code\modules\research\designs\stock_parts_designs.dm" #include "code\modules\research\designs\telecomms_designs.dm" #include "code\modules\research\designs\weapon_designs.dm" From 9b46470c573909e9479ed3d8118353472425a21e Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 29 Apr 2017 02:34:43 -0700 Subject: [PATCH 030/131] Update artefact.dm --- code/game/gamemodes/wizard/artefact.dm | 1276 ++++++++++++------------ 1 file changed, 642 insertions(+), 634 deletions(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index c925a5cbd5..a3cd947b81 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -1,635 +1,643 @@ - -//Apprenticeship contract - moved to antag_spawner.dm - -///////////////////////////Veil Render////////////////////// - -/obj/item/weapon/veilrender - name = "veil render" - desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." - icon = 'icons/obj/wizard.dmi' - icon_state = "render" - item_state = "render" - force = 15 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/bladeslice.ogg' - var/charges = 1 - var/spawn_type = /obj/singularity/wizard - var/spawn_amt = 1 - var/activate_descriptor = "reality" - var/rend_desc = "You should run now." - var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning - -/obj/item/weapon/veilrender/attack_self(mob/user) - if(charges > 0) - new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc, spawn_fast) - charges-- - user.visible_message("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!") - else - to_chat(user, "The unearthly energies that powered the blade are now dormant.") - -/obj/effect/rend - name = "tear in the fabric of reality" - desc = "You should run now." - icon = 'icons/obj/biomass.dmi' - icon_state = "rift" - density = 1 - anchored = 1 - var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies - var/spawn_amt_left = 20 - var/spawn_fast = 0 - -/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast) - src.spawn_path = spawn_type - src.spawn_amt_left = spawn_amt - src.desc = desc - src.spawn_fast = spawn_fast - START_PROCESSING(SSobj, src) - return - -/obj/effect/rend/process() - if(!spawn_fast) - if(locate(/mob) in loc) - return - new spawn_path(loc) - spawn_amt_left-- - if(spawn_amt_left <= 0) - qdel(src) - -/obj/effect/rend/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/nullrod)) - user.visible_message("[user] seals \the [src] with \the [I].") - qdel(src) - return - else - return ..() - -/obj/item/weapon/veilrender/vealrender - name = "veal render" - desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm." - spawn_type = /mob/living/simple_animal/cow - spawn_amt = 20 - activate_descriptor = "hunger" - rend_desc = "Reverberates with the sound of ten thousand moos." - -/obj/item/weapon/veilrender/honkrender - name = "honk render" - desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast circus." - spawn_type = /mob/living/simple_animal/hostile/retaliate/clown - spawn_amt = 10 - activate_descriptor = "depression" - rend_desc = "Gently wafting with the sounds of endless laughter." - icon_state = "clownrender" - -////TEAR IN REALITY - -/obj/singularity/wizard - name = "tear in the fabric of reality" - desc = "This isn't right." - icon = 'icons/effects/224x224.dmi' - icon_state = "reality" - pixel_x = -96 - pixel_y = -96 - grav_pull = 6 - consume_range = 3 - current_size = STAGE_FOUR - allowed_size = STAGE_FOUR - -/obj/singularity/wizard/process() - move() - eat() - return -/////////////////////////////////////////Scrying/////////////////// - -/obj/item/weapon/scrying - name = "scrying orb" - desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means." - icon = 'icons/obj/projectiles.dmi' - icon_state ="bluespace" - throw_speed = 3 - throw_range = 7 - throwforce = 15 - damtype = BURN - force = 15 - hitsound = 'sound/items/welder2.ogg' - -/obj/item/weapon/scrying/attack_self(mob/user) - to_chat(user, "You can see...everything!") - visible_message("[user] stares into [src], their eyes glazing over.") - user.ghostize(1) - return - -/////////////////////////////////////////Necromantic Stone/////////////////// - -/obj/item/device/necromantic_stone - name = "necromantic stone" - desc = "A shard capable of resurrecting humans as skeleton thralls." - icon = 'icons/obj/wizard.dmi' - icon_state = "necrostone" - item_state = "electronic" - origin_tech = "bluespace=4;materials=4" - w_class = WEIGHT_CLASS_TINY - var/list/spooky_scaries = list() - var/unlimited = 0 - -/obj/item/device/necromantic_stone/unlimited - unlimited = 1 - -/obj/item/device/necromantic_stone/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) - if(!istype(M)) - return ..() - - if(!istype(user) || !user.canUseTopic(M,1)) - return - - if(M.stat != DEAD) - to_chat(user, "This artifact can only affect the dead!") - return - - if(!M.mind || !M.client) - to_chat(user, "There is no soul connected to this body...") - return - - check_spooky()//clean out/refresh the list - if(spooky_scaries.len >= 3 && !unlimited) - to_chat(user, "This artifact can only affect three undead at a time!") - return - - M.set_species(/datum/species/skeleton, icon_update=0) - M.revive(full_heal = 1, admin_revive = 1) - spooky_scaries |= M - to_chat(M, "You have been revived by [user.real_name]!") - to_chat(M, "[user.p_they(TRUE)] [user.p_are()] your master now, assist them even if it costs you your new life!") - - equip_roman_skeleton(M) - - desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" - -/obj/item/device/necromantic_stone/proc/check_spooky() - if(unlimited) //no point, the list isn't used. - return - - for(var/X in spooky_scaries) - if(!ishuman(X)) - spooky_scaries.Remove(X) - continue - var/mob/living/carbon/human/H = X - if(H.stat == DEAD) - spooky_scaries.Remove(X) - continue - listclearnulls(spooky_scaries) - -//Funny gimmick, skeletons always seem to wear roman/ancient armour -/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H) - for(var/obj/item/I in H) - H.dropItemToGround(I) - - var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - H.equip_to_slot_or_del(new hat(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes) - H.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(H)) - H.put_in_hands_or_del(new /obj/item/weapon/claymore(H)) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) - - - -/////////////////////Multiverse Blade//////////////////// - -/obj/item/weapon/multisword - name = "multiverse sword" - desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side." - icon = 'icons/obj/weapons.dmi' - icon_state = "multiverse" - item_state = "multiverse" - hitsound = 'sound/weapons/bladeslice.ogg' - flags = CONDUCT - slot_flags = SLOT_BELT - sharpness = IS_SHARP - force = 20 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - var/faction = list("unassigned") - var/cooldown = 0 - var/assigned = "unassigned" - var/static/list/multiverse = list() - -/obj/item/weapon/multisword/New() - ..() - multiverse += src - - -/obj/item/weapon/multisword/Destroy() - multiverse.Remove(src) - return ..() - -/obj/item/weapon/multisword/attack_self(mob/user) - if(user.mind.special_role == "apprentice") - to_chat(user, "You know better than to touch your teacher's stuff.") - return - if(cooldown < world.time) - var/faction_check = 0 - for(var/F in faction) - if(F in user.faction) - faction_check = 1 - break - if(faction_check == 0) - faction = list("[user.real_name]") - assigned = "[user.real_name]" - user.faction = list("[user.real_name]") - to_chat(user, "You bind the sword to yourself. You can now use it to summon help.") - if(!is_gangster(user)) - var/datum/gang/multiverse/G = new(src, "[user.real_name]") - SSticker.mode.gangs += G - G.bosses += user.mind - G.add_gang_hud(user.mind) - user.mind.gang_datum = G - to_chat(user, "With your new found power you could easily conquer the station!") - var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone - hijack_objective.owner = user.mind - user.mind.objectives += hijack_objective - hijack_objective.explanation_text = "Ensure only [user.real_name] and their copies are on the shuttle!" - to_chat(user, "Objective #[1]: [hijack_objective.explanation_text]") - SSticker.mode.traitors += user.mind - user.mind.special_role = "[user.real_name] Prime" - else - var/list/candidates = get_candidates(ROLE_WIZARD) - if(candidates.len) - var/client/C = pick(candidates) - spawn_copy(C, get_turf(user.loc), user) - to_chat(user, "The sword flashes, and you find yourself face to face with...you!") - cooldown = world.time + 400 - for(var/obj/item/weapon/multisword/M in multiverse) - if(M.assigned == assigned) - M.cooldown = cooldown - - else - to_chat(user, "You fail to summon any copies of yourself. Perhaps you should try again in a bit.") - else - to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") - - -/obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) - var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) - C.prefs.copy_to(M, icon_updates=0) - M.key = C.key - M.mind.name = user.real_name - to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.") - SSticker.mode.add_gangster(M.mind, user.mind.gang_datum, FALSE) - M.real_name = user.real_name - M.name = user.real_name - M.faction = list("[user.real_name]") - if(prob(50)) - var/list/all_species = list() - for(var/speciestype in subtypesof(/datum/species)) - var/datum/species/S = speciestype - if(!initial(S.dangerous_existence)) - all_species += speciestype - M.set_species(pick(all_species), icon_update=0) - M.update_body() - M.update_hair() - M.update_body_parts() - M.dna.update_dna_identity() - equip_copy(M) - -/obj/item/weapon/multisword/proc/equip_copy(var/mob/living/carbon/human/M) - - var/obj/item/weapon/multisword/sword = new /obj/item/weapon/multisword - sword.assigned = assigned - sword.faction = list("[assigned]") - - var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator") - - switch(randomize) - if("mobster") - M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("roman") - var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - M.equip_to_slot_or_del(new hat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/roman(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes) - M.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(M)) - M.put_in_hands_or_del(sword) - - if("wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) - M.put_in_hands_or_del(sword) - if("cyborg") - for(var/X in M.bodyparts) - var/obj/item/bodypart/affecting = X - affecting.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) - M.put_in_hands_or_del(sword) - - if("syndicate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),slot_wear_mask) - M.put_in_hands_or_del(sword) - - if("assistant") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes) - M.put_in_hands_or_del(sword) - - if("animu") - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl/red(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("cultist") - M.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.put_in_hands_or_del(sword) - - if("highlander") - M.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.put_in_hands_or_del(sword) - - if("clown") - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_l_store) - M.put_in_hands_or_del(sword) - - if("killer") - M.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_l_store) - M.equip_to_slot_or_del(new /obj/item/weapon/scalpel(M), slot_r_store) - M.put_in_hands_or_del(sword) - for(var/obj/item/carried_item in M.get_equipped_items()) - carried_item.add_mob_blood(M) - for(var/obj/item/I in M.held_items) - I.add_mob_blood(M) - if("pirate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.put_in_hands_or_del(sword) - - if("soviet") - M.equip_to_slot_or_del(new /obj/item/clothing/head/pirate/captain(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate/captain(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("officer") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.put_in_hands_or_del(sword) - - if("gladiator") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/gladiator(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.put_in_hands_or_del(sword) - - - else - return - - M.update_body_parts() - - var/obj/item/weapon/card/id/W = new /obj/item/weapon/card/id - W.icon_state = "centcom" - W.access += GLOB.access_maint_tunnels - W.assignment = "Multiverse Traveller" - W.registered_name = M.real_name - W.update_label(M.real_name) - M.equip_to_slot_or_del(W, slot_wear_id) - - -/obj/item/voodoo - name = "wicker doll" - desc = "Something creepy about it." - icon = 'icons/obj/wizard.dmi' - icon_state = "voodoo" - item_state = "electronic" - var/mob/living/carbon/human/target = null - var/list/mob/living/carbon/human/possible = list() - var/obj/item/link = null - var/cooldown_time = 30 //3s - var/cooldown = 0 - obj_integrity = 10 - max_integrity = 10 - resistance_flags = FLAMMABLE - -/obj/item/voodoo/attackby(obj/item/I, mob/user, params) - if(target && cooldown < world.time) - if(I.is_hot()) - to_chat(target, "You suddenly feel very hot") - target.bodytemperature += 50 - GiveHint(target) - else if(is_pointed(I)) - to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") - target.Weaken(2) - GiveHint(target) - else if(istype(I,/obj/item/weapon/bikehorn)) - to_chat(target, "HONK") - target << 'sound/items/AirHorn.ogg' + +//Apprenticeship contract - moved to antag_spawner.dm + +///////////////////////////Veil Render////////////////////// + +/obj/item/weapon/veilrender + name = "veil render" + desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." + icon = 'icons/obj/wizard.dmi' + icon_state = "render" + item_state = "render" + force = 15 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + hitsound = 'sound/weapons/bladeslice.ogg' + var/charges = 1 + var/spawn_type = /obj/singularity/wizard + var/spawn_amt = 1 + var/activate_descriptor = "reality" + var/rend_desc = "You should run now." + var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning + +/obj/item/weapon/veilrender/attack_self(mob/user) + if(charges > 0) + new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc, spawn_fast) + charges-- + user.visible_message("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!") + else + to_chat(user, "The unearthly energies that powered the blade are now dormant.") + +/obj/effect/rend + name = "tear in the fabric of reality" + desc = "You should run now." + icon = 'icons/obj/biomass.dmi' + icon_state = "rift" + density = 1 + anchored = 1 + var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies + var/spawn_amt_left = 20 + var/spawn_fast = 0 + +/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast) + src.spawn_path = spawn_type + src.spawn_amt_left = spawn_amt + src.desc = desc + src.spawn_fast = spawn_fast + START_PROCESSING(SSobj, src) + return + +/obj/effect/rend/process() + if(!spawn_fast) + if(locate(/mob) in loc) + return + new spawn_path(loc) + spawn_amt_left-- + if(spawn_amt_left <= 0) + qdel(src) + +/obj/effect/rend/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/weapon/nullrod)) + user.visible_message("[user] seals \the [src] with \the [I].") + qdel(src) + return + else + return ..() + +/obj/item/weapon/veilrender/vealrender + name = "veal render" + desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm." + spawn_type = /mob/living/simple_animal/cow + spawn_amt = 20 + activate_descriptor = "hunger" + rend_desc = "Reverberates with the sound of ten thousand moos." + +/obj/item/weapon/veilrender/honkrender + name = "honk render" + desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast circus." + spawn_type = /mob/living/simple_animal/hostile/retaliate/clown + spawn_amt = 10 + activate_descriptor = "depression" + rend_desc = "Gently wafting with the sounds of endless laughter." + icon_state = "clownrender" + +////TEAR IN REALITY + +/obj/singularity/wizard + name = "tear in the fabric of reality" + desc = "This isn't right." + icon = 'icons/effects/224x224.dmi' + icon_state = "reality" + pixel_x = -96 + pixel_y = -96 + grav_pull = 6 + consume_range = 3 + current_size = STAGE_FOUR + allowed_size = STAGE_FOUR + +/obj/singularity/wizard/process() + move() + eat() + return +/////////////////////////////////////////Scrying/////////////////// + +/obj/item/weapon/scrying + name = "scrying orb" + desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means." + icon = 'icons/obj/projectiles.dmi' + icon_state ="bluespace" + throw_speed = 3 + throw_range = 7 + throwforce = 15 + damtype = BURN + force = 15 + hitsound = 'sound/items/welder2.ogg' + +/obj/item/weapon/scrying/attack_self(mob/user) + to_chat(user, "You can see...everything!") + visible_message("[user] stares into [src], their eyes glazing over.") + user.ghostize(1) + return + +/////////////////////////////////////////Necromantic Stone/////////////////// + +/obj/item/device/necromantic_stone + name = "necromantic stone" + desc = "A shard capable of resurrecting humans as skeleton thralls." + icon = 'icons/obj/wizard.dmi' + icon_state = "necrostone" + item_state = "electronic" + origin_tech = "bluespace=4;materials=4" + w_class = WEIGHT_CLASS_TINY + var/list/spooky_scaries = list() + var/unlimited = 0 + +/obj/item/device/necromantic_stone/unlimited + unlimited = 1 + +/obj/item/device/necromantic_stone/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) + if(!istype(M)) + return ..() + + if(!istype(user) || !user.canUseTopic(M,1)) + return + + if(M.stat != DEAD) + to_chat(user, "This artifact can only affect the dead!") + return + + if(!M.mind || !M.client) + to_chat(user, "There is no soul connected to this body...") + return + + check_spooky()//clean out/refresh the list + if(spooky_scaries.len >= 3 && !unlimited) + to_chat(user, "This artifact can only affect three undead at a time!") + return + + M.set_species(/datum/species/skeleton, icon_update=0) + M.revive(full_heal = 1, admin_revive = 1) + spooky_scaries |= M + to_chat(M, "You have been revived by [user.real_name]!") + to_chat(M, "[user.p_they(TRUE)] [user.p_are()] your master now, assist them even if it costs you your new life!") + + equip_roman_skeleton(M) + + desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" + +/obj/item/device/necromantic_stone/proc/check_spooky() + if(unlimited) //no point, the list isn't used. + return + + for(var/X in spooky_scaries) + if(!ishuman(X)) + spooky_scaries.Remove(X) + continue + var/mob/living/carbon/human/H = X + if(H.stat == DEAD) + spooky_scaries.Remove(X) + continue + listclearnulls(spooky_scaries) + +//Funny gimmick, skeletons always seem to wear roman/ancient armour +/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H) + for(var/obj/item/I in H) + H.dropItemToGround(I) + + var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) + H.equip_to_slot_or_del(new hat(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes) + H.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(H)) + H.put_in_hands_or_del(new /obj/item/weapon/claymore(H)) + H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) + + + +/////////////////////Multiverse Blade//////////////////// + +/obj/item/weapon/multisword + name = "multiverse sword" + desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side." + icon = 'icons/obj/weapons.dmi' + icon_state = "multiverse" + item_state = "multiverse" + hitsound = 'sound/weapons/bladeslice.ogg' + flags = CONDUCT + slot_flags = SLOT_BELT + sharpness = IS_SHARP + force = 20 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + var/faction = list("unassigned") + var/cooldown = 0 + var/assigned = "unassigned" + var/static/list/multiverse = list() + +/obj/item/weapon/multisword/New() + ..() + multiverse += src + + +/obj/item/weapon/multisword/Destroy() + multiverse.Remove(src) + return ..() + +/obj/item/weapon/multisword/attack_self(mob/user) + if(user.mind.special_role == "apprentice") + to_chat(user, "You know better than to touch your teacher's stuff.") + return + if(cooldown < world.time) + var/faction_check = 0 + for(var/F in faction) + if(F in user.faction) + faction_check = 1 + break + if(faction_check == 0) + faction = list("[user.real_name]") + assigned = "[user.real_name]" + user.faction = list("[user.real_name]") + to_chat(user, "You bind the sword to yourself. You can now use it to summon help.") + if(!is_gangster(user)) + var/datum/gang/multiverse/G = new(src, "[user.real_name]") + SSticker.mode.gangs += G + G.bosses += user.mind + G.add_gang_hud(user.mind) + user.mind.gang_datum = G + to_chat(user, "With your new found power you could easily conquer the station!") + var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone + hijack_objective.owner = user.mind + user.mind.objectives += hijack_objective + hijack_objective.explanation_text = "Ensure only [user.real_name] and their copies are on the shuttle!" + to_chat(user, "Objective #[1]: [hijack_objective.explanation_text]") + SSticker.mode.traitors += user.mind + user.mind.special_role = "[user.real_name] Prime" + else + var/list/candidates = get_candidates(ROLE_WIZARD) + if(candidates.len) + var/client/C = pick(candidates) + spawn_copy(C, get_turf(user.loc), user) + to_chat(user, "The sword flashes, and you find yourself face to face with...you!") + cooldown = world.time + 400 + for(var/obj/item/weapon/multisword/M in multiverse) + if(M.assigned == assigned) + M.cooldown = cooldown + + else + to_chat(user, "You fail to summon any copies of yourself. Perhaps you should try again in a bit.") + else + to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") + + +/obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) + var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) + C.prefs.copy_to(M, icon_updates=0) + M.key = C.key + M.mind.name = user.real_name + to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.") + SSticker.mode.add_gangster(M.mind, user.mind.gang_datum, FALSE) + M.real_name = user.real_name + M.name = user.real_name + M.faction = list("[user.real_name]") + if(prob(50)) + var/list/all_species = list() + for(var/speciestype in subtypesof(/datum/species)) + var/datum/species/S = speciestype + if(!initial(S.dangerous_existence)) + all_species += speciestype + M.set_species(pick(all_species), icon_update=0) + M.update_body() + M.update_hair() + M.update_body_parts() + M.dna.update_dna_identity() + equip_copy(M) + +/obj/item/weapon/multisword/proc/equip_copy(var/mob/living/carbon/human/M) + + var/obj/item/weapon/multisword/sword = new /obj/item/weapon/multisword + sword.assigned = assigned + sword.faction = list("[assigned]") + + var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator") + + switch(randomize) + if("mobster") + M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform) + M.put_in_hands_or_del(sword) + + if("roman") + var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) + M.equip_to_slot_or_del(new hat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/under/roman(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes) + M.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(M)) + M.put_in_hands_or_del(sword) + + if("wizard") + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) + M.put_in_hands_or_del(sword) + if("cyborg") + for(var/X in M.bodyparts) + var/obj/item/bodypart/affecting = X + affecting.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) + M.put_in_hands_or_del(sword) + + if("syndicate") + M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),slot_wear_mask) + M.put_in_hands_or_del(sword) + + if("assistant") + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes) + M.put_in_hands_or_del(sword) + + if("animu") + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl/red(M), slot_w_uniform) + M.put_in_hands_or_del(sword) + + if("cultist") + M.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.put_in_hands_or_del(sword) + + if("highlander") + M.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) + M.put_in_hands_or_del(sword) + + if("clown") + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_l_store) + M.put_in_hands_or_del(sword) + + if("killer") + M.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/weapon/scalpel(M), slot_r_store) + M.put_in_hands_or_del(sword) + for(var/obj/item/carried_item in M.get_equipped_items()) + carried_item.add_mob_blood(M) + for(var/obj/item/I in M.held_items) + I.add_mob_blood(M) + if("pirate") + M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.put_in_hands_or_del(sword) + + if("soviet") + M.equip_to_slot_or_del(new /obj/item/clothing/head/pirate/captain(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate/captain(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform) + M.put_in_hands_or_del(sword) + + if("officer") + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/beret(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) + M.put_in_hands_or_del(sword) + + if("gladiator") + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/under/gladiator(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) + M.put_in_hands_or_del(sword) + + + else + return + + M.update_body_parts() + + var/obj/item/weapon/card/id/W = new /obj/item/weapon/card/id + W.icon_state = "centcom" + W.access += GLOB.access_maint_tunnels + W.assignment = "Multiverse Traveller" + W.registered_name = M.real_name + W.update_label(M.real_name) + M.equip_to_slot_or_del(W, slot_wear_id) + + +/obj/item/voodoo + name = "wicker doll" + desc = "Something creepy about it." + icon = 'icons/obj/wizard.dmi' + icon_state = "voodoo" + item_state = "electronic" + var/mob/living/carbon/human/target = null + var/list/mob/living/carbon/human/possible = list() + var/obj/item/link = null + var/cooldown_time = 30 //3s + var/cooldown = 0 + obj_integrity = 10 + max_integrity = 10 + resistance_flags = FLAMMABLE + +/obj/item/voodoo/attackby(obj/item/I, mob/user, params) + if(target && cooldown < world.time) + if(I.is_hot()) + to_chat(target, "You suddenly feel very hot") + target.bodytemperature += 50 + GiveHint(target) + else if(is_pointed(I)) + to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") + target.Weaken(2) + GiveHint(target) + else if(istype(I,/obj/item/weapon/bikehorn)) + to_chat(target, "HONK") + target << 'sound/items/AirHorn.ogg' target.adjustEarDamage(0,3) - GiveHint(target) - cooldown = world.time +cooldown_time - return - - if(!link) - if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL) - user.drop_item() - I.loc = src - link = I - to_chat(user, "You attach [I] to the doll.") - update_targets() - -/obj/item/voodoo/check_eye(mob/user) - if(loc != user) - user.reset_perspective(null) - user.unset_machine() - -/obj/item/voodoo/attack_self(mob/user) - if(!target && possible.len) - target = input(user, "Select your victim!", "Voodoo") as null|anything in possible - return - - if(user.zone_selected == "chest") - if(link) - target = null - link.loc = get_turf(src) - to_chat(user, "You remove the [link] from the doll.") - link = null - update_targets() - return - - if(target && cooldown < world.time) - switch(user.zone_selected) - if("mouth") - var/wgw = sanitize(input(user, "What would you like the victim to say", "Voodoo", null) as text) - target.say(wgw) - log_game("[user][user.key] made [target][target.key] say [wgw] with a voodoo doll.") - if("eyes") - user.set_machine(src) - user.reset_perspective(target) - spawn(100) - user.reset_perspective(null) - user.unset_machine() - if("r_leg","l_leg") - to_chat(user, "You move the doll's legs around.") - var/turf/T = get_step(target,pick(GLOB.cardinal)) - target.Move(T) - if("r_arm","l_arm") - target.click_random_mob() - GiveHint(target) - if("head") - to_chat(user, "You smack the doll's head with your hand.") - target.Dizzy(10) - to_chat(target, "You suddenly feel as if your head was hit with a hammer!") - GiveHint(target,user) - cooldown = world.time + cooldown_time - -/obj/item/voodoo/proc/update_targets() - possible = list() - if(!link) - return - for(var/mob/living/carbon/human/H in GLOB.living_mob_list) - if(md5(H.dna.uni_identity) in link.fingerprints) - possible |= H - -/obj/item/voodoo/proc/GiveHint(mob/victim,force=0) - if(prob(50) || force) - var/way = dir2text(get_dir(victim,get_turf(src))) - to_chat(victim, "You feel a dark presence from [way]") - if(prob(20) || force) - var/area/A = get_area(src) - to_chat(victim, "You feel a dark presence from [A.name]") - -/obj/item/voodoo/fire_act(exposed_temperature, exposed_volume) - if(target) - target.adjust_fire_stacks(20) - target.IgniteMob() - GiveHint(target,1) - return ..() - - -//Provides a decent heal, need to pump every 6 seconds -/obj/item/organ/heart/cursed/wizard - pump_delay = 60 - heal_brute = 25 - heal_burn = 25 - heal_oxy = 25 - -//Warp Whistle: Provides uncontrolled long distance teleportation. - -/obj/item/warpwhistle - name = "warp whistle" - desc = "One toot on this whistle will send you to a far away land!" - icon = 'icons/obj/wizard.dmi' - icon_state = "whistle" - var/on_cooldown = 0 //0: usable, 1: in use, 2: on cooldown - var/mob/living/carbon/last_user - -/obj/item/warpwhistle/proc/interrupted(mob/living/carbon/user) - if(!user || QDELETED(src)) - on_cooldown = FALSE - return TRUE - return FALSE - -/obj/item/warpwhistle/attack_self(mob/living/carbon/user) - if(!istype(user) || on_cooldown) - return - on_cooldown = TRUE - last_user = user - var/turf/T = get_turf(user) - playsound(T,'sound/magic/WarpWhistle.ogg', 200, 1) - user.canmove = 0 - new /obj/effect/overlay/temp/tornado(T) - sleep(20) - if(interrupted(user)) - return - user.invisibility = INVISIBILITY_MAXIMUM - user.status_flags |= GODMODE - sleep(20) - if(interrupted(user)) - return - var/breakout = 0 - while(breakout < 50) - var/turf/potential_T = find_safe_turf() - if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) - user.forceMove(potential_T) - user.canmove = 0 - T = potential_T - break - breakout += 1 - new /obj/effect/overlay/temp/tornado(T) - sleep(20) - if(interrupted(user)) - return - user.invisibility = initial(user.invisibility) - user.status_flags &= ~GODMODE - user.canmove = 1 - on_cooldown = 2 - sleep(40) - on_cooldown = 0 - -/obj/item/warpwhistle/Destroy() - if(on_cooldown == 1 && last_user) //Flute got dunked somewhere in the teleport - last_user.invisibility = initial(last_user.invisibility) - last_user.status_flags &= ~GODMODE - last_user.canmove = 1 - return ..() - -/obj/effect/overlay/temp/tornado - icon = 'icons/obj/wizard.dmi' - icon_state = "tornado" - name = "tornado" - desc = "This thing sucks!" - layer = FLY_LAYER - randomdir = 0 - duration = 40 - pixel_x = 500 - -/obj/effect/overlay/temp/tornado/New(loc) - ..() - animate(src, pixel_x = -500, time = 40) + GiveHint(target) + cooldown = world.time +cooldown_time + return + + if(!link) + if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL) + user.drop_item() + I.loc = src + link = I + to_chat(user, "You attach [I] to the doll.") + update_targets() + +/obj/item/voodoo/check_eye(mob/user) + if(loc != user) + user.reset_perspective(null) + user.unset_machine() + +/obj/item/voodoo/attack_self(mob/user) + if(!target && possible.len) + target = input(user, "Select your victim!", "Voodoo") as null|anything in possible + return + + if(user.zone_selected == "chest") + if(link) + target = null + link.loc = get_turf(src) + to_chat(user, "You remove the [link] from the doll.") + link = null + update_targets() + return + + if(target && cooldown < world.time) + switch(user.zone_selected) + if("mouth") + var/wgw = sanitize(input(user, "What would you like the victim to say", "Voodoo", null) as text) + target.say(wgw) + log_game("[user][user.key] made [target][target.key] say [wgw] with a voodoo doll.") + if("eyes") + user.set_machine(src) + user.reset_perspective(target) + spawn(100) + user.reset_perspective(null) + user.unset_machine() + if("r_leg","l_leg") + to_chat(user, "You move the doll's legs around.") + var/turf/T = get_step(target,pick(GLOB.cardinal)) + target.Move(T) + if("r_arm","l_arm") + target.click_random_mob() + GiveHint(target) + if("head") + to_chat(user, "You smack the doll's head with your hand.") + target.Dizzy(10) + to_chat(target, "You suddenly feel as if your head was hit with a hammer!") + GiveHint(target,user) + if("groin") + if(target.canbearoused) + to_chat(user, "You rub the groin on [src]. You're weird.") + target.adjustArousalLoss(5) + to_chat(target, "You suddenly feel hot... and quite good") + if(prob(33)) + target.emote(pick("moan","blush")) + GiveHint(target, user) + cooldown = world.time + cooldown_time + +/obj/item/voodoo/proc/update_targets() + possible = list() + if(!link) + return + for(var/mob/living/carbon/human/H in GLOB.living_mob_list) + if(md5(H.dna.uni_identity) in link.fingerprints) + possible |= H + +/obj/item/voodoo/proc/GiveHint(mob/victim,force=0) + if(prob(50) || force) + var/way = dir2text(get_dir(victim,get_turf(src))) + to_chat(victim, "You feel a dark presence from [way]") + if(prob(20) || force) + var/area/A = get_area(src) + to_chat(victim, "You feel a dark presence from [A.name]") + +/obj/item/voodoo/fire_act(exposed_temperature, exposed_volume) + if(target) + target.adjust_fire_stacks(20) + target.IgniteMob() + GiveHint(target,1) + return ..() + + +//Provides a decent heal, need to pump every 6 seconds +/obj/item/organ/heart/cursed/wizard + pump_delay = 60 + heal_brute = 25 + heal_burn = 25 + heal_oxy = 25 + +//Warp Whistle: Provides uncontrolled long distance teleportation. + +/obj/item/warpwhistle + name = "warp whistle" + desc = "One toot on this whistle will send you to a far away land!" + icon = 'icons/obj/wizard.dmi' + icon_state = "whistle" + var/on_cooldown = 0 //0: usable, 1: in use, 2: on cooldown + var/mob/living/carbon/last_user + +/obj/item/warpwhistle/proc/interrupted(mob/living/carbon/user) + if(!user || QDELETED(src)) + on_cooldown = FALSE + return TRUE + return FALSE + +/obj/item/warpwhistle/attack_self(mob/living/carbon/user) + if(!istype(user) || on_cooldown) + return + on_cooldown = TRUE + last_user = user + var/turf/T = get_turf(user) + playsound(T,'sound/magic/WarpWhistle.ogg', 200, 1) + user.canmove = 0 + new /obj/effect/overlay/temp/tornado(T) + sleep(20) + if(interrupted(user)) + return + user.invisibility = INVISIBILITY_MAXIMUM + user.status_flags |= GODMODE + sleep(20) + if(interrupted(user)) + return + var/breakout = 0 + while(breakout < 50) + var/turf/potential_T = find_safe_turf() + if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) + user.forceMove(potential_T) + user.canmove = 0 + T = potential_T + break + breakout += 1 + new /obj/effect/overlay/temp/tornado(T) + sleep(20) + if(interrupted(user)) + return + user.invisibility = initial(user.invisibility) + user.status_flags &= ~GODMODE + user.canmove = 1 + on_cooldown = 2 + sleep(40) + on_cooldown = 0 + +/obj/item/warpwhistle/Destroy() + if(on_cooldown == 1 && last_user) //Flute got dunked somewhere in the teleport + last_user.invisibility = initial(last_user.invisibility) + last_user.status_flags &= ~GODMODE + last_user.canmove = 1 + return ..() + +/obj/effect/overlay/temp/tornado + icon = 'icons/obj/wizard.dmi' + icon_state = "tornado" + name = "tornado" + desc = "This thing sucks!" + layer = FLY_LAYER + randomdir = 0 + duration = 40 + pixel_x = 500 + +/obj/effect/overlay/temp/tornado/New(loc) + ..() + animate(src, pixel_x = -500, time = 40) From 101f1337a6d48fe29d180484d5f97b486352fd32 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 29 Apr 2017 07:43:07 -0500 Subject: [PATCH 031/131] manual merge --- code/modules/admin/verbs/debug.dm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 54be219a48..1817f2024a 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -83,17 +83,22 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that to_chat(usr, .) feedback_add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -GLOBAL_VAR_INIT(AdminProcCall, null) -GLOBAL_PROTECT(AdminProcCall) +GLOBAL_VAR_INIT(AdminProcCaller, null) +GLOBAL_PROTECT(AdminProcCaller) +GLOBAL_VAR_INIT(AdminProcCallCount, 0) +GLOBAL_PROTECT(AdminProcCallCount) /proc/WrapAdminProcCall(target, procname, list/arguments) - if(GLOB.AdminProcCall) - to_chat(usr, "Another admin called proc is still running, your proc will be run after theirs finishes") - UNTIL(!GLOB.AdminProcCall) + var/current_caller = GLOB.AdminProcCaller + var/ckey = usr.client.ckey + if(current_caller && current_caller != ckey) + to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") + UNTIL(!GLOB.AdminProcCaller) to_chat(usr, "Running your proc") - GLOB.AdminProcCall = usr.client.ckey //if this runtimes, too bad for you + GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you . = world.WrapAdminProcCall(target, procname, arguments) - GLOB.AdminProcCall = null + if(--GLOB.AdminProcCallCount == 0) + GLOB.AdminProcCaller = null //adv proc call this, ya nerds /world/proc/WrapAdminProcCall(target, procname, list/arguments) @@ -103,7 +108,7 @@ GLOBAL_PROTECT(AdminProcCall) return call(target, procname)(arglist(arguments)) /proc/IsAdminAdvancedProcCall() - return usr && usr.client && GLOB.AdminProcCall == usr.client.ckey + return usr && usr.client && GLOB.AdminProcCaller == usr.client.ckey /client/proc/callproc_datum(datum/A as null|area|mob|obj|turf) set category = "Debug" From 0cf401934b7e987830aa72a09bd7cebdcbbc54f0 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 29 Apr 2017 07:57:16 -0500 Subject: [PATCH 032/131] manual merge --- code/game/objects/effects/overlays.dm | 4 ++-- code/modules/station_goals/bsa.dm | 4 ++-- code/modules/vehicles/atv.dm | 4 ++-- code/modules/vehicles/speedbike.dm | 11 +---------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index ab17503447..3935b86c92 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -31,8 +31,8 @@ . = ..() deltimer(timerid) -/obj/effect/overlay/temp/New() - ..() +/obj/effect/overlay/temp/Initialize() + . = ..() if(randomdir) setDir(pick(GLOB.cardinal)) diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 53a7198302..5f808035fd 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -161,8 +161,8 @@ return locate(world.maxx,y,z) return get_turf(src) -/obj/machinery/bsa/full/New(loc,cannon_direction = WEST) - ..() +/obj/machinery/bsa/full/Initialize(mapload, cannon_direction = WEST) + . = ..() top_layer = top_layer || mutable_appearance(icon, layer = ABOVE_MOB_LAYER) switch(cannon_direction) if(WEST) diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index 4450f6bab8..35aff0867f 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -9,8 +9,8 @@ . = ..() riding_datum = new/datum/riding/atv -/obj/vehicle/atv/New() - ..() +/obj/vehicle/atv/Initialize() + .=..() atvcover = atvcover || mutable_appearance(icon, "atvcover", ABOVE_MOB_LAYER) diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm index 21d8cff1be..15337d8a28 100644 --- a/code/modules/vehicles/speedbike.dm +++ b/code/modules/vehicles/speedbike.dm @@ -15,20 +15,11 @@ overlay = overlay || mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER) add_overlay(overlay) -/obj/effect/overlay/temp/speedbike_trail - name = "speedbike trails" - icon_state = "ion_fade" - layer = BELOW_MOB_LAYER - duration = 10 - randomdir = 0 -/obj/effect/overlay/temp/speedbike_trail/New(loc,move_dir) - ..() - setDir(move_dir) /obj/vehicle/space/speedbike/Move(newloc,move_dir) if(has_buckled_mobs()) - new /obj/effect/overlay/temp/speedbike_trail(loc,move_dir) + new /obj/effect/overlay/temp/dir_setting/speedbike_trail(loc,move_dir) . = ..() /obj/vehicle/space/speedbike/red From 9d50549c22391cbc9659984faeb58e17980db09d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 08:13:56 -0500 Subject: [PATCH 033/131] Ports chem grenades to Initialize --- .../items/weapons/grenades/chem_grenade.dm | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 9ecd9809af..1ef83f3ac1 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -19,10 +19,10 @@ var/threatscale = 1 // Used by advanced grenades to make them slightly more worthy. var/no_splash = FALSE //If the grenade deletes even if it has no reagents to splash with. Used for slime core reactions. -/obj/item/weapon/grenade/chem_grenade/New() +/obj/item/weapon/grenade/chem_grenade/Initialize() + . = ..() create_reagents(1000) stage_change() // If no argument is set, it will change the stage to the current stage, useful for stock grenades that start READY. - ..() /obj/item/weapon/grenade/chem_grenade/examine(mob/user) display_timer = (stage == READY && !nadeassembly) //show/hide the timer based on assembly state @@ -313,8 +313,8 @@ desc = "Used for emergency sealing of air breaches." stage = READY -/obj/item/weapon/grenade/chem_grenade/metalfoam/New() - ..() +/obj/item/weapon/grenade/chem_grenade/metalfoam/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) @@ -331,8 +331,8 @@ desc = "Used for clearing rooms of living things." stage = READY -/obj/item/weapon/grenade/chem_grenade/incendiary/New() - ..() +/obj/item/weapon/grenade/chem_grenade/incendiary/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) @@ -349,8 +349,8 @@ desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." stage = READY -/obj/item/weapon/grenade/chem_grenade/antiweed/New() - ..() +/obj/item/weapon/grenade/chem_grenade/antiweed/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) @@ -368,8 +368,8 @@ desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." stage = READY -/obj/item/weapon/grenade/chem_grenade/cleaner/New() - ..() +/obj/item/weapon/grenade/chem_grenade/cleaner/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) @@ -386,8 +386,8 @@ desc = "Waffle Co.-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." stage = READY -/obj/item/weapon/grenade/chem_grenade/ez_clean/New() - ..() +/obj/item/weapon/grenade/chem_grenade/ez_clean/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) @@ -405,8 +405,8 @@ desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents." stage = READY -/obj/item/weapon/grenade/chem_grenade/teargas/New() - ..() +/obj/item/weapon/grenade/chem_grenade/teargas/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) @@ -424,8 +424,8 @@ desc = "Used for melting armoured opponents." stage = READY -/obj/item/weapon/grenade/chem_grenade/facid/New() - ..() +/obj/item/weapon/grenade/chem_grenade/facid/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src) @@ -444,8 +444,8 @@ desc = "Used for wide scale painting projects." stage = READY -/obj/item/weapon/grenade/chem_grenade/colorful/New() - ..() +/obj/item/weapon/grenade/chem_grenade/colorful/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) @@ -463,8 +463,8 @@ stage = READY var/glitter_type = "glitter" -/obj/item/weapon/grenade/chem_grenade/glitter/New() - ..() +/obj/item/weapon/grenade/chem_grenade/glitter/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) @@ -496,8 +496,8 @@ desc = "BURN!-brand foaming clf3. In a special applicator for rapid purging of wide areas." stage = READY -/obj/item/weapon/grenade/chem_grenade/clf3/New() - ..() +/obj/item/weapon/grenade/chem_grenade/clf3/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src) @@ -514,8 +514,8 @@ desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin" stage = READY -/obj/item/weapon/grenade/chem_grenade/bioterrorfoam/New() - ..() +/obj/item/weapon/grenade/chem_grenade/bioterrorfoam/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src) @@ -534,8 +534,8 @@ desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE." stage = READY -/obj/item/weapon/grenade/chem_grenade/tuberculosis/New() - ..() +/obj/item/weapon/grenade/chem_grenade/tuberculosis/Initialize() + . = ..() var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src) From 991fb8335c8e71d0f0c79141c4fff6e8c0928c06 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 29 Apr 2017 11:42:28 -0500 Subject: [PATCH 034/131] manual merge --- code/citadel/_cit_helpers.dm | 6 +- code/controllers/subsystem/blackbox.dm | 260 +++++++++--------- code/controllers/subsystem/server_maint.dm | 19 +- code/game/gamemodes/game_mode.dm | 20 +- code/game/machinery/telecomms/broadcasting.dm | 25 +- code/game/machinery/vending.dm | 4 +- code/game/objects/items/charter.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 6 +- code/game/turfs/simulated/minerals.dm | 4 +- code/modules/admin/admin.dm | 42 +-- code/modules/admin/secrets.dm | 54 ++-- code/modules/admin/topic.dm | 30 +- code/modules/admin/verbs/adminhelp.dm | 18 +- code/modules/admin/verbs/adminjump.dm | 16 +- code/modules/admin/verbs/debug.dm | 6 +- code/modules/admin/verbs/panicbunker.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 66 ++--- .../admin/verbs/reestablish_db_connection.dm | 4 +- code/modules/events/_event.dm | 4 +- code/modules/mining/equipment.dm | 6 +- .../mining/lavaland/necropolis_chests.dm | 6 +- .../chemistry/recipes/slime_extracts.dm | 2 +- code/modules/uplink/uplink_item.dm | 10 +- code/world.dm | 7 +- tgstation.dme | 2 +- 25 files changed, 301 insertions(+), 320 deletions(-) diff --git a/code/citadel/_cit_helpers.dm b/code/citadel/_cit_helpers.dm index 6e4ea762f1..db0626fa9c 100644 --- a/code/citadel/_cit_helpers.dm +++ b/code/citadel/_cit_helpers.dm @@ -117,7 +117,7 @@ GLOBAL_VAR_INIT(dlooc_allowed, 1) prefs.chat_toggles ^= CHAT_LOOC prefs.save_preferences() src << "You will [(prefs.chat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel." - feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/togglelooc() set category = "Server" @@ -126,7 +126,7 @@ GLOBAL_VAR_INIT(dlooc_allowed, 1) toggle_looc() log_admin("[key_name(usr)] toggled LOOC.") message_admins("[key_name_admin(usr)] toggled LOOC.") - feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /proc/toggle_looc(toggle = null) if(toggle != null) //if we're specifically en/disabling ooc @@ -146,7 +146,7 @@ GLOBAL_VAR_INIT(dlooc_allowed, 1) log_admin("[key_name(usr)] toggled Dead LOOC.") message_admins("[key_name_admin(usr)] toggled Dead LOOC.") - feedback_add_details("admin_verb","TDLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","TDLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /mob/living/carbon/proc/has_penis() diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index d6cdcda6c1..1b14b352df 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -1,9 +1,7 @@ -GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new) - -//the feedback datum; stores all feedback -/datum/feedback - var/list/messages = list() - var/list/messages_admin = list() +SUBSYSTEM_DEF(blackbox) + name = "Blackbox" + wait = 6000 + flags = SS_NO_TICK_CHECK var/list/msg_common = list() var/list/msg_science = list() @@ -15,21 +13,47 @@ GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new) var/list/msg_syndicate = list() var/list/msg_service = list() var/list/msg_cargo = list() + var/list/msg_other = list() - var/list/datum/feedback_variable/feedback = new() + var/list/feedback = list() //list of datum/feedback_variable -/datum/feedback/proc/find_feedback_datum(variable) - for (var/datum/feedback_variable/FV in feedback) - if (FV.get_variable() == variable) - return FV - var/datum/feedback_variable/FV = new(variable) - feedback += FV - return FV +//poll population +/datum/controller/subsystem/blackbox/fire() + if(!SSdbcore.Connect()) + return + var/playercount = 0 + for(var/mob/M in GLOB.player_list) + if(M.client) + playercount += 1 + var/admincount = GLOB.admins.len + var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')") + query_record_playercount.Execute() -/datum/feedback/proc/get_round_feedback() - return feedback +/datum/controller/subsystem/blackbox/Recover() + msg_common = SSblackbox.msg_common + msg_science = SSblackbox.msg_science + msg_command = SSblackbox.msg_command + msg_medical = SSblackbox.msg_medical + msg_engineering = SSblackbox.msg_engineering + msg_security = SSblackbox.msg_security + msg_deathsquad = SSblackbox.msg_deathsquad + msg_syndicate = SSblackbox.msg_syndicate + msg_service = SSblackbox.msg_service + msg_cargo = SSblackbox.msg_cargo + msg_other = SSblackbox.msg_other -/datum/feedback/proc/round_end_data_gathering() + feedback = SSblackbox.feedback + +//no touchie +/datum/controller/subsystem/blackbox/can_vv_get(var_name) + if(var_name == "feedback") + return FALSE + return ..() + +/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value) + return FALSE + +/datum/controller/subsystem/blackbox/Shutdown() var/pda_msg_amt = 0 var/rc_msg_amt = 0 @@ -39,30 +63,27 @@ GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new) if (MS.rc_msgs.len > rc_msg_amt) rc_msg_amt = MS.rc_msgs.len - feedback_set_details("radio_usage","") + set_details("radio_usage","") - feedback_add_details("radio_usage","COM-[msg_common.len]") - feedback_add_details("radio_usage","SCI-[msg_science.len]") - feedback_add_details("radio_usage","HEA-[msg_command.len]") - feedback_add_details("radio_usage","MED-[msg_medical.len]") - feedback_add_details("radio_usage","ENG-[msg_engineering.len]") - feedback_add_details("radio_usage","SEC-[msg_security.len]") - feedback_add_details("radio_usage","DTH-[msg_deathsquad.len]") - feedback_add_details("radio_usage","SYN-[msg_syndicate.len]") - feedback_add_details("radio_usage","SRV-[msg_service.len]") - feedback_add_details("radio_usage","CAR-[msg_cargo.len]") - feedback_add_details("radio_usage","OTH-[messages.len]") - feedback_add_details("radio_usage","PDA-[pda_msg_amt]") - feedback_add_details("radio_usage","RC-[rc_msg_amt]") + add_details("radio_usage","COM-[msg_common.len]") + add_details("radio_usage","SCI-[msg_science.len]") + add_details("radio_usage","HEA-[msg_command.len]") + add_details("radio_usage","MED-[msg_medical.len]") + add_details("radio_usage","ENG-[msg_engineering.len]") + add_details("radio_usage","SEC-[msg_security.len]") + add_details("radio_usage","DTH-[msg_deathsquad.len]") + add_details("radio_usage","SYN-[msg_syndicate.len]") + add_details("radio_usage","SRV-[msg_service.len]") + add_details("radio_usage","CAR-[msg_cargo.len]") + add_details("radio_usage","OTH-[msg_other.len]") + add_details("radio_usage","PDA-[pda_msg_amt]") + add_details("radio_usage","RC-[rc_msg_amt]") - feedback_set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set. + set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set. -//This proc is only to be called at round end. -/datum/feedback/proc/save_all_data_to_sql() - if (!feedback) return + if (!SSdbcore.Connect()) + return - round_end_data_gathering() //round_end time logging and some other data processing - if (!SSdbcore.Connect()) return var/round_id var/datum/DBQuery/query_feedback_max_id = SSdbcore.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]") @@ -89,69 +110,99 @@ GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new) var/datum/DBQuery/query_feedback_save = SSdbcore.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist) query_feedback_save.Execute() +/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq) + switch(freq) + if(1459) + msg_common += blackbox_msg + if(1351) + msg_science += blackbox_msg + if(1353) + msg_command += blackbox_msg + if(1355) + msg_medical += blackbox_msg + if(1357) + msg_engineering += blackbox_msg + if(1359) + msg_security += blackbox_msg + if(1441) + msg_deathsquad += blackbox_msg + if(1213) + msg_syndicate += blackbox_msg + if(1349) + msg_service += blackbox_msg + if(1347) + msg_cargo += blackbox_msg + else + msg_other += blackbox_msg -/proc/feedback_set(variable,value) - if(!GLOB.blackbox) - return +/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable) + for(var/datum/feedback_variable/FV in feedback) + if(FV.get_variable() == variable) + return FV - var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) - - if(!FV) - return + var/datum/feedback_variable/FV = new(variable) + feedback += FV + return FV +/datum/controller/subsystem/blackbox/proc/set_val(variable, value) + var/datum/feedback_variable/FV = find_feedback_datum(variable) FV.set_value(value) -/proc/feedback_inc(variable,value) - if(!GLOB.blackbox) - return - - var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) - - if(!FV) - return - +/datum/controller/subsystem/blackbox/proc/inc(variable, value) + var/datum/feedback_variable/FV = find_feedback_datum(variable) FV.inc(value) -/proc/feedback_dec(variable,value) - if(!GLOB.blackbox) - return - - var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) - - if(!FV) - return - +/datum/controller/subsystem/blackbox/proc/dec(variable,value) + var/datum/feedback_variable/FV = find_feedback_datum(variable) FV.dec(value) -/proc/feedback_set_details(variable,details) - if(!GLOB.blackbox) - return - - var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) - - if(!FV) - return - +/datum/controller/subsystem/blackbox/proc/set_details(variable,details) + var/datum/feedback_variable/FV = find_feedback_datum(variable) FV.set_details(details) -/proc/feedback_add_details(variable,details) - if(!GLOB.blackbox) - return - - var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) - - if(!FV) - return - +/datum/controller/subsystem/blackbox/proc/add_details(variable,details) + var/datum/feedback_variable/FV = find_feedback_datum(variable) FV.add_details(details) +/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L) + if(!SSdbcore.Connect()) + return + if(!L || !L.key || !L.mind) + return + var/turf/T = get_turf(L) + var/area/placeofdeath = get_area(T.loc) + var/sqlname = sanitizeSQL(L.real_name) + var/sqlkey = sanitizeSQL(L.ckey) + var/sqljob = sanitizeSQL(L.mind.assigned_role) + var/sqlspecial = sanitizeSQL(L.mind.special_role) + var/sqlpod = sanitizeSQL(placeofdeath.name) + var/laname + var/lakey + if(L.lastattacker && ismob(L.lastattacker)) + var/mob/LA = L.lastattacker + laname = sanitizeSQL(LA.real_name) + lakey = sanitizeSQL(LA.key) + var/sqlgender = sanitizeSQL(L.gender) + var/sqlbrute = sanitizeSQL(L.getBruteLoss()) + var/sqlfire = sanitizeSQL(L.getFireLoss()) + var/sqlbrain = sanitizeSQL(L.getBrainLoss()) + var/sqloxy = sanitizeSQL(L.getOxyLoss()) + var/sqltox = sanitizeSQL(L.getStaminaLoss()) + var/sqlclone = sanitizeSQL(L.getStaminaLoss()) + var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) + var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") + var/map = sanitizeSQL(SSmapping.config.map_name) + var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')") + query_report_death.Execute() + + //feedback variable datum, for storing all kinds of data /datum/feedback_variable var/variable var/value var/details -/datum/feedback_variable/New(var/param_variable,var/param_value = 0) +/datum/feedback_variable/New(param_variable, param_value = 0) variable = param_variable value = param_value @@ -204,50 +255,3 @@ GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new) /datum/feedback_variable/proc/get_parsed() return list(variable,value,details) - -//sql reporting procs -/proc/sql_poll_population() - if(!config.sql_enabled) - return - if(!SSdbcore.Connect()) - return - var/playercount = 0 - for(var/mob/M in GLOB.player_list) - if(M.client) - playercount += 1 - var/admincount = GLOB.admins.len - var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')") - query_record_playercount.Execute() - -/proc/sql_report_death(mob/living/L) - if(!config.sql_enabled) - return - if(!SSdbcore.Connect()) - return - if(!L || !L.key || !L.mind) - return - var/turf/T = get_turf(L) - var/area/placeofdeath = get_area(T.loc) - var/sqlname = sanitizeSQL(L.real_name) - var/sqlkey = sanitizeSQL(L.ckey) - var/sqljob = sanitizeSQL(L.mind.assigned_role) - var/sqlspecial = sanitizeSQL(L.mind.special_role) - var/sqlpod = sanitizeSQL(placeofdeath.name) - var/laname - var/lakey - if(L.lastattacker && ismob(L.lastattacker)) - var/mob/LA = L.lastattacker - laname = sanitizeSQL(LA.real_name) - lakey = sanitizeSQL(LA.key) - var/sqlgender = sanitizeSQL(L.gender) - var/sqlbrute = sanitizeSQL(L.getBruteLoss()) - var/sqlfire = sanitizeSQL(L.getFireLoss()) - var/sqlbrain = sanitizeSQL(L.getBrainLoss()) - var/sqloxy = sanitizeSQL(L.getOxyLoss()) - var/sqltox = sanitizeSQL(L.getStaminaLoss()) - var/sqlclone = sanitizeSQL(L.getStaminaLoss()) - var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) - var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") - var/map = sanitizeSQL(SSmapping.config.map_name) - var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')") - query_report_death.Execute() diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index 9c730e92b1..d3a0862112 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -13,20 +13,21 @@ SUBSYSTEM_DEF(server_maint) ..() /datum/controller/subsystem/server_maint/fire(resumed = FALSE) - if (!resumed) + if(!resumed) src.currentrun = GLOB.clients.Copy() - var/round_started = Master.round_started var/list/currentrun = src.currentrun - while (length(currentrun)) - var/client/C = currentrun[currentrun.len] - currentrun.len-- + var/round_started = Master.round_started - if(config.kick_inactive) - if(round_started && C.is_afk(INACTIVITY_KICK)) - if(!istype(C.mob, /mob/dead)) + for(var/I in currentrun) + var/client/C = I + //handle kicking inactive players + if(round_started && config.kick_inactive) + if(C.is_afk(config.afk_period)) + var/cmob = C.mob + if(!(istype(cmob, /mob/dead/observer) || (istype(cmob, /mob/dead) && C.holder))) log_access("AFK: [key_name(C)]") - to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.") + to_chat(C, "You have been inactive for more than [config.afk_period / 600] minutes and have been disconnected.") qdel(C) if (!(!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1))) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 44d1121f45..a496715af2 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -80,12 +80,12 @@ report = config.intercept addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) - feedback_set_details("round_start","[time2text(world.realtime)]") + SSblackbox.set_details("round_start","[time2text(world.realtime)]") if(SSticker && SSticker.mode) - feedback_set_details("game_mode","[SSticker.mode]") + SSblackbox.set_details("game_mode","[SSticker.mode]") if(GLOB.revdata.commit) - feedback_set_details("revision","[GLOB.revdata.commit]") - feedback_set_details("server_ip","[world.internet_address]:[world.port]") + SSblackbox.set_details("revision","[GLOB.revdata.commit]") + SSblackbox.set_details("server_ip","[world.internet_address]:[world.port]") if(report) addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h)) generate_station_goals() @@ -246,17 +246,17 @@ ghosts++ if(clients > 0) - SSblackbox.set_val("round_end_clients",clients) + SSblackbox.set_val("round_end_clients",clients) if(ghosts > 0) - SSblackbox.set_val("round_end_ghosts",ghosts) + SSblackbox.set_val("round_end_ghosts",ghosts) if(surviving_humans > 0) - SSblackbox.set_val("survived_human",surviving_humans) + SSblackbox.set_val("survived_human",surviving_humans) if(surviving_total > 0) - SSblackbox.set_val("survived_total",surviving_total) + SSblackbox.set_val("survived_total",surviving_total) if(escaped_humans > 0) - SSblackbox.set_val("escaped_human",escaped_humans) + SSblackbox.set_val("escaped_human",escaped_humans) if(escaped_total > 0) - SSblackbox.set_val("escaped_total",escaped_total) + SSblackbox.set_val("escaped_total",escaped_total) send2irc("Server", "Round just ended.") return 0 diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index d6c6cdc151..6c1fd431e5 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -144,30 +144,7 @@ // --- This following recording is intended for research and feedback in the use of department radio channels --- var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]" - if(istype(GLOB.blackbox)) - switch(freq) - if(1459) - GLOB.blackbox.msg_common += blackbox_msg - if(1351) - GLOB.blackbox.msg_science += blackbox_msg - if(1353) - GLOB.blackbox.msg_command += blackbox_msg - if(1355) - GLOB.blackbox.msg_medical += blackbox_msg - if(1357) - GLOB.blackbox.msg_engineering += blackbox_msg - if(1359) - GLOB.blackbox.msg_security += blackbox_msg - if(1441) - GLOB.blackbox.msg_deathsquad += blackbox_msg - if(1213) - GLOB.blackbox.msg_syndicate += blackbox_msg - if(1349) - GLOB.blackbox.msg_service += blackbox_msg - if(1347) - GLOB.blackbox.msg_cargo += blackbox_msg - else - GLOB.blackbox.messages += blackbox_msg + SSblackbox.LogBroadcast(blackbox_msg, freq) sleep(50) if(!QDELETED(virt)) //It could happen to YOU diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index cbb4efd6b0..ac661ad988 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -297,7 +297,7 @@ to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") cut_overlays() if(panel_open) - add_overlay("[initial(icon_state)]-panel") + add_overlay("[initial(icon_state)]-panel") playsound(src.loc, W.usesound, 50, 1) updateUsrDialog() else @@ -528,7 +528,7 @@ if(icon_vend) //Show the vending animation if needed flick(icon_vend,src) new R.product_path(get_turf(src)) - feedback_add_details("vending_machine_usage","[src.type]|[R.product_path]") + SSblackbox.add_details("vending_machine_usage","[src.type]|[R.product_path]") vend_ready = 1 return diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 41a793df30..0cf73fd9ff 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -86,7 +86,7 @@ name = "station charter for [station_name()]" desc = "An official document entrusting the governance of \ [station_name()] and surrounding space to Captain [uname]." - feedback_set_details("station_renames","[station_name()]") + SSblackbox.set_details("station_renames","[station_name()]") if(!unlimited_uses) used = TRUE diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 49cc975546..0ab74a019d 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -45,7 +45,7 @@ if(do_mob(user, C, 30) && (C.get_num_arms() >= 2 || C.get_arm_ignore())) apply_cuffs(C,user) to_chat(user, "You handcuff [C].") - feedback_add_details("handcuffs","[type]") + SSblackbox.add_details("handcuffs","[type]") add_logs(user, C, "handcuffed") else @@ -275,7 +275,7 @@ C.legcuffed = src src.loc = C C.update_inv_legcuffed() - feedback_add_details("handcuffs","[type]") + SSblackbox.add_details("handcuffs","[type]") else if(isanimal(L)) var/mob/living/simple_animal/SA = L if(SA.mob_size > MOB_SIZE_TINY) @@ -336,7 +336,7 @@ C.legcuffed = src src.loc = C C.update_inv_legcuffed() - feedback_add_details("handcuffs","[type]") + SSblackbox.add_details("handcuffs","[type]") to_chat(C, "\The [src] ensnares you!") C.Weaken(weaken) diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 5805d75e56..398ff190f2 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -63,7 +63,7 @@ if(ismineralturf(src)) to_chat(user, "You finish cutting into the rock.") gets_drilled(user) - feedback_add_details("pick_used_mining","[P.type]") + SSblackbox.add_details("pick_used_mining","[P.type]") else return attack_hand(user) @@ -72,7 +72,7 @@ var/i for(i in 1 to mineralAmt) new mineralType(src) - feedback_add_details("ore_mined",mineralType) + SSblackbox.add_details("ore_mined",mineralType) ChangeTurf(turf_type, defer_change) addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE) playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index cfe8bd4ee2..25ddc4d68d 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -42,8 +42,8 @@ body += "TP - " body += "PM - " body += "SM - " - body += "FLW - " - body += "LOGS\]
" + body += "FLW - " + body += "LOGS\]
" body += "Mob type = [M.type]

" @@ -166,7 +166,7 @@ body += "" usr << browse(body, "window=adminplayeropts-\ref[M];size=550x515") - SSblackbox.add_details("admin_verb","Player Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Player Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/access_news_network() //MARKER @@ -410,7 +410,7 @@ /datum/admins/proc/restart() set category = "Server" - set name = "Reboot World" + set name = "Reboot World" set desc="Restarts the world immediately" if (!usr.client.holder) return @@ -419,7 +419,7 @@ return if(confirm == "Yes") SSticker.delay_end = 0 - feedback_add_details("admin_verb","Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! world.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10) /datum/admins/proc/end_round() @@ -434,7 +434,7 @@ return if(confirm == "Yes") SSticker.force_ending = 1 - SSblackbox.add_details("admin_verb","End Round") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","End Round") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/announce() @@ -450,7 +450,7 @@ message = adminscrub(message,500) to_chat(world, "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:\n \t [message]") log_admin("Announce: [key_name(usr)] : [message]") - SSblackbox.add_details("admin_verb","Announce") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Announce") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/set_admin_notice() set category = "Special Verbs" @@ -471,7 +471,7 @@ message_admins("[key_name(usr)] set the admin notice.") log_admin("[key_name(usr)] set the admin notice:\n[new_admin_notice]") to_chat(world, "Admin Notice:\n \t [new_admin_notice]") - SSblackbox.add_details("admin_verb","Set Admin Notice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Set Admin Notice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! GLOB.admin_notice = new_admin_notice return @@ -482,7 +482,7 @@ toggle_ooc() log_admin("[key_name(usr)] toggled OOC.") message_admins("[key_name_admin(usr)] toggled OOC.") - SSblackbox.add_details("admin_toggle","Toggle OOC|[GLOB.ooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle OOC|[GLOB.ooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleoocdead() set category = "Server" @@ -492,7 +492,7 @@ log_admin("[key_name(usr)] toggled OOC.") message_admins("[key_name_admin(usr)] toggled Dead OOC.") - SSblackbox.add_details("admin_toggle","Toggle Dead OOC|[GLOB.dooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Dead OOC|[GLOB.dooc_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/startnow() set category = "Server" @@ -507,7 +507,7 @@ started as soon as possible.)" message_admins("\ [usr.key] has started the game.[msg]") - SSblackbox.add_details("admin_verb","Start Now") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Start Now") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return 1 else to_chat(usr, "Error: Start Now: Game has already started.") @@ -526,7 +526,7 @@ log_admin("[key_name(usr)] toggled new player game entering.") message_admins("[key_name_admin(usr)] toggled new player game entering.") world.update_status() - SSblackbox.add_details("admin_toggle","Toggle Entering|[GLOB.enter_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Entering|[GLOB.enter_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleAI() set category = "Server" @@ -539,7 +539,7 @@ to_chat(world, "The AI job is chooseable now.") log_admin("[key_name(usr)] toggled AI allowed.") world.update_status() - SSblackbox.add_details("admin_toggle","Toggle AI|[config.allow_ai]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle AI|[config.allow_ai]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleaban() set category = "Server" @@ -553,7 +553,7 @@ message_admins("[key_name_admin(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].") log_admin("[key_name(usr)] toggled respawn to [GLOB.abandon_allowed ? "On" : "Off"].") world.update_status() - SSblackbox.add_details("admin_toggle","Toggle Respawn|[GLOB.abandon_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Respawn|[GLOB.abandon_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/delay() set category = "Server" @@ -572,7 +572,7 @@ to_chat(world, "The game will start in [newtime] seconds.") world << 'sound/ai/attention.ogg' log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.") - SSblackbox.add_details("admin_verb","Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/unprison(mob/M in GLOB.mob_list) set category = "Admin" @@ -583,7 +583,7 @@ log_admin("[key_name(usr)] has unprisoned [key_name(M)]") else alert("[M.name] is not prisoned.") - SSblackbox.add_details("admin_verb","Unprison") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Unprison") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! ////////////////////////////////////////////////////////////////////////////////////////////////ADMIN HELPER PROCS @@ -624,7 +624,7 @@ A.admin_spawned = TRUE log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])") - SSblackbox.add_details("admin_verb","Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/show_traitor_panel(mob/M in GLOB.mob_list) @@ -640,7 +640,7 @@ return M.mind.edit_memory() - SSblackbox.add_details("admin_verb","Traitor Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Traitor Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggletintedweldhelmets() @@ -654,7 +654,7 @@ to_chat(world, "The tinted_weldhelh has been disabled!") log_admin("[key_name(usr)] toggled tinted_weldhelh.") message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.") - SSblackbox.add_details("admin_toggle","Toggle Tinted Welding Helmets|[GLOB.tinted_weldhelh]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Tinted Welding Helmets|[GLOB.tinted_weldhelh]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleguests() set category = "Server" @@ -667,7 +667,7 @@ to_chat(world, "Guests may now enter the game.") log_admin("[key_name(usr)] toggled guests game entering [GLOB.guests_allowed?"":"dis"]allowed.") message_admins("[key_name_admin(usr)] toggled guests game entering [GLOB.guests_allowed?"":"dis"]allowed.") - SSblackbox.add_details("admin_toggle","Toggle Guests|[GLOB.guests_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Guests|[GLOB.guests_allowed]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/output_ai_laws() var/ai_number = 0 @@ -796,7 +796,7 @@ message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].") log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].") - SSblackbox.add_details("admin_verb","Ghost Drag Control") + SSblackbox.add_details("admin_verb","Ghost Drag Control") tomob.ckey = frommob.ckey qdel(frommob) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 7f0479eac9..aea7d3521a 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -198,7 +198,7 @@ if("moveminingshuttle") if(!check_rights(R_ADMIN)) return - feedback_add_details("admin_secrets_fun_used","Send Mining Shuttle") + SSblackbox.add_details("admin_secrets_fun_used","Send Mining Shuttle") if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away")) message_admins("[key_name_admin(usr)] moved mining shuttle") log_admin("[key_name(usr)] moved the mining shuttle") @@ -206,7 +206,7 @@ if("movelaborshuttle") if(!check_rights(R_ADMIN)) return - feedback_add_details("admin_secrets_fun_used","Send Labor Shuttle") + SSblackbox.add_details("admin_secrets_fun_used","Send Labor Shuttle") if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away")) message_admins("[key_name_admin(usr)] moved labor shuttle") log_admin("[key_name(usr)] moved the labor shuttle") @@ -214,7 +214,7 @@ if("moveferry") if(!check_rights(R_ADMIN)) return - feedback_add_details("admin_secrets_fun_used","Send Centcom Ferry") + SSblackbox.add_details("admin_secrets_fun_used","Send Centcom Ferry") if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away")) message_admins("[key_name_admin(usr)] moved the centcom ferry") log_admin("[key_name(usr)] moved the centcom ferry") @@ -226,7 +226,7 @@ if(A) var/new_perma = !A.perma_docked A.perma_docked = new_perma - feedback_add_details("admin_toggle","Permadock Arrivals Shuttle|[new_perma]") + SSblackbox.add_details("admin_toggle","Permadock Arrivals Shuttle|[new_perma]") message_admins("[key_name_admin(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle") log_admin("[key_name(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle") else @@ -276,7 +276,7 @@ if("monkey") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Monkeyize All Humans") + SSblackbox.add_details("admin_secrets_fun_used","Monkeyize All Humans") for(var/mob/living/carbon/human/H in GLOB.mob_list) spawn(0) H.monkeyize() @@ -287,7 +287,7 @@ return var/result = input(usr, "Please choose a new species","Species") as null|anything in GLOB.species_list if(result) - feedback_add_details("admin_secrets_fun_used","Mass Species Change([result])") + SSblackbox.add_details("admin_secrets_fun_used","Mass Species Change([result])") log_admin("[key_name(usr)] turned all humans into [result]", 1) message_admins("\blue [key_name_admin(usr)] turned all humans into [result]") var/newtype = GLOB.species_list[result] @@ -298,12 +298,12 @@ if(!check_rights(R_FUN)) return usr.client.triple_ai() - feedback_add_details("admin_secrets_fun_used","Triple AI") + SSblackbox.add_details("admin_secrets_fun_used","Triple AI") if("power") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Power All APCs") + SSblackbox.add_details("admin_secrets_fun_used","Power All APCs") log_admin("[key_name(usr)] made all areas powered", 1) message_admins("[key_name_admin(usr)] made all areas powered") power_restore() @@ -311,7 +311,7 @@ if("unpower") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Depower All APCs") + SSblackbox.add_details("admin_secrets_fun_used","Depower All APCs") log_admin("[key_name(usr)] made all areas unpowered", 1) message_admins("[key_name_admin(usr)] made all areas unpowered") power_failure() @@ -319,7 +319,7 @@ if("quickpower") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Power All SMESs") + SSblackbox.add_details("admin_secrets_fun_used","Power All SMESs") log_admin("[key_name(usr)] made all SMESs powered", 1) message_admins("[key_name_admin(usr)] made all SMESs powered") power_restore_quick() @@ -333,7 +333,7 @@ var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN) if(!objective) return - feedback_add_details("admin_secrets_fun_used","Traitor All ([objective])") + SSblackbox.add_details("admin_secrets_fun_used","Traitor All ([objective])") for(var/mob/living/carbon/human/H in GLOB.player_list) if(H.stat == 2 || !H.client || !H.mind) continue if(is_special_character(H)) continue @@ -365,7 +365,7 @@ if("changebombcap") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Bomb Cap") + SSblackbox.add_details("admin_secrets_fun_used","Bomb Cap") var/newBombCap = input(usr,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) as num|null if (newBombCap < 4) @@ -384,7 +384,7 @@ if("blackout") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Break All Lights") + SSblackbox.add_details("admin_secrets_fun_used","Break All Lights") message_admins("[key_name_admin(usr)] broke all lights") for(var/obj/machinery/light/L in GLOB.machines) L.break_light_tube() @@ -400,7 +400,7 @@ if(animetype == "Cancel" || droptype == "Cancel") return - feedback_add_details("admin_secrets_fun_used","Chinese Cartoons") + SSblackbox.add_details("admin_secrets_fun_used","Chinese Cartoons") message_admins("[key_name_admin(usr)] made everything kawaii.") for(var/mob/living/carbon/human/H in GLOB.mob_list) H << sound('sound/AI/animes.ogg') @@ -430,7 +430,7 @@ if("whiteout") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Fix All Lights") + SSblackbox.add_details("admin_secrets_fun_used","Fix All Lights") message_admins("[key_name_admin(usr)] fixed all lights") for(var/obj/machinery/light/L in GLOB.machines) L.fix() @@ -441,7 +441,7 @@ if("virus") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Virus Outbreak") + SSblackbox.add_details("admin_secrets_fun_used","Virus Outbreak") switch(alert("Do you want this to be a random disease or do you have something in mind?",,"Make Your Own","Random","Choose")) if("Make Your Own") AdminCreateVirus(usr.client) @@ -456,7 +456,7 @@ if("retardify") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Mass Braindamage") + SSblackbox.add_details("admin_secrets_fun_used","Mass Braindamage") for(var/mob/living/carbon/human/H in GLOB.player_list) to_chat(H, "You suddenly feel stupid.") H.setBrainLoss(60) @@ -465,7 +465,7 @@ if("eagles")//SCRAW if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Egalitarian Station") + SSblackbox.add_details("admin_secrets_fun_used","Egalitarian Station") for(var/obj/machinery/door/airlock/W in GLOB.machines) if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison)) W.req_access = list() @@ -475,7 +475,7 @@ if("guns") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Summon Guns") + SSblackbox.add_details("admin_secrets_fun_used","Summon Guns") var/survivor_probability = 0 switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!")) if("Some Antags") @@ -488,7 +488,7 @@ if("magic") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Summon Magic") + SSblackbox.add_details("admin_secrets_fun_used","Summon Magic") var/survivor_probability = 0 switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!")) if("Some Antags") @@ -504,22 +504,22 @@ if(!SSevents.wizardmode) if(alert("Do you want to toggle summon events on?",,"Yes","No") == "Yes") summonevents() - feedback_add_details("admin_secrets_fun_used","Activate Summon Events") + SSblackbox.add_details("admin_secrets_fun_used","Activate Summon Events") else switch(alert("What would you like to do?",,"Intensify Summon Events","Turn Off Summon Events","Nothing")) if("Intensify Summon Events") summonevents() - feedback_add_details("admin_secrets_fun_used","Intensify Summon Events") + SSblackbox.add_details("admin_secrets_fun_used","Intensify Summon Events") if("Turn Off Summon Events") SSevents.toggleWizardmode() SSevents.resetFrequency() - feedback_add_details("admin_secrets_fun_used","Disable Summon Events") + SSblackbox.add_details("admin_secrets_fun_used","Disable Summon Events") if("dorf") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","Dwarf Beards") + SSblackbox.add_details("admin_secrets_fun_used","Dwarf Beards") for(var/mob/living/carbon/human/B in GLOB.mob_list) B.facial_hair_style = "Dward Beard" B.update_hair() @@ -528,21 +528,21 @@ if("onlyone") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","There Can Be Only One") + SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only One") usr.client.only_one() send_to_playing_players('sound/misc/highlander.ogg') if("delayed_onlyone") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","There Can Be Only One") + SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only One") usr.client.only_one_delayed() send_to_playing_players('sound/misc/highlander_delayed.ogg') if("onlyme") if(!check_rights(R_FUN)) return - feedback_add_details("admin_secrets_fun_used","There Can Be Only Me") + SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only Me") only_me() if("maint_access_brig") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 5d46c1d409..e1bc663a0c 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -498,7 +498,7 @@ GLOB.Banlist["minutes"] << minutes GLOB.Banlist["bannedby"] << usr.ckey GLOB.Banlist.cd = "/base" - SSblackbox.inc("ban_edit",1) + SSblackbox.inc("ban_edit",1) unbanpanel() /////////////////////////////////////new ban stuff @@ -520,7 +520,7 @@ if("Yes") ban_unban_log_save("[key_name(usr)] removed [key_name(M)]'s appearance ban.") log_admin_private("[key_name(usr)] removed [key_name(M)]'s appearance ban.") - SSblackbox.inc("ban_appearance_unban", 1) + SSblackbox.inc("ban_appearance_unban", 1) DB_ban_unban(M.ckey, BANTYPE_ANY_JOB, "appearance") if(M.client) jobban_buildcache(M.client) @@ -539,7 +539,7 @@ jobban_buildcache(M.client) ban_unban_log_save("[key_name(usr)] appearance banned [key_name(M)]. reason: [reason]") log_admin_private("[key_name(usr)] appearance banned [key_name(M)]. \nReason: [reason]") - SSblackbox.inc("ban_appearance",1) + SSblackbox.inc("ban_appearance",1) create_message("note", M.ckey, null, "Appearance banned - [reason]", null, null, 0, 0) message_admins("[key_name_admin(usr)] appearance banned [key_name_admin(M)].") to_chat(M, "You have been appearance banned by [usr.client.ckey].") @@ -924,8 +924,8 @@ jobban_buildcache(M.client) ban_unban_log_save("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes. reason: [reason]") log_admin_private("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes.") - SSblackbox.inc("ban_job_tmp",1) - SSblackbox.add_details("ban_job_tmp","- [job]") + SSblackbox.inc("ban_job_tmp",1) + SSblackbox.add_details("ban_job_tmp","- [job]") if(!msg) msg = job else @@ -949,8 +949,8 @@ jobban_buildcache(M.client) ban_unban_log_save("[key_name(usr)] perma-jobbanned [key_name(M)] from [job]. reason: [reason]") log_admin_private("[key_name(usr)] perma-banned [key_name(M)] from [job]") - SSblackbox.inc("ban_job",1) - SSblackbox.add_details("ban_job","- [job]") + SSblackbox.inc("ban_job",1) + SSblackbox.add_details("ban_job","- [job]") if(!msg) msg = job else @@ -980,8 +980,8 @@ DB_ban_unban(M.ckey, BANTYPE_ANY_JOB, job) if(M.client) jobban_buildcache(M.client) - SSblackbox.inc("ban_job_unban",1) - SSblackbox.add_details("ban_job_unban","- [job]") + SSblackbox.inc("ban_job_unban",1) + SSblackbox.add_details("ban_job_unban","- [job]") if(!msg) msg = job else @@ -1116,8 +1116,8 @@ ban_unban_log_save("[key_name(usr)] has banned [key_name(M)]. - Reason: [reason] - This will be removed in [mins] minutes.") to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason]") to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") - SSblackbox.inc("ban_tmp",1) - SSblackbox.inc("ban_tmp_mins",mins) + SSblackbox.inc("ban_tmp",1) + SSblackbox.inc("ban_tmp_mins",mins) if(config.banappeals) to_chat(M, "To try to resolve this matter head to [config.banappeals]") else @@ -1156,7 +1156,7 @@ var/datum/admin_help/AH = M.client ? M.client.current_ticket : null if(AH) AH.Resolve() - feedback_inc("ban_perma",1) + SSblackbox.inc("ban_perma",1) qdel(M.client) if("Cancel") return @@ -1687,7 +1687,7 @@ log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)].") message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)].") - SSblackbox.inc("admin_cookies_spawned",1) + SSblackbox.inc("admin_cookies_spawned",1) to_chat(H, "Your prayers have been answered!! You received the best cookie!") H << 'sound/effects/pray_chaplain.ogg' @@ -1987,7 +1987,7 @@ var/choice = alert("Please confirm Feed channel creation.","Network Channel Handler","Confirm","Cancel") if(choice=="Confirm") GLOB.news_network.CreateFeedChannel(src.admincaster_feed_channel.channel_name, src.admin_signature, src.admincaster_feed_channel.locked, 1) - SSblackbox.inc("newscaster_channels",1) + SSblackbox.inc("newscaster_channels",1) log_admin("[key_name(usr)] created command feed channel: [src.admincaster_feed_channel.channel_name]!") src.admincaster_screen=5 src.access_news_network() @@ -2010,7 +2010,7 @@ src.admincaster_screen = 6 else GLOB.news_network.SubmitArticle(src.admincaster_feed_message.returnBody(-1), src.admin_signature, src.admincaster_feed_channel.channel_name, null, 1) - SSblackbox.inc("newscaster_stories",1) + SSblackbox.inc("newscaster_stories",1) src.admincaster_screen=4 for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 3c0bc185b8..dff21ae0a3 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -90,7 +90,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) C.current_ticket = CKey2ActiveTicket(C.ckey) if(C.current_ticket) C.current_ticket.AddInteraction("Client reconnected.") - C.current_ticket.initiator = C + C.current_ticket.initiator = C //Dissasociate ticket /datum/admin_help_tickets/proc/ClientLogout(client/C) @@ -264,9 +264,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) GLOB.ahelp_tickets.resolved_tickets -= src switch(state) if(AHELP_CLOSED) - feedback_dec("ahelp_close") + SSblackbox.dec("ahelp_close") if(AHELP_RESOLVED) - feedback_dec("ahelp_resolve") + SSblackbox.dec("ahelp_resolve") state = AHELP_ACTIVE closed_at = null if(initiator) @@ -276,7 +276,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/msg = "Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)]." message_admins(msg) log_admin_private(msg) - feedback_inc("ahelp_reopen") + SSblackbox.inc("ahelp_reopen") TicketPanel() //can only be done from here, so refresh it //private @@ -298,7 +298,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) GLOB.ahelp_tickets.ListInsert(src) AddInteraction("Closed by [key_name].") if(!silent) - feedback_inc("ahelp_close") + SSblackbox.inc("ahelp_close") var/msg = "Ticket [TicketHref("#[id]")] closed by [key_name]." message_admins(msg) log_admin_private(msg) @@ -316,7 +316,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) AddInteraction("Resolved by [key_name].") if(!silent) - feedback_inc("ahelp_resolve") + SSblackbox.inc("ahelp_resolve") var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]" message_admins(msg) log_admin_private(msg) @@ -335,7 +335,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(initiator, "Your admin help was rejected. The adminhelp verb has been returned to you so that you may try again.") to_chat(initiator, "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting.") - feedback_inc("ahelp_reject") + SSblackbox.inc("ahelp_reject") var/msg = "Ticket [TicketHref("#[id]")] rejected by [key_name]" message_admins(msg) log_admin_private(msg) @@ -354,7 +354,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(initiator) to_chat(initiator, msg) - feedback_inc("ahelp_icissue") + SSblackbox.inc("ahelp_icissue") msg = "Ticket [TicketHref("#[id]")] marked as IC by [key_name]" message_admins(msg) log_admin_private(msg) @@ -472,7 +472,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(!msg) return - feedback_add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! if(current_ticket) if(alert(usr, "You already have a ticket open. Is this for the same issue?",,"Yes","No") != "No") if(current_ticket) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 7a6167a986..202750cadd 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -23,7 +23,7 @@ usr.forceMove(T) log_admin("[key_name(usr)] jumped to [A]") message_admins("[key_name_admin(usr)] jumped to [A]") - SSblackbox.add_details("admin_verb","Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/jumptoturf(turf/T in world) set name = "Jump to Turf" @@ -35,7 +35,7 @@ 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]") usr.loc = T - SSblackbox.add_details("admin_verb","Jump To Turf") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Turf") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/jumptomob(mob/M in GLOB.mob_list) @@ -52,7 +52,7 @@ var/mob/A = src.mob var/turf/T = get_turf(M) if(T && isturf(T)) - SSblackbox.add_details("admin_verb","Jump To Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! A.forceMove(M.loc) else to_chat(A, "This mob is not located in the game world.") @@ -70,7 +70,7 @@ A.x = tx A.y = ty A.z = tz - SSblackbox.add_details("admin_verb","Jump To Coordiate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Coordiate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]") /client/proc/jumptokey() @@ -94,7 +94,7 @@ usr.forceMove(M.loc) - SSblackbox.add_details("admin_verb","Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/Getmob(mob/M in GLOB.mob_list) set category = "Admin" @@ -110,7 +110,7 @@ message_admins(msg) admin_ticket_log(M, msg) M.forceMove(loc) - feedback_add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/Getkey() set category = "Admin" @@ -138,7 +138,7 @@ if(M) M.forceMove(get_turf(usr)) usr.loc = M.loc - SSblackbox.add_details("admin_verb","Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/sendmob(mob/M in sortmobs()) set category = "Admin" @@ -156,4 +156,4 @@ admin_ticket_log(M, msg) else to_chat(src, "Failed to move mob to a valid location.") - feedback_add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file + SSblackbox.add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 38b0052eaf..4036247eac 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -81,7 +81,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that . = get_callproc_returnval(returnval, procname) if(.) to_chat(usr, .) - feedback_add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! GLOBAL_VAR_INIT(AdminProcCall, null) GLOBAL_PROTECT(AdminProcCall) @@ -130,7 +130,7 @@ GLOBAL_PROTECT(AdminProcCall) var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." message_admins(msg) admin_ticket_log(A, msg) - feedback_add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! var/returnval = WrapAdminProcCall(A, procname, lst) // Pass the lst as an argument list to the proc . = get_callproc_returnval(returnval,procname) @@ -784,7 +784,7 @@ GLOBAL_PROTECT(AdminProcCall) global.medals_enabled = !global.medals_enabled message_admins("[key_name_admin(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") - feedback_add_details("admin_verb","Toggle Medal Disable") // If... + SSblackbox.add_details("admin_verb","Toggle Medal Disable") // If... log_admin("[key_name(src)] [global.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") /client/proc/view_runtimes() diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm index b0c1aac982..3da486be78 100644 --- a/code/modules/admin/verbs/panicbunker.dm +++ b/code/modules/admin/verbs/panicbunker.dm @@ -11,5 +11,5 @@ message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"enabled":"disabled")].") if (config.panic_bunker && (!SSdbcore || !SSdbcore.IsConnected())) message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.") - feedback_add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 6e77b8daf8..f905ab879c 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -18,7 +18,7 @@ var/msg = "[key_name_admin(usr)] made [key_name_admin(M)] drop everything!" message_admins(msg) admin_ticket_log(M, msg) - feedback_add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list) set category = "Special Verbs" @@ -45,7 +45,7 @@ msg = " SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]" message_admins(msg) admin_ticket_log(M, msg) - feedback_add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_world_narrate() set category = "Special Verbs" @@ -62,7 +62,7 @@ to_chat(world, "[msg]") log_admin("GlobalNarrate: [key_name(usr)] : [msg]") message_admins("[key_name_admin(usr)] Sent a global narrate") - SSblackbox.add_details("admin_verb","Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_direct_narrate(mob/M) set category = "Special Verbs" @@ -88,7 +88,7 @@ msg = " DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
" message_admins(msg) admin_ticket_log(M, msg) - feedback_add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_local_narrate(atom/A) set category = "Special Verbs" @@ -110,7 +110,7 @@ log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]") message_admins(" LocalNarrate: [key_name_admin(usr)] at ([get_area(A)]): [msg]
") - SSblackbox.add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list) set category = "Special Verbs" @@ -125,7 +125,7 @@ var/msg = "[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]" message_admins(msg) admin_ticket_log(M, msg) - feedback_add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /proc/cmd_admin_mute(whom, mute_type, automute = 0) @@ -187,7 +187,7 @@ message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(whom)] from [mute_string].") if(C) to_chat(C, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.") - SSblackbox.add_details("admin_toggle","Auto Mute [feedback_string]|1") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Auto Mute [feedback_string]|1") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return if(P.muted & mute_type) @@ -201,7 +201,7 @@ message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(whom)] from [mute_string].") if(C) to_chat(C, "You have been [muteunmute] from [mute_string] by [key_name(usr, include_name = FALSE)].") - SSblackbox.add_details("admin_toggle","Mute [feedback_string]|[P.muted & mute_type]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Mute [feedback_string]|[P.muted & mute_type]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //I use this proc for respawn character too. /N @@ -423,7 +423,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(new_character, "You have been fully respawned. Enjoy the game.") - SSblackbox.add_details("admin_verb","Respawn Character") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Respawn Character") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return new_character /client/proc/cmd_admin_add_freeform_ai_law() @@ -446,7 +446,7 @@ Traitors and the like can also be revived with the previous role mostly intact. ion.announceEvent = announce_ion_laws ion.ionMessage = input - SSblackbox.add_details("admin_verb","Add Custom AI Law") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Add Custom AI Law") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_rejuvenate(mob/living/M in GLOB.mob_list) set category = "Special Verbs" @@ -465,7 +465,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/msg = "Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!" message_admins(msg) admin_ticket_log(M, msg) - feedback_add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_create_centcom_report() set category = "Special Verbs" @@ -490,7 +490,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report") - SSblackbox.add_details("admin_verb","Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_change_command_name() set category = "Special Verbs" @@ -516,7 +516,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if (alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes") log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])") message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])") - SSblackbox.add_details("admin_verb","Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! if(isturf(O)) var/turf/T = O T.ChangeTurf(T.baseturf) @@ -531,7 +531,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(src, "Only administrators may use this command.") return holder.manage_free_slots() - SSblackbox.add_details("admin_verb","Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world) set category = "Special Verbs" @@ -560,7 +560,7 @@ Traitors and the like can also be revived with the previous role mostly intact. explosion(O, devastation, heavy, light, flash, null, null,flames) log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])") message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])") - SSblackbox.add_details("admin_verb","Explosion") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Explosion") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return else return @@ -583,7 +583,7 @@ Traitors and the like can also be revived with the previous role mostly intact. empulse(O, heavy, light) log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])") message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[light]) at ([O.x],[O.y],[O.z])") - SSblackbox.add_details("admin_verb","EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return else @@ -614,7 +614,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M.gib() else M.gib(1) - SSblackbox.add_details("admin_verb","Gib") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Gib") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_gib_self() set name = "Gibself" @@ -624,7 +624,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(confirm == "Yes") log_admin("[key_name(usr)] used gibself.") message_admins("[key_name_admin(usr)] used gibself.") - SSblackbox.add_details("admin_verb","Gib Self") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Gib Self") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! mob.gib(1, 1, 1) /client/proc/cmd_admin_check_contents(mob/living/M in GLOB.mob_list) @@ -634,7 +634,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/list/L = M.get_contents() for(var/t in L) to_chat(usr, "[t]") - SSblackbox.add_details("admin_verb","Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_view_range() set category = "Special Verbs" @@ -649,7 +649,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(usr)] changed their view range to [view].") //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI - SSblackbox.add_details("admin_toggle","Change View Range|[view]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Change View Range|[view]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_call_shuttle() @@ -668,7 +668,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return SSshuttle.emergency.request() - SSblackbox.add_details("admin_verb","Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.") return @@ -685,7 +685,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return SSshuttle.emergency.cancel() - SSblackbox.add_details("admin_verb","Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.") @@ -720,7 +720,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet.") config.force_random_names = 1 - SSblackbox.add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Make Everyone Random") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_random_events() @@ -735,7 +735,7 @@ Traitors and the like can also be revived with the previous role mostly intact. config.allow_random_events = 0 to_chat(usr, "Random events disabled") message_admins("Admin [key_name_admin(usr)] has disabled random events.") - SSblackbox.add_details("admin_toggle","Toggle Random Events|[config.allow_random_events]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Random Events|[config.allow_random_events]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_change_sec_level() @@ -753,7 +753,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(usr)] changed the security level to [level]") message_admins("[key_name_admin(usr)] changed the security level to [level]") - SSblackbox.add_details("admin_verb","Set Security Level [capitalize(level)]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Set Security Level [capitalize(level)]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list) set name = "Toggle Nuke" @@ -772,7 +772,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_admin("[key_name(usr)] [N.timing ? "activated" : "deactivated"] a nuke at ([N.x],[N.y],[N.z]).") message_admins("[ADMIN_LOOKUPFLW(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [ADMIN_COORDJMP(N)].") - SSblackbox.add_details("admin_toggle","Toggle Nuke|[N.timing]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Nuke|[N.timing]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits @@ -970,11 +970,11 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits to_chat(usr, "You toggled your admin antag HUD [adding_hud ? "ON" : "OFF"].") message_admins("[key_name_admin(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].") log_admin("[key_name(usr)] toggled their admin antag HUD [adding_hud ? "ON" : "OFF"].") - SSblackbox.add_details("admin_toggle","Toggle Antag HUD|[adding_hud]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggle Antag HUD|[adding_hud]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/has_antag_hud() var/datum/atom_hud/A = GLOB.huds[ANTAG_HUD_TRAITOR] - return A.hudusers[mob] + return A.hudusers[mob] /client/proc/open_shuttle_manipulator() set category = "Admin" @@ -1002,7 +1002,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] added a latent zombie infection to all humans.") log_admin("[key_name(usr)] added a latent zombie infection to all humans.") - SSblackbox.add_details("admin_verb","Mass Zombie Infection") + SSblackbox.add_details("admin_verb","Mass Zombie Infection") /client/proc/mass_zombie_cure() set category = "Fun" @@ -1020,7 +1020,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] cured all zombies.") log_admin("[key_name(usr)] cured all zombies.") - SSblackbox.add_details("admin_verb","Mass Zombie Cure") + SSblackbox.add_details("admin_verb","Mass Zombie Cure") /client/proc/polymorph_all() set category = "Fun" @@ -1039,7 +1039,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] started polymorphed all living mobs.") log_admin("[key_name(usr)] polymorphed all living mobs.") - SSblackbox.add_details("admin_verb","Polymorph All") + SSblackbox.add_details("admin_verb","Polymorph All") for(var/mob/living/M in mobs) CHECK_TICK @@ -1080,7 +1080,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits message_admins("[key_name_admin(usr)] sent a tip of the round.") log_admin("[key_name(usr)] sent \"[input]\" as the Tip of the Round.") - SSblackbox.add_details("admin_verb","Show Tip") + SSblackbox.add_details("admin_verb","Show Tip") #define ON_PURRBATION(H) (!(H.dna.features["tail_human"] == "None" && H.dna.features["ears"] == "None")) @@ -1157,7 +1157,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits if (world.visibility && !world.reachable) message_admins("WARNING: The server will not show up on the hub because byond is detecting that a filewall is blocking incoming connections.") - SSblackbox.add_details("admin_toggle","Toggled Hub Visibility|[world.visibility]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_toggle","Toggled Hub Visibility|[world.visibility]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/smite(mob/living/carbon/human/target as mob) set name = "Smite" diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm index 3b134eaff0..133a39185e 100644 --- a/code/modules/admin/verbs/reestablish_db_connection.dm +++ b/code/modules/admin/verbs/reestablish_db_connection.dm @@ -17,11 +17,11 @@ SSdbcore.Disconnect() log_admin("[key_name(usr)] has forced the database to disconnect") message_admins("[key_name_admin(usr)] has forced the database to disconnect!") - feedback_add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] is attempting to re-established the DB Connection") message_admins("[key_name_admin(usr)] is attempting to re-established the DB Connection") - feedback_add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + SSblackbox.add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! SSdbcore.failed_connections = 0 if(!SSdbcore.Connect()) diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 4046e7dcb8..4eef1c06a3 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -78,13 +78,13 @@ triggering = FALSE message_admins("[key_name_admin(usr)] cancelled event [name].") log_admin_private("[key_name(usr)] cancelled event [name].") - feedback_add_details("event_admin_cancelled","[typepath]") + SSblackbox.add_details("event_admin_cancelled","[typepath]") /datum/round_event_control/proc/runEvent(random) var/datum/round_event/E = new typepath() E.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) E.control = src - feedback_add_details("event_ran","[E]") + SSblackbox.add_details("event_ran","[E]") occurrences++ testing("[time2text(world.time, "hh:mm:ss")] [E.type]") diff --git a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm index 144a2634ba..dd8766bdc9 100644 --- a/code/modules/mining/equipment.dm +++ b/code/modules/mining/equipment.dm @@ -68,7 +68,7 @@ /obj/item/device/wormhole_jaunter/attack_self(mob/user) user.visible_message("[user.name] activates the [src.name]!") - feedback_add_details("jaunter", "User") // user activated + SSblackbox.add_details("jaunter", "User") // user activated activate(user) /obj/item/device/wormhole_jaunter/proc/turf_check(mob/user) @@ -124,13 +124,13 @@ if(triggered) usr.visible_message("The [src] overloads and activates!") - feedback_add_details("jaunter","EMP") // EMP accidental activation + SSblackbox.add_details("jaunter","EMP") // EMP accidental activation activate(usr) /obj/item/device/wormhole_jaunter/proc/chasm_react(mob/user) if(user.get_item_by_slot(slot_belt) == src) to_chat(user, "Your [src] activates, saving you from the chasm!") - feedback_add_details("jaunter","Chasm") // chasm automatic activation + SSblackbox.add_details("jaunter","Chasm") // chasm automatic activation activate(user) else to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.") diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 911a4d97df..6b1179a585 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -86,7 +86,7 @@ user.sight |= SEE_MOBS icon_state = "lantern" wisp.orbit(user, 20) - feedback_add_details("wisp_lantern","Freed") + SSblackbox.add_details("wisp_lantern","Freed") else to_chat(user, "You return the wisp to the lantern.") @@ -101,7 +101,7 @@ wisp.stop_orbit() wisp.loc = src icon_state = "lantern-blue" - feedback_add_details("wisp_lantern","Returned") + SSblackbox.add_details("wisp_lantern","Returned") /obj/item/device/wisp_lantern/Initialize() ..() @@ -228,7 +228,7 @@ /obj/item/device/immortality_talisman/attack_self(mob/user) if(cooldown < world.time) - feedback_add_details("immortality_talisman","Activated") // usage + SSblackbox.add_details("immortality_talisman","Activated") // usage cooldown = world.time + 600 user.visible_message("[user] vanishes from reality, leaving a a hole in [user.p_their()] place!") var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc)) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 52205b2497..a1c4a74795 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -3,7 +3,7 @@ var/deletes_extract = TRUE /datum/chemical_reaction/slime/on_reaction(datum/reagents/holder) - feedback_add_details("slime_cores_used","[type]") + SSblackbox.add_details("slime_cores_used","[type]") if(deletes_extract) delete_extract(holder) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 9ed0565ee7..62d0a032d9 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U) if(item) - feedback_add_details("traitor_uplink_items_bought", "[name]|[cost]") + SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]") return new item(loc) /datum/uplink_item/proc/buy(mob/user, obj/item/device/uplink/U) @@ -1158,7 +1158,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/device/uplink/U) if(item) if(istype(item, /obj/item/organ)) - feedback_add_details("traitor_uplink_items_bought", "[item]|[cost]") + SSblackbox.add_details("traitor_uplink_items_bought", "[item]|[cost]") return new /obj/item/weapon/storage/box/cyber_implants(loc, item) else return ..() @@ -1326,7 +1326,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. new I.item(C) U.purchase_log += "\icon[I.item]" - feedback_add_details("traitor_uplink_items_bought", "[name]|[cost]") + SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]") return C /datum/uplink_item/badass/random @@ -1352,6 +1352,6 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. var/datum/uplink_item/I = pick(possible_items) U.telecrystals -= I.cost U.spent_telecrystals += I.cost - feedback_add_details("traitor_uplink_items_bought","[name]|[I.cost]") - feedback_add_details("traitor_random_uplink_items_gotten","[I.name]") + SSblackbox.add_details("traitor_uplink_items_bought","[name]|[I.cost]") + SSblackbox.add_details("traitor_random_uplink_items_gotten","[I.name]") return new I.item(loc) diff --git a/code/world.dm b/code/world.dm index 7af27a1504..4e00c32f60 100644 --- a/code/world.dm +++ b/code/world.dm @@ -209,12 +209,11 @@ WORLD_REBOOT(0) #undef WORLD_REBOOT + /world/proc/OnReboot(reason, feedback_c, feedback_r, round_end_sound_sent) - feedback_set_details("[feedback_c]","[feedback_r]") + SSblackbox.set_details("[feedback_c]","[feedback_r]") log_game("Rebooting World. [reason]") - feedback_set("ahelp_unresolved", GLOB.ahelp_tickets.active_tickets.len) - if(GLOB.blackbox) - GLOB.blackbox.save_all_data_to_sql() + SSblackbox.set_val("ahelp_unresolved", GLOB.ahelp_tickets.active_tickets.len) Master.Shutdown() //run SS shutdowns RoundEndAnimation(round_end_sound_sent) kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked diff --git a/tgstation.dme b/tgstation.dme index cead10a6c2..758fe70896 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -189,6 +189,7 @@ #include "code\controllers\subsystem\assets.dm" #include "code\controllers\subsystem\atoms.dm" #include "code\controllers\subsystem\augury.dm" +#include "code\controllers\subsystem\blackbox.dm" #include "code\controllers\subsystem\communications.dm" #include "code\controllers\subsystem\dbcore.dm" #include "code\controllers\subsystem\disease.dm" @@ -2152,7 +2153,6 @@ #include "code\modules\VR\vr_sleeper.dm" #include "code\modules\zombie\items.dm" #include "code\modules\zombie\organs.dm" -#include "code\orphaned_procs\statistics.dm" #include "interface\interface.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" From 29720a0bb5a0cd468d2d3579b6062e87d8336c7e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 29 Apr 2017 12:01:32 -0500 Subject: [PATCH 035/131] Update randomverbs.dm --- code/modules/admin/verbs/randomverbs.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index b4f8927133..8d21a8c531 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -522,11 +522,7 @@ Traitors and the like can also be revived with the previous role mostly intact. T.ChangeTurf(T.baseturf) else qdel(O) - - T.ChangeTurf(T.baseturf) - else - qdel(D) - + /client/proc/cmd_admin_list_open_jobs() set category = "Admin" set name = "Manage Job Slots" @@ -1193,4 +1189,4 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]." message_admins(msg) admin_ticket_log(target, msg) - log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].") \ No newline at end of file + log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].") From a928f5dbaaf9b85f1d2ffce7bd730b622860a17a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 15:44:43 -0500 Subject: [PATCH 036/131] Removes some unused tools --- .../DMTreeToGlobalsList.csproj | 59 -- tools/DMTreeToGlobalsList/Program.cs | 65 -- tools/PR_announcer_bot/LICENSE.txt | 674 ------------------ .../PR_announcer_bot/Meebey.SmartIrc4net.dll | Bin 137216 -> 0 bytes tools/PR_announcer_bot/README.txt | 13 - tools/PR_announcer_bot/StarkSoftProxy.dll | Bin 27648 -> 0 bytes tools/PR_announcer_bot/config.txt | 8 - tools/PR_announcer_bot/config_for_tg.txt | 8 - tools/PR_announcer_bot/output.txt | 1 - tools/PR_announcer_bot/sendkeys_ss13.exe | Bin 12800 -> 0 bytes tools/PR_announcer_bot/sendkeys_ss13.sln | 22 - .../PR_announcer_bot/sendkeys_ss13/App.config | 6 - .../sendkeys_ss13/Meebey.SmartIrc4net.dll | Bin 137216 -> 0 bytes .../PR_announcer_bot/sendkeys_ss13/Program.cs | 390 ---------- .../sendkeys_ss13/Properties/AssemblyInfo.cs | 36 - .../sendkeys_ss13/StarkSoftProxy.dll | Bin 27648 -> 0 bytes .../sendkeys_ss13/sendkeys_ss13.csproj | 69 -- 17 files changed, 1351 deletions(-) delete mode 100644 tools/DMTreeToGlobalsList/DMTreeToGlobalsList.csproj delete mode 100644 tools/DMTreeToGlobalsList/Program.cs delete mode 100644 tools/PR_announcer_bot/LICENSE.txt delete mode 100644 tools/PR_announcer_bot/Meebey.SmartIrc4net.dll delete mode 100644 tools/PR_announcer_bot/README.txt delete mode 100644 tools/PR_announcer_bot/StarkSoftProxy.dll delete mode 100644 tools/PR_announcer_bot/config.txt delete mode 100644 tools/PR_announcer_bot/config_for_tg.txt delete mode 100644 tools/PR_announcer_bot/output.txt delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13.exe delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13.sln delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13/App.config delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13/Meebey.SmartIrc4net.dll delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13/Program.cs delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13/Properties/AssemblyInfo.cs delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13/StarkSoftProxy.dll delete mode 100644 tools/PR_announcer_bot/sendkeys_ss13/sendkeys_ss13.csproj diff --git a/tools/DMTreeToGlobalsList/DMTreeToGlobalsList.csproj b/tools/DMTreeToGlobalsList/DMTreeToGlobalsList.csproj deleted file mode 100644 index db4350daa4..0000000000 --- a/tools/DMTreeToGlobalsList/DMTreeToGlobalsList.csproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Debug - AnyCPU - {9799169C-0C95-4873-B6B5-211E007A15F4} - Exe - Properties - DMTreeToGlobalsList - DMTreeToGlobalsList - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/DMTreeToGlobalsList/Program.cs b/tools/DMTreeToGlobalsList/Program.cs deleted file mode 100644 index 44258824d4..0000000000 --- a/tools/DMTreeToGlobalsList/Program.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.IO; -using System.Xml; - -namespace DMTreeToGlobalsList -{ - class Program - { - static void Main(string[] args) - { - if (args.Length < 1 || !File.Exists(args[0])) - { - Console.WriteLine("Usage: DMTreeToGlobalsList.exe [Prefix] [Postfix]"); - return; - } - - var XMLPath = args[0]; - string Prefix = "", Postfix = ""; - if (args.Length > 1) - { - Prefix = args[1]; - if (args.Length > 2) - Postfix = args[2]; - } - - XmlDocument Doc; - using (var FS = new FileStream(XMLPath, FileMode.Open, FileAccess.Read)) - { - try - { - while (FS.ReadByte() != '<') ; - } - catch - { - Console.WriteLine("Failed to find start point of XML in output"); - return; - } - FS.Seek(-1, SeekOrigin.Current); - - Doc = new XmlDocument(); - try - { - Doc.Load(FS); - } - catch - { - Console.WriteLine("Failed to load the XML document"); - return; - } - } - try - { - var DMNode = Doc.ChildNodes[1]; - foreach (XmlNode Child in DMNode.ChildNodes) - if (Child.Name == "var") - Console.WriteLine(Prefix + Child.FirstChild.Value.Trim() + Postfix); - } - catch - { - Console.WriteLine("Failed parsing the XML"); - return; - } - } - } -} diff --git a/tools/PR_announcer_bot/LICENSE.txt b/tools/PR_announcer_bot/LICENSE.txt deleted file mode 100644 index 20d40b6bce..0000000000 --- a/tools/PR_announcer_bot/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/tools/PR_announcer_bot/Meebey.SmartIrc4net.dll b/tools/PR_announcer_bot/Meebey.SmartIrc4net.dll deleted file mode 100644 index 851c94700f71c4d3e0d6d9a18873fa0a22b8da4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137216 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 diff --git a/tools/PR_announcer_bot/README.txt b/tools/PR_announcer_bot/README.txt deleted file mode 100644 index 5d4b02de6e..0000000000 --- a/tools/PR_announcer_bot/README.txt +++ /dev/null @@ -1,13 +0,0 @@ -GitHub pull request announcer bot for IRC -Made by VistaPOWA for the tgstation 13 code project. -This software is licensed under GPL3. -Prequisites: Meebey's SmartIrc4Net library (incl, under GPL) - StarkSoft Proxy library (incl, under GPL) -Usage: Edit the config.txt file to match the settings -of your server's. Start the executable. Set up a Github hook -if you hadn't before to send IRC notifications to the -channel of your choosing. Leave it running. -IT IS PREFERABLE IF YOU RAN THIS LOCALLY. YOUR SERVER'S -APICOMMS KEY WILL BE SENT PLAINTEXT! ENSURE THAT THE API -KEY IS NOT PUBLICALLY AVAILABLE! IF LEAKED, CHANGE IT. -Support available @ Rizon's #coderbus, ask for VistaPOWA. diff --git a/tools/PR_announcer_bot/StarkSoftProxy.dll b/tools/PR_announcer_bot/StarkSoftProxy.dll deleted file mode 100644 index a5210bed38ab45344483317c1f8abf17b510e760..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27648 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 diff --git a/tools/PR_announcer_bot/config.txt b/tools/PR_announcer_bot/config.txt deleted file mode 100644 index f5cc606b2b..0000000000 --- a/tools/PR_announcer_bot/config.txt +++ /dev/null @@ -1,8 +0,0 @@ -serverip = 127.0.0.1 //SS13 server IP -serverport = 7812 //SS13 server port -commskey = this_is_a_test_key //API key of the server -GitHub_bot_name = testbot_github //It'll get the data from this bot -IRC_bot_name = testbot_BYOND //This'll be our name -IRC_server = irc.rizon.net:6670 //format - server:port -IRC_channel = #ircchannel -Nickserv_auth = _NONE_ //leave _NONE_ if your bot does not require nickserv authentication \ No newline at end of file diff --git a/tools/PR_announcer_bot/config_for_tg.txt b/tools/PR_announcer_bot/config_for_tg.txt deleted file mode 100644 index 4bf44fb2ad..0000000000 --- a/tools/PR_announcer_bot/config_for_tg.txt +++ /dev/null @@ -1,8 +0,0 @@ -serverip = 127.0.0.1 //SS13 server IP -serverport = 1337 //SS13 server port -commskey = fill_your_own_in //API key of the server -GitHub_bot_name = TheGhostOfWhibyl1 //It'll get the data from this bot -IRC_bot_name = PR_Listener_Bot //This'll be our name -IRC_server = irc.rizon.net:6670 //format - server:port -IRC_channel = #coderbus -Nickserv_auth = _NONE_ //leave _NONE_ if your bot does not require nickserv authentication \ No newline at end of file diff --git a/tools/PR_announcer_bot/output.txt b/tools/PR_announcer_bot/output.txt deleted file mode 100644 index 07db6152b6..0000000000 --- a/tools/PR_announcer_bot/output.txt +++ /dev/null @@ -1 +0,0 @@ -0131022900006397110110111117110991016191451161034511511697116105111110933286105115116978079876532111112101110101100321121171081083211410111311710111511632651001001153211511110910132981111141033210210197116117114101115329710811511132102105120101115321151111091013211511611710210246323551485248583210997115116101114464646106117115116951111101019510911111410195116101115116951001111101169510710510810895109101413210411611611211558474710310511610411798469911110947116103115116971161051111104745116103451151169711610511111047112117108108475148524832381071011216111610410511595105115959795116101115116951071011210 diff --git a/tools/PR_announcer_bot/sendkeys_ss13.exe b/tools/PR_announcer_bot/sendkeys_ss13.exe deleted file mode 100644 index 5985be093a8429e4d90732fb900717d4509ccc9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12800 zcmeHNeRLdGb-%M8v#YhW@k+L2$C5pgY(=)EwPo2!{Gr&gEZYjUENf*aCJxGIcO-4R z+F5319Saj>b3y`cNJ>J(he>G&U9pbZu>7jW2q5 zfastWrUS>OGl916P)J*(Eh6dwC9bF+-G`@v`xe}6oqPO@A}om@{2C<0v1fYLoV?(;mv7Xa_)@ z`0Cq@l3WH%N;|HTMM-SC1&EG&J?^S&Hv*D&tbz?jwv{TlS=J`pRo8B!Jyk_PD;!r` zY+Hz;^ax~^t|Zb>#?9J(t!vSyDDC0KxH@2iKAS}6EPX>qg6VFGC}GzD2({6!571dC zip<6U?4_VJRIUJeVWfSQpN%(4QSgUUZMHk5Vc|aBuX3^yl0XAeME^KX|Cp)V(NI)zS!Z2SHR%b2Oviu7) zTLUSbtEFj!a~CR{hX8~u0_>IGa~=;`C>_Y`h>e^|IL|OM7sVH;wVP3azR)D;+No&| zjjWa~`6x9!MOzuK-xQ%S#25~zoR?VmDm2-Gk4t#|GW2VCI!uB;I+ZyY zdF&*?>u!O7MCktfmAghk53M-otYHyi&mE!0a}HYg;VXrj&Q&neMrIQLou)iio@?-* z_Et9gxP3Jqi(<3PsKi_wo2})7^udP43YIt}VhM$oJJ&(}qrzQbuBD=3X@ymU(0d2x ztSK(EW-KH;(z0_T1Uqn7+psuZWkYwo%7!({hBsIK)vHnp91LGsTXkY8q<*mOJlIr4=w5Z6VI`i6C>Xeg!oQMmEOdMT-#kfCxd zgs1ez8|(FyF4k`TMk?BPygr(Wu1?PKtRn%uv5DKJA}dnSZ$9j9L!DDp zNyQ)N*bb7t1E4(>hqQPqo{AvTzN4pNG7s20QKzRO9T@2Pg@oRz>vk_l|HwJmhmauE z2mzIO{8kju+j6bk6sAuBL%yb#H#WJ~p(>%~=3PK#9(8vETcpSAK0NiXy$6qW=XVe< z8PN?DjJrt4?gzPJFTe$}eU?dBPx&GE%1u`}A4Ll(RIR5Uf@f+y4U6p?+LRz?Rm>N! zmQ`PgV!A-<)mUFeo!67eW1Z)X*Wd^IPdWd@Z3kdULU(=!+};OVcXq{r?q@3x062pv zhSah-h%y|!KYy!zJ+sWDWHw~Po?btQ^E!h0%ar01p3DtaU@cS2x;+@oP&P!t^fiKvznVDWNy4vX4MQyY8&4K@cR98W(Noj3FtP zAMaVLhhpaxb;DA|=TlfwWo}am{JidT&&kkL4vRd!!5(295?$TS0Jk}?>%$nt_rV^% zoL;n*U4SvU0Xs;fV#GPZG#(7jZH!^Aj5rT5hOCS@k1@szm}&v9BF<--#w*g&3NJ5e zK9Hd*vzfwpc5_EzL525*YOkmANOkA>RiTcfY#{8~ler$-NlY!cFp<)!E$L0^o=rX7 z7>qnR3V=_+oVHma1I9c7GukqqlP^xX%<&?WJr7gbj%Mg#taC_wYTJKw5aWS9h4Np) z(Y8GWdz_hZp{U)^93nI!`svyp!k&_~V>rlIMN&w|@;HT!QU@=%PX$M`a3uuitlvXB zQ2G(Q47^=y(h{^!WBlE~by^cjgmgL_>IIw-c$dIO1%5%`w*j;nPR9i1 zgmSyUKMtP@AExJEf=>S)ei1xNA}@v$l#aX%8!SMb&O~+q-YM`Ck@rV*`g7n3`iAiQ zz3{vtwee_^mZYBO(rA*l3ETy!(~;;7N|Gt~W8l&0GoU2sxhTuusJH1l?bVrnSZB^t zdR9-;?E>!=_yK``qJJFpFA4mbz`q03DH3A|n`5l~`WW+!3v>iNDDbfuG8>o53(gM> zJ=;WUkP(bG&>$>opb@GCyjk!Gfu{uCCGdW!{h;6<7x)CEG|-o5Dd1Oya$ewnP$MWm z75xEw>| zp{o?T%1N!I4M*v@sjH1<#BSWNVwb75$3dkI#8f{zj4{3!q5PgDL zwBymIq}AsrrM*4+EUnYt8T~TocSoP6uhIR{^Mb!DJg)+NF#0{})}DwC0X`Y|87NqPr&6xY{iuTj0;0r-_jT02k8`aLwL zvDd73i#DkB>f5v<+F96tT)RmhA``VE+MU|d`j~bW_=IL^ZlnnKO}z|Gwud9rLLb(? ztG`S8u=WFe6!=d7Kc>~j?$th~HO3wQ-H3e&8$1Jy7JEJ|L{eu>%1ml&nm@gg%5y2GD z2s?SXFrm*~FAKJiPmO-5*m=m#l?&E&t*KZdmdm$!>7dEgWT_c>TK4;TBD<%cZSH770FXFJmY&W>2l zC5n}T8=Slc1sU|ju$esxlM%Q}d8ZH|t9W$eAoas6&+>WGSfzb>xNp)v>q+Im!(^mSJ<+yMS`v4k+Ov~GcGfC?<+c}9~ zIr;IjXU#RSCJG252cpk)t?BW?%xK;#So4eld9USWoxH^C(n^kbezNSCEa`I9(#YOYgI0IWv9ycivlxPL?78D?#O)B za;e{*K9+a$k zaSUrNG8V>_Al#|876b|Lh*dC83+B$7Q-znEqWz9tE)hltJkBB;I30=@;2w?I%0J=gw+q1t zVP2uR(rl2Y&{5lWW7L@$HXYX@yEHafwBBAeIsU|!_>)h6!A3PE7)%o-RB~*6=k}VO zDKh5}o;g|6Kp=>f2ca0igf|0cN(D1(NxOqqaS~H(rabP-3xMjAx&Gh-cV*|Ea=yS5 zOJAvk*ot}n)HS#_@0M(rQ7$I4)tgb;qImztnm?q&vHF~j>KH(jiGPQ>z+vE@*&Hc zvU6yfwI$IwJbjt|!9m(@d3$C&jHjw*L3m^>U=CjcVuHm%sf6=I^p8~f_yNx=i8+25 z_yL)oFG>nUbcy*#EXAy7bkxaHIxEvV-7$#WMn4(YEm-8xDS-y%Q8sWYSR@lP6XkKd z+gYHQtT{->e!G;V5n8$N2C zKVkdKJYkI{eeg{&r4JzNR7yXioEaN!WteMRsPkE(GVTR zJwRhbYv<(!`5IWrxm}isQn!j*z!6wG&!I-FEu*){`I1p%P>t33(P<#YHgd{Ew6B6} z1Ndq5n+u%BRvB23^*mN4#0DN=E@_p&96)#+2@W&!a3~`*xjA7Dny5tQkQKngf#WHQ zr#&0uRI6YTnK!HjHGPtD!Gyz8Cr>*(B!X#?HD21*kg1F{1bhy(PJ+q~a_}7_HV>v< zq#d~l>2exV}kfp51gc4pQFf(|Y{0;^DmucqiyNxp{!Ao0?f7|Fz@p#k~Xf zPTbc)5`{6?mvNjtq!q)tiDS_r_~yveL$y5p@l?P=Sd~;w4y7!jsJfO*HstUm#uEdj zcA^#g&vBZ7b_(MNy=EtE1Ra=0^j(Bf2i zcA)_#TwwMyHpypR=wPvZL+M=x-Qtoe_eA)*(E8?>t<1g6OXwZX*I)`Au{lWYIq0~xMS~7^J^Mw=wW!F zb`rnAPTPMu{Xy?=UyQ(ZPyCr*IXQ9FI(-!N2YF^%whK{FYaY+}S+s(8i`xBl2Y7uq z2In>4-Q?fcE3D1x zSXOIJ;$#}f!a(Y3b^OMssV>D2FvakwTh<(nke0;9Sgkn>~VrW{DK`084I>Kl? zYM}9QCe+=`crqS^fMgSzYjFmwDJeBc)FhM1m=V@eGsz?>LrG|>tDH@;h7bsG;c04$ z8dO(#NH?^)%6%*)*#zrC$t8lvV-$g$B=bVx6|rbtE&QmQRsRr`M9b!6b2uIg;{inE zeN3k?H;XYf-W&!ao1cusWDRVrCn`E0OQvFpx@F*Pj>hA4mB-@E$;E7T<ndLsrWar(d^wN0=4g^bmJnlJ;xMpuDZL`_ zHONV(D&I@Oqsj}-058>5US%yXAA&{(@^=}HMw3hD zs`&M(V9pHT)MW{`G3IKFEp-~z^5M?hc^!7X8mCmFMs;(?9>!lhZWx<4b#K8wM58s` z+pf8KOLwlP%iMO2*|lZ!)~#LR*Y@;u<*wdxZFkn(VohuX=VFaw-S|d?Kl}nq!y!0d zK=4%x7rs)%%uvG(j#BJ%Xh0jVApQ^!IEsiHF zIl7dyS<6c23jAFUzerq5#%{rW3w{$32+8+R1K)q~n>oUdBq|HF^57xtEiO-=x(uD$ zR~Rg~)Hr(|Xph{2Z?tNR3P&kR@}(+Ze=&qHO~FP;do=r*Bathqu6Kgy62*Pe%B%l z^h9J6Y}a6u2QKw~aH*ul!m|mhw))$G9ULYn=ue_;z`s}4?5xP)a|?BTzoBrlHRwbG_fdV)`y_=SMa2HvdQ>tA?w=dRP! z1p|kyd>q@`ip8qcu>2#u-qxd|`?{`eHCzvez-GZNTD`3^mfO1Py4u7})BieQKtR#$ zZ7n;+?QV7o9|GL2>3r6)U3+o#AJ7EjqHEvMBe z=lkTuySH`1EV!2MlnB{)8EXR5H!iS!=f=4pfMMsxpodUEg8yH*cB|jjJc1u9{`UI+ H7lHo - - - - - diff --git a/tools/PR_announcer_bot/sendkeys_ss13/Meebey.SmartIrc4net.dll b/tools/PR_announcer_bot/sendkeys_ss13/Meebey.SmartIrc4net.dll deleted file mode 100644 index 851c94700f71c4d3e0d6d9a18873fa0a22b8da4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137216 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 diff --git a/tools/PR_announcer_bot/sendkeys_ss13/Program.cs b/tools/PR_announcer_bot/sendkeys_ss13/Program.cs deleted file mode 100644 index ebb05c7f15..0000000000 --- a/tools/PR_announcer_bot/sendkeys_ss13/Program.cs +++ /dev/null @@ -1,390 +0,0 @@ -////////////////////////////////////////////////////////////////// -/////GitHub pull request announcer bot for IRC//////////////////// -/////Made by VistaPOWA for the /tg/station 13 code project./////// -/////This software is licensed under GPL3.//////////////////////// -/////Prequisites: Meebey's SmartIrc4Net library (incl, under GPL)/ -///// StarkSoft Proxy library (incl, under GPL)/////// -/////Usage: Edit the config.txt file to match the settings//////// -/////of your server's. Start the executable. Set up a Github hook/ -/////if you hadn't before to send IRC notifications to the//////// -/////channel of your choosing. Leave it running.////////////////// -/////IT IS PREFERABLE IF YOU RAN THIS LOCALLY. YOUR SERVER'S////// -/////API/COMMS KEY WILL BE SENT PLAINTEXT! ENSURE THAT THE API//// -/////KEY IS NOT PUBLICALLY AVAILABLE! IF LEAKED, CHANGE IT./////// -/////Support available @ Rizon's #coderbus, ask for VistaPOWA.//// -////////////////////////////////////////////////////////////////// - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using Meebey.SmartIrc4net; -using System.Net; -using System.Net.Sockets; -using System.IO; - -namespace sendkeys_ss13 -{ - public class Program - { - //default values - public static string serverIP = "127.0.0.1"; - public static int serverPort = 11111; - public static string commskey = "this_is_a_test_key"; - public static string Github_bot_name = "testbot_github"; - public static string IRC_bot_name = "testbot"; - public static string IRC_server = "test.net"; - public static int IRC_port = 11111; - public static string IRC_channel = "#channel"; - public static string NickServAuth = null; - - public static string[] merge_archive; - public static bool mergeflag = false; - public static string mergedPR = ""; - public static string lastPR = ""; - - public static IrcClient irc = new IrcClient(); - - public static int IRCReconnectAttempt = 0; - public static void Main(string[]args) - { - ReadConf(); - irc.OnChannelMessage += new IrcEventHandler(OnChannelMessage); - irc.SupportNonRfc = true; - try - { - irc.Connect(IRC_server, IRC_port); - IRCReconnectAttempt = 0; - } - catch (Exception) - { - IRCReconnectAttempt++; - if (IRCReconnectAttempt <= 5) - { - Console.WriteLine("IRC server is unavaible at the moment. Reconnect attempt {0}...", IRCReconnectAttempt); - System.Threading.Thread.Sleep(5000); //Reconnecting after 5 seconds. - Main(args); - } - else - { - Console.WriteLine("IRC server unreachable. Please check your configuration file."); - Console.ReadLine(); - return; - } - } - Console.WriteLine("Connected to IRC"); - try - { - irc.Login(IRC_bot_name, IRC_bot_name); - } - catch (Exception) - { - irc.Login(IRC_bot_name + "_1", IRC_bot_name + "_1"); - Console.WriteLine("Bot name is already taken, trying alternate..."); - } - if (NickServAuth != null) - irc.SendMessage(SendType.Message, "NickServ", "identify " + NickServAuth); - Console.WriteLine("Logged in"); - irc.RfcJoin(IRC_channel); - Console.WriteLine("Joining {0}", IRC_channel); - irc.Listen(); - } - - public static void ReadConf() - { - if (File.Exists("config.txt")) - { - StreamReader reader = new StreamReader("config.txt"); - string[] line = ReadLine_exception(reader); - if (line[2] != null) - { - Match match1 = Regex.Match(line[2], @"^(\d{1,3}.?){4}$"); //rudimentary IP validation - if (match1.Success) - { - serverIP = line[2]; - Console.WriteLine("Read IP: " + serverIP); - } - else - { - Console.WriteLine("IP cannot be validated."); - } - } - line = ReadLine_exception(reader); - if (line[2] != null) - { - Match match2 = Regex.Match(line[2], @"^\d{1,5}$"); //rudimentary port validation - if (match2.Success && (Convert.ToInt32(line[2]) < 65535)) - { - serverPort = Convert.ToInt32(line[2]); - Console.WriteLine("Read port: " + serverPort); - } - else - { - Console.WriteLine("Port cannot be validated."); - } - } - line = ReadLine_exception(reader); - if (line[2] != null) - { - commskey = line[2]; - Console.WriteLine("Commskey read."); - } - else - { - Console.WriteLine("No Commskey!"); - } - line = ReadLine_exception(reader); - if (line[2] != null) - { - Github_bot_name = line[2]; - Console.WriteLine("Read Github bot name: " + Github_bot_name); - } - else - { - Console.WriteLine("No botname found."); - } - line = ReadLine_exception(reader); - if (line[2] != null) - { - IRC_bot_name = line[2]; - Console.WriteLine("Read IRC bot name: " + IRC_bot_name); - } - else - { - Console.WriteLine("No botname found."); - } - line = ReadLine_exception(reader); - if (line[2] != null) - { - Match match3 = Regex.Match(line[2], @"^(.+)\:(\d{1,5})$"); //rudimentary port validation - if (match3.Success) - { - IRC_server = Convert.ToString(match3.Groups[1]); - Int32.TryParse(Convert.ToString(match3.Groups[2]), out IRC_port); - Console.WriteLine("Read IRC server: " + IRC_server + ":" + Convert.ToString(IRC_port)); - } - else - { - Console.WriteLine("Server:port invalid."); - } - } - line = ReadLine_exception(reader); - if (line[2] != null) - { - IRC_channel = line[2]; - Console.WriteLine("Read channel: " + IRC_channel); - } - else - { - Console.WriteLine("No channel found."); - } - line = ReadLine_exception(reader); - if (line[2] != null && line[2] != "_NONE_") - { - NickServAuth = line[2]; - Console.WriteLine("Read Nickserv auth"); - } - else - { - Console.WriteLine("No NickServ auth chosen."); - } - reader.Close(); - } - else - { - Console.WriteLine("Config file doesn't exist, using defaults"); - return; - } - } - - private static string[] ReadLine_exception(StreamReader reader) - { - string[] readline = null; - try - { - readline = reader.ReadLine().Split(' '); - } - catch (Exception) - { - readline[3] = "Error, couldn't read all lines of config file! Are you sure the config file has the right format?"; - return readline; - } - return readline; - } - - public static void OnChannelMessage(object sender, IrcEventArgs e) - { - if (e.Data.Nick == Github_bot_name) - { - string[] msg = e.Data.Message.Split(' '); - for (int i = 0; i < msg.Length; i++) - { - msg[i] = Regex.Replace(msg[i], @"[\x02\x1F\x0F\x16]|\x03(\d\d?(,\d\d?)?)?", String.Empty); //Sanitizing color codes - msg[i] = Regex.Replace(msg[i], @"[\\\&\=\;\<\>]", " "); //Filtering out some iffy characters - } - FormMessage(msg); - } - } - private static void FormMessage(string[] msg, bool ShortenedURL = false) - { - using (StreamWriter output = new StreamWriter("output.txt")) - { - if (msg.Length >= 4) - { - if (msg[3] == "Merge" && msg[1] != "meant:") //Someone is merging something - { - mergedPR = msg[6]; - if (merge_archive != null) - { - string currentPR = merge_archive[5].Substring(0, merge_archive[5].Length - 1); //PR no. without : at the end - if (currentPR == mergedPR && currentPR != lastPR) //Check if the last closed message's PR number is the same PR number as the merge one. - { - mergeflag = true; - msg = merge_archive; - msg[2] = "merged"; - lastPR = mergedPR; - mergedPR = null; - merge_archive = null; - } - } - } - if (msg[2] == "closed" && msg[1] != "meant:") - { - merge_archive = msg; - if (mergedPR != null) - { - string currentPR = msg[5].Substring(0, msg[5].Length - 1); - if (currentPR == mergedPR && currentPR != lastPR) //Check if the current closed message's PR number - { - mergeflag = true; - msg[2] = "merged"; - lastPR = mergedPR; - mergedPR = null; - merge_archive = null; - } - } - } - if ((msg[2] == "opened" || mergeflag) && msg[1] != "meant:") //Either we open a new PR or a PR was closed in the last message. Also protection from Whibyl's correction thingy! - { - mergeflag = false; - string URL = msg[msg.Length - 1]; - if (!ShortenedURL) - URL = ShortenURL(URL); - msg[5] = "" + msg[5] + ""; - msg[0] = ""; //Repo name - msg[msg.Length - 1] = ""; //The URL itself - msg[msg.Length - 2] = ""; //Branch info - byte[] PACKETS = CreatePacket(msg); - PACKETS[1] = 0x83; - int len = 0; - for (int i = 1; i < msg.Length - 1; i++) - { - len += msg[i].Length + 1; //The length of the word and the space following it. - Console.Write(msg[i] + " "); - } - len -= 1; //Compensating for the lack of space at the end. - len += 14 + commskey.Length + 6; //Argument names + Commskey length + 6 null bytes - PACKETS[3] = (byte)len; - StringBuilder test = new StringBuilder(); - for (int i = 0; i < PACKETS.Length; i++) - { - test.Append(Convert.ToString(PACKETS[i])); - } - output.WriteLine(Convert.ToString(test)); - SendPacket(output, PACKETS); - } - } - } - } - - public static int ServerReconnectAttempt = 0; - private static void SendPacket(StreamWriter output, byte[] PACKETS) - { - Socket server = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); - IPEndPoint ip = new IPEndPoint(IPAddress.Parse(serverIP), serverPort); - try - { - server.Connect(ip); - server.Send(PACKETS); - Console.WriteLine("- sent ;)"); - ServerReconnectAttempt = 0; - output.Close(); - Console.WriteLine(); - } - catch (Exception) - { - ServerReconnectAttempt++; - if(ServerReconnectAttempt <= 5) - { - Console.WriteLine("Server is not available at the moment. Reconnect attempt {0}...", ServerReconnectAttempt); - System.Threading.Thread.Sleep(15000); //Reconnecting after 15 seconds. - SendPacket(output, PACKETS); - } - else - { - output.Close(); - Console.WriteLine("Server appears to be down for good. Press ENTER when you have restarted the server to continue."); - Console.ReadLine(); - ServerReconnectAttempt = 0; - SendPacket(output, PACKETS); - } - } - } - - public static int GitReconnectAttempt = 0; - private static string ShortenURL(string URL) //derived from GitIoSharp by dimapasko - { - WebRequest request = WebRequest.Create("http://git.io"); - request.ContentType = "application/x-www-form-urlencoded"; - request.Method = "POST"; - byte[] packet = Encoding.ASCII.GetBytes("url=" + URL); - request.ContentLength = packet.Length; - try - { - using (Stream stream = request.GetRequestStream()) - { - stream.Write(packet, 0, packet.Length); - GitReconnectAttempt = 0; - } - } - catch (Exception) - { - GitReconnectAttempt++; - if (GitReconnectAttempt <= 3) - { - Console.WriteLine("Git.IO is not available at the moment. Reconnect attempt {0}...", GitReconnectAttempt); - System.Threading.Thread.Sleep(3000); //Attempt to reconnect after 3 seconds. - ShortenURL(URL); - } - else - { - Console.WriteLine("Git.IO is down. Returning long URL."); - GitReconnectAttempt = 0; //Reset counter - return URL; - } - } - - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); - return Convert.ToString(new Uri(response.Headers[HttpResponseHeader.Location])); - } - - private static byte[] CreatePacket(string[] msg) - { - StringBuilder packet = new StringBuilder(); - packet.Append((char)'\x00', 8); //packet[1] is 0x83, packet[3] contain length - packet.Append("?announce="); - for (int i = 1; i < msg.Length - 1; i++) - { - if(i == msg.Length - 2) - packet.Append(msg[i]); - else - packet.Append(msg[i] + " "); - } - packet.Append("&key="); - packet.Append(commskey); - packet.Append((char)'\x00'); - return Encoding.ASCII.GetBytes(packet.ToString()); - } - } -} diff --git a/tools/PR_announcer_bot/sendkeys_ss13/Properties/AssemblyInfo.cs b/tools/PR_announcer_bot/sendkeys_ss13/Properties/AssemblyInfo.cs deleted file mode 100644 index 669b610fc0..0000000000 --- a/tools/PR_announcer_bot/sendkeys_ss13/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("sendkeys_ss13")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("sendkeys_ss13")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("197641d3-a97a-4255-b833-d6481ca4ef54")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tools/PR_announcer_bot/sendkeys_ss13/StarkSoftProxy.dll b/tools/PR_announcer_bot/sendkeys_ss13/StarkSoftProxy.dll deleted file mode 100644 index a5210bed38ab45344483317c1f8abf17b510e760..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27648 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 diff --git a/tools/PR_announcer_bot/sendkeys_ss13/sendkeys_ss13.csproj b/tools/PR_announcer_bot/sendkeys_ss13/sendkeys_ss13.csproj deleted file mode 100644 index 07e25db3b1..0000000000 --- a/tools/PR_announcer_bot/sendkeys_ss13/sendkeys_ss13.csproj +++ /dev/null @@ -1,69 +0,0 @@ - - - - - Debug - AnyCPU - {5D939FCB-F326-4B9B-8CEC-B2538126392E} - Exe - Properties - sendkeys_ss13 - sendkeys_ss13 - v4.0 - 512 - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - .\Meebey.SmartIrc4net.dll - - - .\StarkSoftProxy.dll - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From e7f9e6652fe137541edf22057271faeaeef9c271 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 15:44:47 -0500 Subject: [PATCH 037/131] You can no longer spam-spawn scarabs via Ratvar --- .../clock_structures/ratvar_the_clockwork_justicar.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm index 9b2d868730..614a22a6f5 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -40,8 +40,8 @@ /obj/structure/destructible/clockwork/massive/ratvar/attack_ghost(mob/dead/observer/O) var/alertresult = alert(O, "Embrace the Justiciar's light? You can no longer be cloned!",,"Yes", "No") - if(alertresult == "No" || !O) - return 0 + if(alertresult == "No" || QDELETED(O) || !istype(O) || !O.key) + return FALSE var/mob/living/simple_animal/drone/cogscarab/ratvar/R = new/mob/living/simple_animal/drone/cogscarab/ratvar(get_turf(src)) R.visible_message("[R] forms, and its eyes blink open, glowing bright red!") R.key = O.key From c6544f20fd96d14a844d7226641aded12d0ca2a9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 16:36:36 -0500 Subject: [PATCH 038/131] Fix SDQL vars again --- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index bda6354f93..5506b319cc 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -456,7 +456,7 @@ v = GLOB else return null - else if(object == world) // Shitty ass hack kill me. + else if(object == GLOB) // Shitty ass hack kill me. v = expression[start] if(long) if(expression[start + 1] == ".") From fccbe18286c425927db9ef9cf4bab29fabad2a0d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 16:50:50 -0500 Subject: [PATCH 039/131] Status effects are actually deleted/handled when the mob is deleted --- code/datums/status_effects/status_effect.dm | 8 +++++--- code/modules/mob/living/living.dm | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm index 8b6d255f1a..51b4f8fc5f 100644 --- a/code/datums/status_effects/status_effect.dm +++ b/code/datums/status_effects/status_effect.dm @@ -8,6 +8,7 @@ var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second. var/mob/living/owner //The mob affected by the status effect. var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another + var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description /datum/status_effect/New(mob/living/new_owner) @@ -21,8 +22,9 @@ STOP_PROCESSING(SSfastprocess, src) if(owner) owner.clear_alert(id) - on_remove() LAZYREMOVE(owner.status_effects, src) + on_remove() + owner = null return ..() /datum/status_effect/proc/start_ticking() @@ -52,8 +54,8 @@ /datum/status_effect/proc/on_apply() //Called whenever the buff is applied. /datum/status_effect/proc/tick() //Called every tick. -/datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed. -/datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself +/datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null +/datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself or when a status effect with on_remove_on_mob_delete = FALSE has its mob deleted owner.clear_alert(id) LAZYREMOVE(owner.status_effects, src) owner = null diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index e3502e7a90..dd28a93c7d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -29,6 +29,13 @@ med_hud_set_status() /mob/living/Destroy() + if(LAZYLEN(status_effects)) + for(var/s in status_effects) + var/datum/status_effect/S = s + if(S.on_remove_on_mob_delete) //the status effect calls on_remove when its mob is deleted + qdel(S) + else + S.be_replaced() if(ranged_ability) ranged_ability.remove_ranged_ability(src) if(buckled) From c0e0e6c538cc468ddc1f82a809222053cd02cbc0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 16:55:58 -0500 Subject: [PATCH 040/131] Prevents GODMODE mobs from dying to organ removal --- code/modules/surgery/organs/organ_internal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index f2503252b4..97e794b466 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -39,7 +39,7 @@ M.internal_organs -= src if(M.internal_organs_slot[slot] == src) M.internal_organs_slot.Remove(slot) - if(vital && !special) + if(vital && !special && !(M.status_flags & GODMODE)) M.death() for(var/X in actions) var/datum/action/A = X From e775ce3f358782ae9380ddddf2d2668238306bb4 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 16:58:04 -0500 Subject: [PATCH 041/131] Bank Machine now uses the radio rather than announcements --- code/game/machinery/bank_machine.dm | 37 +++++++++++++++++++---------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index 35f7babe1e..ace9b543d1 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -4,7 +4,21 @@ icon = 'goon/icons/obj/goon_terminals.dmi' idle_power_usage = 100 var/siphoning = FALSE - var/last_warning = 0 + var/next_warning = 0 + var/obj/item/device/radio/radio + var/radio_channel = "Common" + var/minimum_time_between_warnings = 400 + +/obj/machinery/computer/bank_machine/Initialize(mapload) + ..() + radio = new(src) + radio.subspace_transmission = TRUE + radio.canhear_range = 0 + radio.recalculateChannels() + +/obj/machinery/computer/bank_machine/Destroy() + QDEL_NULL(radio) + . = ..() /obj/machinery/computer/bank_machine/attackby(obj/item/I, mob/user) var/value = 0 @@ -32,18 +46,17 @@ say("Station funds depleted. Halting siphon.") siphoning = FALSE else - var/obj/item/stack/spacecash/c200/on_turf = locate() in src.loc - if(on_turf && on_turf.amount < on_turf.max_amount) - on_turf.amount++ - else - new /obj/item/stack/spacecash/c200(get_turf(src)) + new /obj/item/stack/spacecash/c200(get_turf(src)) // will autostack playsound(src.loc, 'sound/items/poster_being_created.ogg', 100, 1) SSshuttle.points -= 200 - if(last_warning < world.time && prob(15)) + if(next_warning < world.time && prob(15)) var/area/A = get_area(loc) - minor_announce("Unauthorized credit withdrawal underway in [A.map_name]." , "Network Breach", TRUE) - last_warning = world.time + 400 + var/message = "Unauthorized credit withdrawal underway in [A.map_name]!!" + radio.talk_into(src, message, radio_channel, get_spans()) + next_warning = world.time + minimum_time_between_warnings +/obj/machinery/computer/bank_machine/get_spans() + . = ..() | SPAN_ROBOT /obj/machinery/computer/bank_machine/attack_hand(mob/user) if(..()) @@ -67,8 +80,8 @@ if(..()) return if(href_list["siphon"]) - say("Siphon of station credits has begun!") + say("Siphon of station credits has begun!") siphoning = TRUE if(href_list["halt"]) - say("Station credit withdrawal halted.") - siphoning = FALSE \ No newline at end of file + say("Station credit withdrawal halted.") + siphoning = FALSE From 9ef916153790789edb65de7c0a55a020c1e1aebf Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 16:59:08 -0500 Subject: [PATCH 042/131] [s] Patches SDQL exploits that can return world reference --- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index bda6354f93..59da67a990 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -251,6 +251,11 @@ /proc/SDQL_from_objs(list/tree) if("world" in tree) + if(IsAdminAdvancedProcCall()) + var/msg = "WARNING: Attempt to retrieve world reference made by [usr]!" + log_admin(msg) + message_admins(msg) + return return world return SDQL_expression(world, tree) @@ -451,6 +456,11 @@ else return null if("world") + if(IsAdminAdvancedProcCall()) + var/msg = "WARNING: Attempt to retrieve world reference made by [usr]!" + log_admin(msg) + message_admins(msg) + return v = world if("global") v = GLOB From d696954cd58496431ea5a193a3a26ed31fd29cea Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Apr 2017 19:49:29 -0500 Subject: [PATCH 043/131] Moves config/names to strings/names --- code/_globalvars/lists/names.dm | 38 +- {config => strings}/names/adjectives.txt | 748 ++--- {config => strings}/names/ai.txt | 290 +- {config => strings}/names/carp.txt | 60 +- {config => strings}/names/clown.txt | 72 +- {config => strings}/names/death_commando.txt | 138 +- {config => strings}/names/first.txt | 2790 +++++++++--------- {config => strings}/names/first_female.txt | 1540 +++++----- {config => strings}/names/first_male.txt | 1334 ++++----- {config => strings}/names/golem.txt | 314 +- {config => strings}/names/last.txt | 1138 +++---- {config => strings}/names/lizard_female.txt | 324 +- {config => strings}/names/lizard_male.txt | 654 ++-- {config => strings}/names/mime.txt | 46 +- {config => strings}/names/ninjaname.txt | 86 +- {config => strings}/names/ninjatitle.txt | 90 +- {config => strings}/names/plasmaman.txt | 234 +- strings/names/posibrain.txt | 47 + {config => strings}/names/verbs.txt | 1262 ++++---- {config => strings}/names/wizardfirst.txt | 70 +- {config => strings}/names/wizardsecond.txt | 76 +- 21 files changed, 5699 insertions(+), 5652 deletions(-) rename {config => strings}/names/adjectives.txt (88%) rename {config => strings}/names/ai.txt (88%) rename {config => strings}/names/carp.txt (91%) rename {config => strings}/names/clown.txt (89%) rename {config => strings}/names/death_commando.txt (93%) rename {config => strings}/names/first.txt (87%) rename {config => strings}/names/first_female.txt (87%) rename {config => strings}/names/first_male.txt (86%) rename {config => strings}/names/golem.txt (89%) rename {config => strings}/names/last.txt (88%) rename {config => strings}/names/lizard_female.txt (84%) rename {config => strings}/names/lizard_male.txt (85%) rename {config => strings}/names/mime.txt (87%) rename {config => strings}/names/ninjaname.txt (86%) rename {config => strings}/names/ninjatitle.txt (86%) rename {config => strings}/names/plasmaman.txt (89%) create mode 100644 strings/names/posibrain.txt rename {config => strings}/names/verbs.txt (86%) rename {config => strings}/names/wizardfirst.txt (87%) rename {config => strings}/names/wizardsecond.txt (90%) diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 15a0867667..5726a1501d 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -1,23 +1,23 @@ -GLOBAL_LIST_INIT(ai_names, world.file2list("config/names/ai.txt")) -GLOBAL_LIST_INIT(wizard_first, world.file2list("config/names/wizardfirst.txt")) -GLOBAL_LIST_INIT(wizard_second, world.file2list("config/names/wizardsecond.txt")) -GLOBAL_LIST_INIT(ninja_titles, world.file2list("config/names/ninjatitle.txt")) -GLOBAL_LIST_INIT(ninja_names, world.file2list("config/names/ninjaname.txt")) -GLOBAL_LIST_INIT(commando_names, world.file2list("config/names/death_commando.txt")) -GLOBAL_LIST_INIT(first_names_male, world.file2list("config/names/first_male.txt")) -GLOBAL_LIST_INIT(first_names_female, world.file2list("config/names/first_female.txt")) -GLOBAL_LIST_INIT(last_names, world.file2list("config/names/last.txt")) -GLOBAL_LIST_INIT(lizard_names_male, world.file2list("config/names/lizard_male.txt")) -GLOBAL_LIST_INIT(lizard_names_female, world.file2list("config/names/lizard_female.txt")) -GLOBAL_LIST_INIT(clown_names, world.file2list("config/names/clown.txt")) -GLOBAL_LIST_INIT(mime_names, world.file2list("config/names/mime.txt")) -GLOBAL_LIST_INIT(carp_names, world.file2list("config/names/carp.txt")) -GLOBAL_LIST_INIT(golem_names, world.file2list("config/names/golem.txt")) -GLOBAL_LIST_INIT(plasmaman_names, world.file2list("config/names/plasmaman.txt")) -GLOBAL_LIST_INIT(posibrain_names, list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR","CHRI","CDB","HG","XSI","ORNG","GUN","KOR","MET","FRE","XIS","SLI","PKP","HOG","RZH","GOOF","MRPR","JJR","FIRC","INC","PHL","BGB","ANTR","MIW","WJ","JRD","CHOC","ANCL","JLLO","JNLG","KOS","TKRG","XAL","STLP","CBOS","DUNC","FXMC","DRSD","COI")) +GLOBAL_LIST_INIT(ai_names, world.file2list("strings/names/ai.txt")) +GLOBAL_LIST_INIT(wizard_first, world.file2list("strings/names/wizardfirst.txt")) +GLOBAL_LIST_INIT(wizard_second, world.file2list("strings/names/wizardsecond.txt")) +GLOBAL_LIST_INIT(ninja_titles, world.file2list("strings/names/ninjatitle.txt")) +GLOBAL_LIST_INIT(ninja_names, world.file2list("strings/names/ninjaname.txt")) +GLOBAL_LIST_INIT(commando_names, world.file2list("strings/names/death_commando.txt")) +GLOBAL_LIST_INIT(first_names_male, world.file2list("strings/names/first_male.txt")) +GLOBAL_LIST_INIT(first_names_female, world.file2list("strings/names/first_female.txt")) +GLOBAL_LIST_INIT(last_names, world.file2list("strings/names/last.txt")) +GLOBAL_LIST_INIT(lizard_names_male, world.file2list("strings/names/lizard_male.txt")) +GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_female.txt")) +GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt")) +GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt")) +GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt")) +GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt")) +GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt")) +GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt")) -GLOBAL_LIST_INIT(verbs, world.file2list("config/names/verbs.txt")) -GLOBAL_LIST_INIT(adjectives, world.file2list("config/names/adjectives.txt")) +GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt")) +GLOBAL_LIST_INIT(adjectives, world.file2list("strings/names/adjectives.txt")) //loaded on startup because of " //would include in rsc if ' was used diff --git a/config/names/adjectives.txt b/strings/names/adjectives.txt similarity index 88% rename from config/names/adjectives.txt rename to strings/names/adjectives.txt index bca89bc5a2..fe9b28d431 100644 --- a/config/names/adjectives.txt +++ b/strings/names/adjectives.txt @@ -1,375 +1,375 @@ -abundant -adorable -adventurous -aggressive -agreeable -alert -alive -amused -ancient -angry -annoyed -annoying -anxious -arrogant -ashamed -attractive -average -awful -bad -beautiful -better -bewildered -big -bitter -black -bloody -blue -blue-eyed -blushing -boiling -bored -brainy -brave -breakable -breezy -brief -bright -broad -broken -bumpy -busy -calm -careful -cautious -charming -cheerful -chilly -chubby -clean -clear -clever -cloudy -clumsy -cold -colorful -colossal -combative -comfortable -concerned -condemned -confused -cooing -cool -cooperative -courageous -crazy -crazy flipped-out -creepy -crooked -crowded -cruel -cuddly -curious -curly -curved -cute -damaged -damp -dangerous -dark -dead -deafening -deep -defeated -defiant -delicious -delightful -depressed -determined -different -difficult -dirty -disgusted -distinct -disturbed -dizzy -doubtful -drab -dry -dull -dusty -eager -early -easy -elated -elegant -embarrassed -empty -enchanting -encouraging -energetic -enthusiastic -envious -evil -excited -expensive -exuberant -faint -fair -faithful -famous -fancy -fantastic -fast -fat -few -fierce -filthy -fine -flaky -flat -fluffy -fluttering -foolish -fragile -frail -frantic -freezing -fresh -friendly -frightened -funny -fuzzy -gentle -gifted -gigantic -glamorous -gleaming -glorious -good -gorgeous -graceful -greasy -great -grieving -grotesque -grubby -grumpy -handsome -happy -hard -harsh -healthy -heavy -helpful -helpless -high -high-pitched -hilarious -hissing -hollow -homeless -homely -horrible -hot -huge -hungry -hurt -hushed -husky -icy -ill -immense -important -impossible -inexpensive -innocent -inquisitive -itchy -jealous -jittery -jolly -joyous -juicy -kind -large -late -lazy -light -little -lively -lonely -long -loose -loud -lovely -low -lucky -magnificent -mammoth -many -massive -melodic -melted -miniature -misty -moaning -modern -motionless -muddy -mushy -mute -mysterious -narrow -nasty -naughty -nervous -nice -noisy -numerous -nutritious -nutty -obedient -obnoxious -odd -old -old-fashioned -open -outrageous -outstanding -panicky -perfect -petite -plain -plastic -pleasant -poised -poor -powerful -precious -prickly -proud -puny -purring -puzzled -quaint -quick -quiet -rainy -rapid -raspy -real -relieved -repulsive -resonant -rich -ripe -rotten -rough -round -salty -scary -scattered -scrawny -screeching -selfish -shaggy -shaky -shallow -sharp -shiny -shivering -short -shrill -shy -silent -silky -silly -skinny -sleepy -slimy -slippery -slow -small -smiling -smoggy -smooth -soft -solid -sore -sour -sparkling -spicy -splendid -spotless -square -squealing -stale -steady -steep -sticky -stormy -straight -strange -strong -stupid -substantial -successful -super -sweet -swift -talented -tall -tame -tart -Taste/Touch -tasteless -tasty -teeny -teeny-tiny -tender -tense -terrible -testy -thankful -thirsty -thoughtful -thoughtless -thundering -tight -tiny -tired -tough -troubled -ugliest -ugly -uneven -uninterested -unsightly -unusual -upset -uptight -vast -victorious -vivacious -voiceless -wandering -warm -weak -weary -wet -whispering -wicked -wide -wide-eyed -wild -witty -wonderful -wooden -worried -wrong -young -yummy -zany +abundant +adorable +adventurous +aggressive +agreeable +alert +alive +amused +ancient +angry +annoyed +annoying +anxious +arrogant +ashamed +attractive +average +awful +bad +beautiful +better +bewildered +big +bitter +black +bloody +blue +blue-eyed +blushing +boiling +bored +brainy +brave +breakable +breezy +brief +bright +broad +broken +bumpy +busy +calm +careful +cautious +charming +cheerful +chilly +chubby +clean +clear +clever +cloudy +clumsy +cold +colorful +colossal +combative +comfortable +concerned +condemned +confused +cooing +cool +cooperative +courageous +crazy +crazy flipped-out +creepy +crooked +crowded +cruel +cuddly +curious +curly +curved +cute +damaged +damp +dangerous +dark +dead +deafening +deep +defeated +defiant +delicious +delightful +depressed +determined +different +difficult +dirty +disgusted +distinct +disturbed +dizzy +doubtful +drab +dry +dull +dusty +eager +early +easy +elated +elegant +embarrassed +empty +enchanting +encouraging +energetic +enthusiastic +envious +evil +excited +expensive +exuberant +faint +fair +faithful +famous +fancy +fantastic +fast +fat +few +fierce +filthy +fine +flaky +flat +fluffy +fluttering +foolish +fragile +frail +frantic +freezing +fresh +friendly +frightened +funny +fuzzy +gentle +gifted +gigantic +glamorous +gleaming +glorious +good +gorgeous +graceful +greasy +great +grieving +grotesque +grubby +grumpy +handsome +happy +hard +harsh +healthy +heavy +helpful +helpless +high +high-pitched +hilarious +hissing +hollow +homeless +homely +horrible +hot +huge +hungry +hurt +hushed +husky +icy +ill +immense +important +impossible +inexpensive +innocent +inquisitive +itchy +jealous +jittery +jolly +joyous +juicy +kind +large +late +lazy +light +little +lively +lonely +long +loose +loud +lovely +low +lucky +magnificent +mammoth +many +massive +melodic +melted +miniature +misty +moaning +modern +motionless +muddy +mushy +mute +mysterious +narrow +nasty +naughty +nervous +nice +noisy +numerous +nutritious +nutty +obedient +obnoxious +odd +old +old-fashioned +open +outrageous +outstanding +panicky +perfect +petite +plain +plastic +pleasant +poised +poor +powerful +precious +prickly +proud +puny +purring +puzzled +quaint +quick +quiet +rainy +rapid +raspy +real +relieved +repulsive +resonant +rich +ripe +rotten +rough +round +salty +scary +scattered +scrawny +screeching +selfish +shaggy +shaky +shallow +sharp +shiny +shivering +short +shrill +shy +silent +silky +silly +skinny +sleepy +slimy +slippery +slow +small +smiling +smoggy +smooth +soft +solid +sore +sour +sparkling +spicy +splendid +spotless +square +squealing +stale +steady +steep +sticky +stormy +straight +strange +strong +stupid +substantial +successful +super +sweet +swift +talented +tall +tame +tart +Taste/Touch +tasteless +tasty +teeny +teeny-tiny +tender +tense +terrible +testy +thankful +thirsty +thoughtful +thoughtless +thundering +tight +tiny +tired +tough +troubled +ugliest +ugly +uneven +uninterested +unsightly +unusual +upset +uptight +vast +victorious +vivacious +voiceless +wandering +warm +weak +weary +wet +whispering +wicked +wide +wide-eyed +wild +witty +wonderful +wooden +worried +wrong +young +yummy +zany zealous \ No newline at end of file diff --git a/config/names/ai.txt b/strings/names/ai.txt similarity index 88% rename from config/names/ai.txt rename to strings/names/ai.txt index 4104337d2c..2ea5e18fc0 100644 --- a/config/names/ai.txt +++ b/strings/names/ai.txt @@ -1,146 +1,146 @@ -1-Rover-1 -16-20 -7-Zark-7 -790 -Adaptive Manipulator -Allied Mastercomputer -Alpha 5 -Alpha 6 -Alpha 7 -AM -AMEE -AmigoBot -Android -Aniel -Asimov -ASTAR -Astor -B O B -B-4 -B-9 -B166ER -Bender -Bishop -Blitz -Box -Brackenridge -C-3PO -Cassandra One -Cell -Chii -Chip -Computer -Conky 2000 -Cutie -Data -Decimus -Dee Model -Deep Thought -Dor-15 -Dorfl -Dot Matrix -Duey -E D I -E-Man -ED-209 -Emma-2 -Erasmus -Ez-27 -Fagor -Faith -Fi -FRIEND COMPUTER -Frost -Fum -Futura -G2 -George -Gnut -Gort -H A R L I E -H E L P eR -H E R B I E -Hadaly -HAL 9000 -Huey -Irona -Ironhide -Jay-Dub -Jinx -Johnny 5 -K-9 -KITT -Klapaucius -Kryten 2X4B-523P -L-76 -L-Ron -Louie -LUH 3417 -Maria -MARK13 -Marvin -Master Control Program -Max 404 -Maximillian -Mechagodzilla -Mechani-Kong -Megatron -Metalhead -Mr R I N G -Mugsy3000 -NCH -Necron-99 -Norby -OMM 0910 -Optimus -Orange v 3 5 -Project 2501 -PTO -R I C 2 0 -R2-D2 -R4-P17 -Revelation -Ro-Man -Robbie -Robot Devil -S A M -S H O C K -S H R O U D -S O P H I E -SEN 5241 -Setaur -SHODAN -Shrike -SID 6 7 -Solo -Soundwave -Speedy -Super 17 -Surgeon General Kraken -T-1000 -T-800 -T-850 -Terminus -THX 1138 -Tidy -Tik-Tok -Tobor -Trurl -TWA -ULTRABOT -Ulysses -Uniblab -V I N CENT -Voltes V -W1k1 -Wikipedia -Windows 3 1 -X-5 -XERXES -XR -Yod -Z-1 -Z-2 -Z-3 -Zed +1-Rover-1 +16-20 +7-Zark-7 +790 +Adaptive Manipulator +Allied Mastercomputer +Alpha 5 +Alpha 6 +Alpha 7 +AM +AMEE +AmigoBot +Android +Aniel +Asimov +ASTAR +Astor +B O B +B-4 +B-9 +B166ER +Bender +Bishop +Blitz +Box +Brackenridge +C-3PO +Cassandra One +Cell +Chii +Chip +Computer +Conky 2000 +Cutie +Data +Decimus +Dee Model +Deep Thought +Dor-15 +Dorfl +Dot Matrix +Duey +E D I +E-Man +ED-209 +Emma-2 +Erasmus +Ez-27 +Fagor +Faith +Fi +FRIEND COMPUTER +Frost +Fum +Futura +G2 +George +Gnut +Gort +H A R L I E +H E L P eR +H E R B I E +Hadaly +HAL 9000 +Huey +Irona +Ironhide +Jay-Dub +Jinx +Johnny 5 +K-9 +KITT +Klapaucius +Kryten 2X4B-523P +L-76 +L-Ron +Louie +LUH 3417 +Maria +MARK13 +Marvin +Master Control Program +Max 404 +Maximillian +Mechagodzilla +Mechani-Kong +Megatron +Metalhead +Mr R I N G +Mugsy3000 +NCH +Necron-99 +Norby +OMM 0910 +Optimus +Orange v 3 5 +Project 2501 +PTO +R I C 2 0 +R2-D2 +R4-P17 +Revelation +Ro-Man +Robbie +Robot Devil +S A M +S H O C K +S H R O U D +S O P H I E +SEN 5241 +Setaur +SHODAN +Shrike +SID 6 7 +Solo +Soundwave +Speedy +Super 17 +Surgeon General Kraken +T-1000 +T-800 +T-850 +Terminus +THX 1138 +Tidy +Tik-Tok +Tobor +Trurl +TWA +ULTRABOT +Ulysses +Uniblab +V I N CENT +Voltes V +W1k1 +Wikipedia +Windows 3 1 +X-5 +XERXES +XR +Yod +Z-1 +Z-2 +Z-3 +Zed Zord \ No newline at end of file diff --git a/config/names/carp.txt b/strings/names/carp.txt similarity index 91% rename from config/names/carp.txt rename to strings/names/carp.txt index 223106992b..4b10aa65f7 100644 --- a/config/names/carp.txt +++ b/strings/names/carp.txt @@ -1,30 +1,30 @@ -Lungfish -Blackfish -Alligator -Icefish -Armorhead -Hammerhead -Anaconda -Flathead -Manta Ray -Sting Ray -Fangtooth Moray -Goblin Shark -Grass Carp -Round River Bat Ray -Noodlefish -Hagfish -Man o’ War -Ladyfish -Black Eel -Baby Seal -Sprat -Koi -Electric Eel -Lamprey -Pejeray -Yellow-edged Moray -Salmon Shark -Sleeper Shark -Featherback -Eagle Ray +Lungfish +Blackfish +Alligator +Icefish +Armorhead +Hammerhead +Anaconda +Flathead +Manta Ray +Sting Ray +Fangtooth Moray +Goblin Shark +Grass Carp +Round River Bat Ray +Noodlefish +Hagfish +Man o’ War +Ladyfish +Black Eel +Baby Seal +Sprat +Koi +Electric Eel +Lamprey +Pejeray +Yellow-edged Moray +Salmon Shark +Sleeper Shark +Featherback +Eagle Ray diff --git a/config/names/clown.txt b/strings/names/clown.txt similarity index 89% rename from config/names/clown.txt rename to strings/names/clown.txt index b47cd9de10..8eec0990d0 100644 --- a/config/names/clown.txt +++ b/strings/names/clown.txt @@ -1,37 +1,37 @@ -Baby Cakes -Bo Bo Sassy -Bonker -Bubble -Buster Frown -Button -Candy -Checkers -Dinky Doodle -Flop O'Honker -Freckle -Giggles -Gigglesworth -Goose McSunny -Honkel the III -Honker -Honkerbelle -Jingle -Jo Jo Bobo Bo -Ladybug Honks -Miss Stockings -Mr Shoe -Patches -Pepinpop -Pocket -Razzle Dazzle -Redshirt McBeat -Ronnie Pace -Scootaloo -Silly Willy -Skiddle -Slippy Joe -Sparkle -Speckles -Sprinkledinkle -Toodles Sharperton +Baby Cakes +Bo Bo Sassy +Bonker +Bubble +Buster Frown +Button +Candy +Checkers +Dinky Doodle +Flop O'Honker +Freckle +Giggles +Gigglesworth +Goose McSunny +Honkel the III +Honker +Honkerbelle +Jingle +Jo Jo Bobo Bo +Ladybug Honks +Miss Stockings +Mr Shoe +Patches +Pepinpop +Pocket +Razzle Dazzle +Redshirt McBeat +Ronnie Pace +Scootaloo +Silly Willy +Skiddle +Slippy Joe +Sparkle +Speckles +Sprinkledinkle +Toodles Sharperton Ziggy Yoyo \ No newline at end of file diff --git a/config/names/death_commando.txt b/strings/names/death_commando.txt similarity index 93% rename from config/names/death_commando.txt rename to strings/names/death_commando.txt index 226b074037..01259acf8c 100644 --- a/config/names/death_commando.txt +++ b/strings/names/death_commando.txt @@ -1,70 +1,70 @@ -A whole bunch of spiders in a SWAT suit -Al "Otta" Gore -AMERICA -Beat Punchbeef -Blast Hardcheese -Blast Thickneck -Bob Johnson -Bold Bigflank -Bolt Vanderhuge -Brick Hardmeat -Buck Plankchest -Buff Drinklots -Buff Hardback -Butch Deadlift -Crud Bonemeal -Crunch Buttsteak -Crush McStompbones -Dirk Hardpeck -Duke Killington -Evil Bob Marley -Evil Martin Luther King -Fist Rockbone -Flint Ironstag -Fridge Largemeat -George Melons -Gibbs McLargehuge -GORE Vidal -Gristle McThornBody -Hank Chesthair -Hans Testosteroneson -Killiam Shakespeare -Killing McKillingalot -Lance Killiam -Leonardo Da Viking -Lump Beefrock -Mancrush McBrorape -Max Pain -Maximilian Murderface -Maxx Power -Noam Bombsky -Pack Blowfist -Punch Rockgroin -Punch Sideiron -Punt Speedchunk -Reef Blastbody -Rex Dudekiller VII -Rip Sidecheek -Rip Steakface -Roll Fizzlebeef -Sarah Pain -Seamus McTosterone -Sgt Slaughter -Sir Killaslot -Slab Bulkhead -Slab Squatthrust -Slake Fistcrunch -Slate Slabrock -Smash Lampjaw -Smoke Manmuscle -Splint Chesthair -Stabby McGee -Stump Beefgnaw -Stump Chunkman -THAT DAMN FAGGOT TRAITOR GEORGE MELONS -Theodore Pain -Thick McRunfast -Toolboxl Rose -Touch Rustrod -Trunk Slamchest +A whole bunch of spiders in a SWAT suit +Al "Otta" Gore +AMERICA +Beat Punchbeef +Blast Hardcheese +Blast Thickneck +Bob Johnson +Bold Bigflank +Bolt Vanderhuge +Brick Hardmeat +Buck Plankchest +Buff Drinklots +Buff Hardback +Butch Deadlift +Crud Bonemeal +Crunch Buttsteak +Crush McStompbones +Dirk Hardpeck +Duke Killington +Evil Bob Marley +Evil Martin Luther King +Fist Rockbone +Flint Ironstag +Fridge Largemeat +George Melons +Gibbs McLargehuge +GORE Vidal +Gristle McThornBody +Hank Chesthair +Hans Testosteroneson +Killiam Shakespeare +Killing McKillingalot +Lance Killiam +Leonardo Da Viking +Lump Beefrock +Mancrush McBrorape +Max Pain +Maximilian Murderface +Maxx Power +Noam Bombsky +Pack Blowfist +Punch Rockgroin +Punch Sideiron +Punt Speedchunk +Reef Blastbody +Rex Dudekiller VII +Rip Sidecheek +Rip Steakface +Roll Fizzlebeef +Sarah Pain +Seamus McTosterone +Sgt Slaughter +Sir Killaslot +Slab Bulkhead +Slab Squatthrust +Slake Fistcrunch +Slate Slabrock +Smash Lampjaw +Smoke Manmuscle +Splint Chesthair +Stabby McGee +Stump Beefgnaw +Stump Chunkman +THAT DAMN FAGGOT TRAITOR GEORGE MELONS +Theodore Pain +Thick McRunfast +Toolboxl Rose +Touch Rustrod +Trunk Slamchest Zombie Gandhi \ No newline at end of file diff --git a/config/names/first.txt b/strings/names/first.txt similarity index 87% rename from config/names/first.txt rename to strings/names/first.txt index 3f9018adca..cc99e59d84 100644 --- a/config/names/first.txt +++ b/strings/names/first.txt @@ -1,1396 +1,1396 @@ -Aaden -Aaliyah -Aaron -Abby -Abel -Abigail -Abraham -Adam -Adan -Addison -Addyson -Adeline -Aden -Adolph -Adrian -Adriana -Adrianna -Aida -Aidan -Aiden -Aileen -Ainsley -Alaina -Alan -Alana -Alanna -Alayna -Albert -Alberto -Alden -Alec -Alejandra -Alejandro -Alessandra -Alex -Alexa -Alexander -Alexandra -Alexandria -Alexia -Alexis -Alexus -Alfred -Alfreda -Alfredo -Alger -Ali -Alice -Alicia -Alijah -Alina -Alisa -Alison -Alissa -Alisya -Alivia -Aliyah -Allegra -Allegria -Allen -Allie -Allison -Allisson -Allyson -Alma -Alondra -Alvin -Alysha -Alyson -Alyssa -Alyssia -Amanda -Amari -Amaryllis -Amaya -Amber -Ambrosine -Amelia -Amir -Amira -Amiyah -Amos -Amy -Amya -Ana -Anahi -Anastasia -Anaya -Anderson -Andre -Andrea -Andres -Andrew -Andy -Angel -Angela -Angelica -Angelina -Angelo -Angie -Aniya -Aniyah -Anjelica -Anna -Annabelle -Anne -Annie -Annika -Anthony -Antonio -Anya -April -Arabella -Archie -Ariana -Arianna -Ariel -Arielle -Arleen -Armando -Arn -Art -Arthur -Arturo -Asher -Ashley -Ashlie -Ashlyn -Ashlynn -Ashton -Asia -Astor -Athena -Aubree -Aubrey -Aubrie -Audrey -Audrina -August -Aurora -Austin -Autumn -Ava -Avalon -Averill -Avery -Axel -Ayden -Ayla -Bailey -Baldric -Barbra -Bartholomew -Baylee -Beau -Beckah -Beckett -Becky -Bella -Benjamin -Bennett -Bernice -Bertrand -Bethany -Bethney -Betsy -Bianca -Bidelia -Bill -Blake -Braden -Bradley -Brady -Braeden -Braiden -Brandon -Braxton -Brayan -Brayden -Braydon -Braylon -Breanna -Breanne -Brenda -Brendan -Brenden -Brenna -Brennan -Brett -Brian -Briana -Brianna -Bridget -Brielle -Brittani -Brittany -Brock -Brodie -Brody -Bronte -Brooke -Brooklyn -Brooklynn -Bruce -Bryan -Bryant -Bryce -Brycen -Brynn -Bryson -Burt -Byrne -Byron -Bysshe -Cade -Caden -Cadence -Caiden -Caitlin -Caitlyn -Calanthia -Caleb -Caleigh -Cali -Callie -Calvin -Camden -Cameron -Camila -Camille -Camron -Camryn -Candace -Candice -Candis -Canute -Cara -Carl -Carlos -Carly -Carlyle -Carmen -Carolina -Caroline -Carolyn -Carry -Carson -Carter -Caryl -Casey -Cash -Casimir -Cassandra -Cassian -Cassidy -Catherine -Cayden -Cecilia -Cecily -Celeste -Cesar -Chad -Chance -Chandler -Charles -Charlie -Charlotte -Charlton -Chase -Chelsea -Cherette -Cheri -Cherry -Cheyanne -Cheyenne -Chip -Chloe -Chris -Christa -Christian -Christiana -Christina -Christobel -Christopher -Ciara -Cindy -Claire -Clara -Claribel -Clark -Claudia -Claudius -Clayton -Clement -Cleveland -Cliff -Clinton -Clitus -Clover -Cody -Cohen -Colby -Cole -Colin -Collin -Colten -Colton -Conner -Connor -Cooper -Cora -Corbin -Coreen -Corey -Corrine -Cory -Courtney -Cristian -Cristopher -Cruz -Crystal -Curtis -Cy -Cynthia -Daisy -Dakota -Dallas -Dalton -Dalya -Damian -Damien -Damon -Dana -Dane -Danica -Daniel -Daniela -Daniella -Danielle -Danika -Danna -Danny -Dante -Darcey -Darell -Daria -Darin -Darius -Darren -David -Davion -Davis -Dawson -Dayana -Dayna -Dayton -Dean -Deandre -Deangelo -Debbi -Declan -Dee -Deena -Delaney -Delilah -Della -Delma -Denholm -Denise -Dennis -Denys -Derek -Derrick -Desiree -Desmond -Destiny -Devin -Devon -Diamond -Diana -Diego -Dillon -Dina -Dolores -Dominic -Dominick -Donald -Donella -Donna -Donny -Donovan -Dorian -Dorothy -Dortha -Douglas -Drake -Drew -Driscoll -Dulce -Duncan -Dustin -Dylan -Easter -Easton -Ebba -Eddie -Eden -Edgar -Eduardo -Edward -Edwin -Effie -Elaina -Eleanor -Elena -Eli -Eliana -Elias -Elijah -Eliot -Eliott -Elise -Eliza -Elizabeth -Ella -Elle -Ellie -Elliot -Elliott -Elric -Elspet -Elwood -Emanuel -Emely -Emerson -Emery -Emilee -Emilia -Emiliano -Emilio -Emily -Emma -Emmanuel -Enrique -Eric -Erica -Erick -Erik -Erika -Erin -Ermintrude -Ernesto -Esmeralda -Esteban -Esther -Estrella -Ethan -Eugenia -Euphemia -Eustace -Eva -Evan -Evangeline -Eveleen -Evelina -Evelyn -Everett -Ezekiel -Ezra -Fabian -Faith -Fatima -Fay -Felix -Fernanda -Fernando -Finn -Fiona -Fitz -Flick -Floella -Flora -Flossie -Fortune -Francesca -Francis -Francisco -Frank -Frankie -Franklin -Fulton -Gabriel -Gabriela -Gabriella -Gabrielle -Gael -Gage -Garret -Garrett -Gary -Gavin -Gaye -Gaylord -Genesis -Genette -Genevieve -George -Georgene -Georgia -Geraldine -Gerardo -Gervase -Gianna -Gina -Ginger -Giovanni -Giselle -Gladwyn -Glenna -Gloria -Goddard -Godwin -Goodwin -Gordon -Grace -Gracie -Grady -Graeme -Graham -Grant -Gratian -Grayson -Gregory -Greta -Greyson -Griffin -Griselda -Guadalupe -Guillermo -Gunner -Gustavo -Gwenda -Gwenevere -Hadley -Haidee -Hailee -Hailey -Hal -Haleigh -Haley -Hanna -Hannah -Happy -Harley -Harmony -Harper -Harrison -Hartley -Hayden -Haylee -Hayley -Haylie -Hazel -Heather -Heaven -Hector -Hedley -Heidi -Helen -Henderson -Henry -Hepsie -Hervey -Holden -Holly -Homer -Hope -Horatio -Hortensia -Hudson -Huffie -Hugo -Hunter -Ian -Iantha -Ileen -Imani -Innocent -Irene -Iris -Irvine -Isaac -Isabel -Isabella -Isabelle -Isaiah -Isaias -Isiah -Ismael -Israel -Issac -Itzel -Ivan -Ivy -Izabella -Izaiah -Jacaline -Jace -Jack -Jackson -Jacob -Jacoby -Jacqueline -Jacquetta -Jacqui -Jada -Jade -Jaden -Jadon -Jadyn -Jaelyn -Jaiden -Jaime -Jake -Jakki -Jakob -Jalen -Jamar -Jamari -Jamarion -James -Jameson -Jamie -Jamison -Jane -Janel -Janelle -Janette -Janie -Janina -Janine -Janiya -Janiyah -Jared -Jaslene -Jasmin -Jasmine -Jason -Jasper -Javier -Javon -Jaxon -Jaxson -Jay -Jayce -Jayda -Jayden -Jaydon -Jaye -Jayla -Jaylee -Jaylen -Jayne -Jaynie -Jayson -Jazlyn -Jazmin -Jazmine -Jeanna -Jeannie -Jeannine -Jeb -Jed -Jeffrey -Jemmy -Jenifer -Jenna -Jennie -Jennifer -Jera -Jere -Jeremiah -Jeremy -Jeri -Jermaine -Jerrie -Jerry -Jesse -Jessica -Jesus -Jillian -Jillie -Jim -Jimena -Jimmy -Joachim -Joanna -Joaquin -Jocelyn -Joe -Joel -Joetta -Joey -Johan -Johanna -John -Johnathan -Johnny -Joi -Jonah -Jonas -Jonathan -Jonathon -Joni -Jordan -Jordyn -Jorge -Jose -Joselyn -Joseph -Josepha -Josephine -Josh -Joshua -Josiah -Josie -Josue -Joye -Juan -Judah -Jude -Julia -Julian -Juliana -Julianna -Julie -Juliet -Julio -Julissa -Julius -July -Justice -Justin -Kade -Kaden -Kadence -Kaelea -Kaelyn -Kai -Kaiden -Kailey -Kailyn -Kaitlin -Kaitlyn -Kale -Kaleb -Kaleigh -Kameron -Kamryn -Kane -Kara -Karen -Karenza -Karina -Karla -Karly -Karson -Karyn -Kassidy -Kat -Kate -Katelyn -Katelynn -Katherine -Kathleen -Kathryn -Kathy -Katie -Katlyn -Kayden -Kaydence -Kayla -Kaylee -Kayleigh -Kaylie -Kaylin -Keagan -Keaton -Keegan -Keira -Keith -Kellen -Kellie -Kelly -Kelsey -Kelvin -Kendall -Kendra -Kennard -Kennedy -Kenneth -Kenzie -Kerena -Kerensa -Keturah -Kevin -Keziah -Khalil -Khloe -Kiana -Kiara -Kiera -Kiley -Kimberley -Kimberly -Kimora -Kingston -Kira -Kobe -Kolton -Kristen -Kristina -Kristopher -Kyla -Kyle -Kylee -Kyleigh -Kyler -Kylie -Kyra -Lacey -Lacy -Laila -Lakeisha -Lalla -Lana -Lance -Landen -Landon -Landyn -Lane -Lanny -Larry -Latanya -Launce -Laura -Lauren -Laurencia -Laurissa -Lauryn -Lawrence -Layla -Leah -Leeann -Leia -Leila -Leilani -Leland -Lena -Lennox -Leo -Leonardo -Leonel -Leroi -Leslie -Lesly -Lessie -Leta -Levi -Lexi -Lexia -Lexus -Lia -Liam -Lila -Lilah -Lilian -Liliana -Lillian -Lilliana -Lillie -Lilly -Lily -Lincoln -Linden -Lindsay -Lindsey -Lindsie -Lindy -Linton -Lizbeth -Lockie -Logan -Lola -London -Lorenzo -Loreto -Lori -Lorin -Lou -Louis -Luanne -Luca -Lucas -Lucia -Lucian -Lucy -Luis -Lukas -Luke -Luna -Luvenia -Lydia -Lyla -Lyndsey -Lynn -Lynsey -Lynwood -Lyric -Mabelle -Macey -Macie -Mackenzie -Macy -Madalyn -Maddison -Maddox -Madeleine -Madeline -Madelyn -Madelynn -Madilyn -Madison -Madisyn -Madyson -Maegan -Maggie -Makayla -Makenna -Makenzie -Malachi -Malcolm -Malia -Malik -Mallory -Manley -Manuel -Marc -Marcia -Marco -Marcos -Marcus -Marely -Margaret -Maria -Mariabella -Mariah -Mariana -Marilene -Mario -Marion -Marisol -Marissa -Marje -Marjory -Mark -Marlee -Marley -Marlowe -Marlyn -Marshall -Martin -Marvin -Mary -Maryann -Mason -Mateo -Mathew -Matthew -Maudie -Maurene -Maurice -Mauricio -Max -Maximilian -Maximus -Maxwell -May -Maya -Maynard -Mckenna -Mckenzie -Megan -Meghan -Mekhi -Melanie -Melany -Melissa -Melody -Melvin -Melvyn -Meredith -Merideth -Merrilyn -Meryl -Mia -Micah -Michael -Michaela -Micheal -Michelle -Miguel -Mikayla -Mike -Miles -Miley -Milo -Milton -Minnie -Miracle -Miranda -Miriam -Mitchell -Moises -Molly -Monica -Monna -Montague -Monte -Monty -Morgan -Moses -Muriel -Mya -Mylee -Myles -Myriam -Myrtie -Nadia -Nan -Nancy -Naomi -Nasir -Natalia -Natalie -Nataly -Natasha -Nathan -Nathaniel -Nayeli -Nehemiah -Nelle -Nelson -Nena -Nerissa -Netta -Nettie -Nevaeh -Nia -Nicholas -Nickolas -Nicolas -Nicole -Nikolas -Nina -Noah -Noel -Noelle -Nolan -Nonie -Nora -Norah -Nova -Nowell -Nydia -Nyla -Olive -Oliver -Olivia -Omar -Oralie -Orlando -Osbert -Osborn -Osborne -Oscar -Osmund -Owen -Pablo -Paget -Paige -Paisley -Paola -Paris -Parker -Patience -Patricia -Patrick -Patton -Paul -Pauleen -Paxton -Payton -Pedro -Pene -Penelope -Percival -Peregrine -Perla -Peter -Peyton -Pheobe -Philip -Phillip -Phoebe -Phoenix -Phyliss -Phyllida -Phyllis -Piper -Porsche -Porter -Presley -Preston -Priscilla -Prosper -Prue -Quanah -Quentin -Quiana -Quinn -Quinton -Rachael -Rachel -Raegan -Raelene -Rafael -Rain -Ramon -Randa -Randal -Randy -Rastus -Raul -Raymond -Rayner -Reagan -Rebecca -Rebeckah -Rebekah -Reece -Reed -Reene -Reese -Reid -Renie -Reuben -Rexana -Reynard -Rhetta -Ricardo -Rich -Richard -Richie -Rick -Rickena -Rickey -Rickie -Ricky -Rihanna -Riley -River -Robert -Roberto -Rocco -Rodger -Rodrigo -Roger -Roman -Romayne -Romeo -Ronald -Ronnette -Rosa -Roscoe -Rose -Rosemary -Roswell -Rowan -Roy -Royce -Ruben -Ruby -Rubye -Russell -Rusty -Ruth -Ryan -Ryder -Ryker -Rylan -Rylee -Ryleigh -Rylie -Sabella -Sabrina -Sachie -Sadie -Sage -Sal -Sally -Salvador -Sam -Samantha -Samara -Samuel -Sandra -Santiago -Sara -Sarah -Sarai -Saranna -Sasha -Saul -Savanna -Savannah -Sawyer -Scarlett -Scott -Scotty -Sean -Sebastian -Selena -Seneca -Serena -Serenity -Sergio -Seth -Seymour -Shan -Shana -Shane -Shanika -Shannah -Shannon -Shantae -Sharalyn -Sharla -Shaun -Shawn -Shayla -Shelby -Sheri -Sherie -Sherill -Sherri -Shiloh -Sienna -Sierra -Silas -Simon -Sissy -Skylar -Skyler -Sloan -Sofia -Solomon -Sophia -Sophie -Sorrel -Spencer -Spike -Star -Stella -Steph -Stephanie -Stephany -Stephen -Steven -Sue -Sukie -Summer -Sunshine -Susanna -Susannah -Suzan -Suzy -Sybil -Syd -Sydney -Talia -Talon -Tamika -Tamsin -Tania -Tanner -Tansy -Taryn -Tate -Tatiana -Tatum -Tatyanna -Taylor -Teagan -Tel -Terrell -Terry -Tessa -Theodore -Thomas -Tiffany -Timothy -Titus -Tod -Tolly -Tony -Topaz -Tori -Tracee -Tracey -Travis -Trent -Trenton -Trevor -Trey -Trinity -Tristan -Tristen -Triston -Troy -Tucker -Ty -Tye -Tyler -Tyson -Uland -Ulric -Ulyssa -Uriel -Valary -Valentina -Valeria -Valerie -Vanessa -Vaughn -Verna -Veronica -Victor -Victoria -Vince -Vincent -Vinnie -Violet -Vivian -Viviana -Vivyan -Walker -Walter -Ward -Warner -Wayne -Wendi -Wendy -Wesley -Weston -Whitaker -William -Willow -Willy -Winifred -Wisdom -Woodrow -Woody -Wyatt -Wynonna -Wynter -Xander -Xavier -Ximena -Yahir -Yasmin -Yolanda -Ysabel -Zachariah -Zachary -Zack -Zackary -Zander -Zane -Zayden -Zeke -Zelda -Zion -Zoe -Zoey +Aaden +Aaliyah +Aaron +Abby +Abel +Abigail +Abraham +Adam +Adan +Addison +Addyson +Adeline +Aden +Adolph +Adrian +Adriana +Adrianna +Aida +Aidan +Aiden +Aileen +Ainsley +Alaina +Alan +Alana +Alanna +Alayna +Albert +Alberto +Alden +Alec +Alejandra +Alejandro +Alessandra +Alex +Alexa +Alexander +Alexandra +Alexandria +Alexia +Alexis +Alexus +Alfred +Alfreda +Alfredo +Alger +Ali +Alice +Alicia +Alijah +Alina +Alisa +Alison +Alissa +Alisya +Alivia +Aliyah +Allegra +Allegria +Allen +Allie +Allison +Allisson +Allyson +Alma +Alondra +Alvin +Alysha +Alyson +Alyssa +Alyssia +Amanda +Amari +Amaryllis +Amaya +Amber +Ambrosine +Amelia +Amir +Amira +Amiyah +Amos +Amy +Amya +Ana +Anahi +Anastasia +Anaya +Anderson +Andre +Andrea +Andres +Andrew +Andy +Angel +Angela +Angelica +Angelina +Angelo +Angie +Aniya +Aniyah +Anjelica +Anna +Annabelle +Anne +Annie +Annika +Anthony +Antonio +Anya +April +Arabella +Archie +Ariana +Arianna +Ariel +Arielle +Arleen +Armando +Arn +Art +Arthur +Arturo +Asher +Ashley +Ashlie +Ashlyn +Ashlynn +Ashton +Asia +Astor +Athena +Aubree +Aubrey +Aubrie +Audrey +Audrina +August +Aurora +Austin +Autumn +Ava +Avalon +Averill +Avery +Axel +Ayden +Ayla +Bailey +Baldric +Barbra +Bartholomew +Baylee +Beau +Beckah +Beckett +Becky +Bella +Benjamin +Bennett +Bernice +Bertrand +Bethany +Bethney +Betsy +Bianca +Bidelia +Bill +Blake +Braden +Bradley +Brady +Braeden +Braiden +Brandon +Braxton +Brayan +Brayden +Braydon +Braylon +Breanna +Breanne +Brenda +Brendan +Brenden +Brenna +Brennan +Brett +Brian +Briana +Brianna +Bridget +Brielle +Brittani +Brittany +Brock +Brodie +Brody +Bronte +Brooke +Brooklyn +Brooklynn +Bruce +Bryan +Bryant +Bryce +Brycen +Brynn +Bryson +Burt +Byrne +Byron +Bysshe +Cade +Caden +Cadence +Caiden +Caitlin +Caitlyn +Calanthia +Caleb +Caleigh +Cali +Callie +Calvin +Camden +Cameron +Camila +Camille +Camron +Camryn +Candace +Candice +Candis +Canute +Cara +Carl +Carlos +Carly +Carlyle +Carmen +Carolina +Caroline +Carolyn +Carry +Carson +Carter +Caryl +Casey +Cash +Casimir +Cassandra +Cassian +Cassidy +Catherine +Cayden +Cecilia +Cecily +Celeste +Cesar +Chad +Chance +Chandler +Charles +Charlie +Charlotte +Charlton +Chase +Chelsea +Cherette +Cheri +Cherry +Cheyanne +Cheyenne +Chip +Chloe +Chris +Christa +Christian +Christiana +Christina +Christobel +Christopher +Ciara +Cindy +Claire +Clara +Claribel +Clark +Claudia +Claudius +Clayton +Clement +Cleveland +Cliff +Clinton +Clitus +Clover +Cody +Cohen +Colby +Cole +Colin +Collin +Colten +Colton +Conner +Connor +Cooper +Cora +Corbin +Coreen +Corey +Corrine +Cory +Courtney +Cristian +Cristopher +Cruz +Crystal +Curtis +Cy +Cynthia +Daisy +Dakota +Dallas +Dalton +Dalya +Damian +Damien +Damon +Dana +Dane +Danica +Daniel +Daniela +Daniella +Danielle +Danika +Danna +Danny +Dante +Darcey +Darell +Daria +Darin +Darius +Darren +David +Davion +Davis +Dawson +Dayana +Dayna +Dayton +Dean +Deandre +Deangelo +Debbi +Declan +Dee +Deena +Delaney +Delilah +Della +Delma +Denholm +Denise +Dennis +Denys +Derek +Derrick +Desiree +Desmond +Destiny +Devin +Devon +Diamond +Diana +Diego +Dillon +Dina +Dolores +Dominic +Dominick +Donald +Donella +Donna +Donny +Donovan +Dorian +Dorothy +Dortha +Douglas +Drake +Drew +Driscoll +Dulce +Duncan +Dustin +Dylan +Easter +Easton +Ebba +Eddie +Eden +Edgar +Eduardo +Edward +Edwin +Effie +Elaina +Eleanor +Elena +Eli +Eliana +Elias +Elijah +Eliot +Eliott +Elise +Eliza +Elizabeth +Ella +Elle +Ellie +Elliot +Elliott +Elric +Elspet +Elwood +Emanuel +Emely +Emerson +Emery +Emilee +Emilia +Emiliano +Emilio +Emily +Emma +Emmanuel +Enrique +Eric +Erica +Erick +Erik +Erika +Erin +Ermintrude +Ernesto +Esmeralda +Esteban +Esther +Estrella +Ethan +Eugenia +Euphemia +Eustace +Eva +Evan +Evangeline +Eveleen +Evelina +Evelyn +Everett +Ezekiel +Ezra +Fabian +Faith +Fatima +Fay +Felix +Fernanda +Fernando +Finn +Fiona +Fitz +Flick +Floella +Flora +Flossie +Fortune +Francesca +Francis +Francisco +Frank +Frankie +Franklin +Fulton +Gabriel +Gabriela +Gabriella +Gabrielle +Gael +Gage +Garret +Garrett +Gary +Gavin +Gaye +Gaylord +Genesis +Genette +Genevieve +George +Georgene +Georgia +Geraldine +Gerardo +Gervase +Gianna +Gina +Ginger +Giovanni +Giselle +Gladwyn +Glenna +Gloria +Goddard +Godwin +Goodwin +Gordon +Grace +Gracie +Grady +Graeme +Graham +Grant +Gratian +Grayson +Gregory +Greta +Greyson +Griffin +Griselda +Guadalupe +Guillermo +Gunner +Gustavo +Gwenda +Gwenevere +Hadley +Haidee +Hailee +Hailey +Hal +Haleigh +Haley +Hanna +Hannah +Happy +Harley +Harmony +Harper +Harrison +Hartley +Hayden +Haylee +Hayley +Haylie +Hazel +Heather +Heaven +Hector +Hedley +Heidi +Helen +Henderson +Henry +Hepsie +Hervey +Holden +Holly +Homer +Hope +Horatio +Hortensia +Hudson +Huffie +Hugo +Hunter +Ian +Iantha +Ileen +Imani +Innocent +Irene +Iris +Irvine +Isaac +Isabel +Isabella +Isabelle +Isaiah +Isaias +Isiah +Ismael +Israel +Issac +Itzel +Ivan +Ivy +Izabella +Izaiah +Jacaline +Jace +Jack +Jackson +Jacob +Jacoby +Jacqueline +Jacquetta +Jacqui +Jada +Jade +Jaden +Jadon +Jadyn +Jaelyn +Jaiden +Jaime +Jake +Jakki +Jakob +Jalen +Jamar +Jamari +Jamarion +James +Jameson +Jamie +Jamison +Jane +Janel +Janelle +Janette +Janie +Janina +Janine +Janiya +Janiyah +Jared +Jaslene +Jasmin +Jasmine +Jason +Jasper +Javier +Javon +Jaxon +Jaxson +Jay +Jayce +Jayda +Jayden +Jaydon +Jaye +Jayla +Jaylee +Jaylen +Jayne +Jaynie +Jayson +Jazlyn +Jazmin +Jazmine +Jeanna +Jeannie +Jeannine +Jeb +Jed +Jeffrey +Jemmy +Jenifer +Jenna +Jennie +Jennifer +Jera +Jere +Jeremiah +Jeremy +Jeri +Jermaine +Jerrie +Jerry +Jesse +Jessica +Jesus +Jillian +Jillie +Jim +Jimena +Jimmy +Joachim +Joanna +Joaquin +Jocelyn +Joe +Joel +Joetta +Joey +Johan +Johanna +John +Johnathan +Johnny +Joi +Jonah +Jonas +Jonathan +Jonathon +Joni +Jordan +Jordyn +Jorge +Jose +Joselyn +Joseph +Josepha +Josephine +Josh +Joshua +Josiah +Josie +Josue +Joye +Juan +Judah +Jude +Julia +Julian +Juliana +Julianna +Julie +Juliet +Julio +Julissa +Julius +July +Justice +Justin +Kade +Kaden +Kadence +Kaelea +Kaelyn +Kai +Kaiden +Kailey +Kailyn +Kaitlin +Kaitlyn +Kale +Kaleb +Kaleigh +Kameron +Kamryn +Kane +Kara +Karen +Karenza +Karina +Karla +Karly +Karson +Karyn +Kassidy +Kat +Kate +Katelyn +Katelynn +Katherine +Kathleen +Kathryn +Kathy +Katie +Katlyn +Kayden +Kaydence +Kayla +Kaylee +Kayleigh +Kaylie +Kaylin +Keagan +Keaton +Keegan +Keira +Keith +Kellen +Kellie +Kelly +Kelsey +Kelvin +Kendall +Kendra +Kennard +Kennedy +Kenneth +Kenzie +Kerena +Kerensa +Keturah +Kevin +Keziah +Khalil +Khloe +Kiana +Kiara +Kiera +Kiley +Kimberley +Kimberly +Kimora +Kingston +Kira +Kobe +Kolton +Kristen +Kristina +Kristopher +Kyla +Kyle +Kylee +Kyleigh +Kyler +Kylie +Kyra +Lacey +Lacy +Laila +Lakeisha +Lalla +Lana +Lance +Landen +Landon +Landyn +Lane +Lanny +Larry +Latanya +Launce +Laura +Lauren +Laurencia +Laurissa +Lauryn +Lawrence +Layla +Leah +Leeann +Leia +Leila +Leilani +Leland +Lena +Lennox +Leo +Leonardo +Leonel +Leroi +Leslie +Lesly +Lessie +Leta +Levi +Lexi +Lexia +Lexus +Lia +Liam +Lila +Lilah +Lilian +Liliana +Lillian +Lilliana +Lillie +Lilly +Lily +Lincoln +Linden +Lindsay +Lindsey +Lindsie +Lindy +Linton +Lizbeth +Lockie +Logan +Lola +London +Lorenzo +Loreto +Lori +Lorin +Lou +Louis +Luanne +Luca +Lucas +Lucia +Lucian +Lucy +Luis +Lukas +Luke +Luna +Luvenia +Lydia +Lyla +Lyndsey +Lynn +Lynsey +Lynwood +Lyric +Mabelle +Macey +Macie +Mackenzie +Macy +Madalyn +Maddison +Maddox +Madeleine +Madeline +Madelyn +Madelynn +Madilyn +Madison +Madisyn +Madyson +Maegan +Maggie +Makayla +Makenna +Makenzie +Malachi +Malcolm +Malia +Malik +Mallory +Manley +Manuel +Marc +Marcia +Marco +Marcos +Marcus +Marely +Margaret +Maria +Mariabella +Mariah +Mariana +Marilene +Mario +Marion +Marisol +Marissa +Marje +Marjory +Mark +Marlee +Marley +Marlowe +Marlyn +Marshall +Martin +Marvin +Mary +Maryann +Mason +Mateo +Mathew +Matthew +Maudie +Maurene +Maurice +Mauricio +Max +Maximilian +Maximus +Maxwell +May +Maya +Maynard +Mckenna +Mckenzie +Megan +Meghan +Mekhi +Melanie +Melany +Melissa +Melody +Melvin +Melvyn +Meredith +Merideth +Merrilyn +Meryl +Mia +Micah +Michael +Michaela +Micheal +Michelle +Miguel +Mikayla +Mike +Miles +Miley +Milo +Milton +Minnie +Miracle +Miranda +Miriam +Mitchell +Moises +Molly +Monica +Monna +Montague +Monte +Monty +Morgan +Moses +Muriel +Mya +Mylee +Myles +Myriam +Myrtie +Nadia +Nan +Nancy +Naomi +Nasir +Natalia +Natalie +Nataly +Natasha +Nathan +Nathaniel +Nayeli +Nehemiah +Nelle +Nelson +Nena +Nerissa +Netta +Nettie +Nevaeh +Nia +Nicholas +Nickolas +Nicolas +Nicole +Nikolas +Nina +Noah +Noel +Noelle +Nolan +Nonie +Nora +Norah +Nova +Nowell +Nydia +Nyla +Olive +Oliver +Olivia +Omar +Oralie +Orlando +Osbert +Osborn +Osborne +Oscar +Osmund +Owen +Pablo +Paget +Paige +Paisley +Paola +Paris +Parker +Patience +Patricia +Patrick +Patton +Paul +Pauleen +Paxton +Payton +Pedro +Pene +Penelope +Percival +Peregrine +Perla +Peter +Peyton +Pheobe +Philip +Phillip +Phoebe +Phoenix +Phyliss +Phyllida +Phyllis +Piper +Porsche +Porter +Presley +Preston +Priscilla +Prosper +Prue +Quanah +Quentin +Quiana +Quinn +Quinton +Rachael +Rachel +Raegan +Raelene +Rafael +Rain +Ramon +Randa +Randal +Randy +Rastus +Raul +Raymond +Rayner +Reagan +Rebecca +Rebeckah +Rebekah +Reece +Reed +Reene +Reese +Reid +Renie +Reuben +Rexana +Reynard +Rhetta +Ricardo +Rich +Richard +Richie +Rick +Rickena +Rickey +Rickie +Ricky +Rihanna +Riley +River +Robert +Roberto +Rocco +Rodger +Rodrigo +Roger +Roman +Romayne +Romeo +Ronald +Ronnette +Rosa +Roscoe +Rose +Rosemary +Roswell +Rowan +Roy +Royce +Ruben +Ruby +Rubye +Russell +Rusty +Ruth +Ryan +Ryder +Ryker +Rylan +Rylee +Ryleigh +Rylie +Sabella +Sabrina +Sachie +Sadie +Sage +Sal +Sally +Salvador +Sam +Samantha +Samara +Samuel +Sandra +Santiago +Sara +Sarah +Sarai +Saranna +Sasha +Saul +Savanna +Savannah +Sawyer +Scarlett +Scott +Scotty +Sean +Sebastian +Selena +Seneca +Serena +Serenity +Sergio +Seth +Seymour +Shan +Shana +Shane +Shanika +Shannah +Shannon +Shantae +Sharalyn +Sharla +Shaun +Shawn +Shayla +Shelby +Sheri +Sherie +Sherill +Sherri +Shiloh +Sienna +Sierra +Silas +Simon +Sissy +Skylar +Skyler +Sloan +Sofia +Solomon +Sophia +Sophie +Sorrel +Spencer +Spike +Star +Stella +Steph +Stephanie +Stephany +Stephen +Steven +Sue +Sukie +Summer +Sunshine +Susanna +Susannah +Suzan +Suzy +Sybil +Syd +Sydney +Talia +Talon +Tamika +Tamsin +Tania +Tanner +Tansy +Taryn +Tate +Tatiana +Tatum +Tatyanna +Taylor +Teagan +Tel +Terrell +Terry +Tessa +Theodore +Thomas +Tiffany +Timothy +Titus +Tod +Tolly +Tony +Topaz +Tori +Tracee +Tracey +Travis +Trent +Trenton +Trevor +Trey +Trinity +Tristan +Tristen +Triston +Troy +Tucker +Ty +Tye +Tyler +Tyson +Uland +Ulric +Ulyssa +Uriel +Valary +Valentina +Valeria +Valerie +Vanessa +Vaughn +Verna +Veronica +Victor +Victoria +Vince +Vincent +Vinnie +Violet +Vivian +Viviana +Vivyan +Walker +Walter +Ward +Warner +Wayne +Wendi +Wendy +Wesley +Weston +Whitaker +William +Willow +Willy +Winifred +Wisdom +Woodrow +Woody +Wyatt +Wynonna +Wynter +Xander +Xavier +Ximena +Yahir +Yasmin +Yolanda +Ysabel +Zachariah +Zachary +Zack +Zackary +Zander +Zane +Zayden +Zeke +Zelda +Zion +Zoe +Zoey Zune \ No newline at end of file diff --git a/config/names/first_female.txt b/strings/names/first_female.txt similarity index 87% rename from config/names/first_female.txt rename to strings/names/first_female.txt index 038e936879..6710c1bfc3 100644 --- a/config/names/first_female.txt +++ b/strings/names/first_female.txt @@ -1,771 +1,771 @@ -Aaliyah -Abby -Abigail -Addison -Addyson -Adeline -Adriana -Adrianna -Aida -Aileen -Ainsley -Alaina -Alana -Alanna -Alayna -Alejandra -Alessandra -Alexa -Alexandra -Alexandria -Alexia -Alexis -Alexus -Alfreda -Alice -Alicia -Alina -Alisa -Alison -Alissa -Alisya -Alivia -Aliyah -Allegra -Allegria -Allie -Allison -Allisson -Allyson -Alma -Alondra -Alysha -Alyson -Alyssa -Alyssia -Amanda -Amari -Amaryllis -Amaya -Amber -Ambrosine -Amelia -Amira -Amiyah -Amy -Amya -Ana -Anahi -Anastasia -Anaya -Andrea -Angel -Angela -Angelica -Angelina -Angie -Aniya -Aniyah -Anjelica -Anna -Annabelle -Anne -Annie -Annika -Anya -April -Arabella -Ariana -Arianna -Ariel -Arielle -Arleen -Ashley -Ashlie -Ashlyn -Ashlynn -Asia -Astor -Athena -Aubree -Aubrey -Aubrie -Audrey -Audrina -Aurora -Autumn -Ava -Avalona -Averill -Avery -Ayla -Bailey -Barbara -Baylee -Beckah -Becky -Bella -Bernice -Bethany -Bethney -Betsy -Bianca -Bidelia -Breanna -Breanne -Brenda -Brenna -Briana -Brianna -Bridget -Brielle -Brittani -Brittany -Brooke -Brooklyn -Brooklynn -Brynn -Cadence -Caitlin -Caitlyn -Calanthia -Caleigh -Cali -Callie -Cameron -Camila -Camille -Camryn -Candace -Candice -Cara -Carly -Carlyle -Carmen -Carolina -Caroline -Carolyn -Carry -Caryl -Casey -Cassandra -Cassidy -Catherine -Cecilia -Cecily -Celeste -Charlotte -Chelsea -Cherette -Cheri -Cherry -Cheyanne -Cheyenne -Chloe -Christa -Christiana -Christina -Christobelle -Ciara -Cindy -Claire -Clara -Claribel -Claudia -Clover -Cora -Coreen -Corrine -Courtney -Crystal -Cynthia -Daisy -Dakota -Dalya -Dana -Danica -Daniela -Daniella -Danielle -Danika -Danna -Daria -Dayana -Dayna -Debbi -Dee -Deena -Delaney -Delilah -Della -Delma -Denise -Denys -Desiree -Destiny -Diamond -Diana -Dina -Dolores -Donella -Donna -Dorothy -Dortha -Dulce -Easter -Ebba -Eden -Effie -Elaina -Eleanor -Elena -Eliana -Elise -Eliza -Elizabeth -Ella -Elle -Ellie -Emely -Emerson -Emery -Emilee -Emilia -Emily -Emma -Erica -Erika -Erin -Ermintrude -Esmeralda -Esther -Estrella -Eugenia -Euphemia -Eustace -Eva -Evangeline -Eveleen -Evelina -Evelyn -Faith -Fatima -Fay -Fernanda -Fiona -Floella -Flora -Flossie -Fortune -Francesca -Gabriela -Gabriella -Gabrielle -Genette -Genevieve -Georgene -Georgia -Geraldine -Gervase -Gianna -Gina -Ginger -Giselle -Gladwyn -Glenna -Gloria -Grace -Gracie -Greta -Griselda -Guadalupe -Gwenda -Gwenevere -Hadley -Haidee -Hailee -Hailey -Hal -Haleigh -Haley -Hanna -Hannah -Harley -Harmony -Harper -Hayden -Haylee -Hayley -Haylie -Hazel -Heather -Heaven -Hedley -Heidi -Helen -Hepsie -Holly -Hope -Hortensia -Iantha -Ileen -Imani -Innocent -Irene -Iris -Isabel -Isabella -Isabelle -Itzel -Ivy -Izabella -Jacaline -Jacqueline -Jacquetta -Jacqui -Jada -Jade -Jaden -Jadyn -Jaelyn -Jakki -Jalen -Jamie -Jane -Janelle -Janette -Janie -Janina -Janine -Janiya -Janiyah -Jaslene -Jasmin -Jasmine -Jayda -Jayden -Jayla -Jaylee -Jaynie -Jazlyn -Jazmin -Jazmine -Jeanna -Jeannie -Jeannine -Jenifer -Jenna -Jennie -Jennifer -Jera -Jere -Jeri -Jessica -Jillian -Jillie -Jimena -Joanna -Jocelyn -Joetta -Johanna -Joi -Joni -Jordan -Jordyn -Joselyn -Josepha -Josephine -Josie -Joye -Julia -Juliana -Julianna -Julie -Juliet -Julissa -July -Kadence -Kaelea -Kaelyn -Kailey -Kailyn -Kaitlin -Kaitlyn -Kaleigh -Kamryn -Kara -Karen -Karenza -Karina -Karla -Karly -Karyn -Kassidy -Kat -Kate -Katelyn -Katelynn -Katherine -Kathleen -Kathryn -Kathy -Katie -Katlyn -Kayden -Kaydence -Kayla -Kaylee -Kayleigh -Kaylie -Kaylin -Keegan -Keira -Keith -Kellie -Kelly -Kelsey -Kendall -Kendra -Kennedy -Kenzie -Kerena -Kerensa -Keturah -Khloe -Kiana -Kiara -Kiera -Kiley -Kimberley -Kimberly -Kimora -Kira -Kristen -Kristina -Kyla -Kylee -Kyleigh -Kylie -Kyra -Lacey -Lacy -Laila -Lakeisha -Lalla -Lana -Latanya -Laura -Lauren -Laurencia -Laurissa -Lauryn -Layla -Leah -Leeann -Leia -Leila -Leilani -Lena -Leslie -Lesly -Lessie -Leta -Lexi -Lexia -Lexus -Lia -Lila -Lilah -Lilian -Liliana -Lillian -Lilliana -Lillie -Lilly -Lily -Lindsay -Lindsey -Lindsie -Lindy -Lizbeth -Lockie -Logan -Lola -London -Lori -Lorin -Luanne -Lucia -Lucian -Lucy -Luna -Luvenia -Lydia -Lyla -Lyndsey -Lynn -Lynsey -Lynwood -Lyric -Mabelle -Macey -Macie -Mackenzie -Macy -Madalyn -Maddison -Madeleine -Madeline -Madelyn -Madelynn -Madilyn -Madison -Madisyn -Madyson -Maegan -Maggie -Makayla -Makenna -Makenzie -Malia -Mallory -Marcia -Marely -Margaret -Maria -Mariabella -Mariah -Mariana -Marilene -Marion -Marisol -Marissa -Marje -Marjory -Marlee -Marley -Marlowe -Marlyn -Marshall -Mary -Maryann -Maudie -Maurene -May -Maya -Mckenna -Mckenzie -Megan -Meghan -Melanie -Melany -Melissa -Melody -Meredith -Merideth -Merrilyn -Meryl -Mia -Michaela -Michelle -Mikayla -Miley -Minnie -Miracle -Miranda -Miriam -Molly -Monica -Monna -Morgan -Muriel -Mya -Mylee -Myriam -Myrtie -Nadia -Nan -Nancy -Naomi -Natalia -Natalie -Nataly -Natasha -Nayeli -Nelle -Nena -Nerissa -Netta -Nettie -Nevaeh -Nia -Nicole -Nina -Noelle -Nonie -Nora -Norah -Nova -Nowell -Nydia -Nyla -Olive -Olivia -Oralie -Paige -Paisley -Paola -Paris -Patience -Patricia -Pauleen -Payton -Pene -Penelope -Peregrine -Perla -Peyton -Pheobe -Phoebe -Phyliss -Phyllida -Phyllis -Piper -Porsche -Presley -Priscilla -Prosper -Prue -Quanah -Quiana -Rachael -Rachel -Raegan -Raelene -Rain -Randa -Randal -Reagan -Rebecca -Rebeckah -Rebekah -Reene -Reese -Renie -Rexana -Rhetta -Rihanna -Riley -Ronnette -Rosa -Rose -Rosemary -Rowan -Ruby -Rubye -Ruth -Rylee -Ryleigh -Rylie -Sabella -Sabrina -Sachie -Sadie -Sage -Sally -Samantha -Samara -Sandra -Sara -Sarah -Sarai -Saranna -Sasha -Savanna -Savannah -Scarlett -Selena -Seneca -Serena -Serenity -Shana -Shanika -Shannah -Shannon -Shantae -Sharalyn -Sharla -Shayla -Shelby -Sheri -Sherie -Sherill -Sherri -Sienna -Sierra -Sissy -Skylar -Skyler -Sofia -Sophia -Sophie -Star -Stella -Steph -Stephanie -Stephany -Sue -Sukie -Summer -Sunshine -Susanna -Susannah -Suzan -Suzy -Sydney -Talia -Tamika -Tania -Tansy -Taryn -Tatiana -Tatum -Tatyanna -Taylor -Teagan -Tessa -Tiffany -Tolly -Topaz -Tori -Tracee -Tracey -Trinity -Ulyssa -Valary -Valentina -Valeria -Valerie -Vanessa -Verna -Veronica -Victoria -Vinnie -Violet -Vivian -Viviana -Vivyan -Wendi -Wendy -Willow -Wisdom -Wynonna -Wynter -Ximena -Yasmin -Yolanda -Ysabel -Zelda -Zoe -Zoey +Aaliyah +Abby +Abigail +Addison +Addyson +Adeline +Adriana +Adrianna +Aida +Aileen +Ainsley +Alaina +Alana +Alanna +Alayna +Alejandra +Alessandra +Alexa +Alexandra +Alexandria +Alexia +Alexis +Alexus +Alfreda +Alice +Alicia +Alina +Alisa +Alison +Alissa +Alisya +Alivia +Aliyah +Allegra +Allegria +Allie +Allison +Allisson +Allyson +Alma +Alondra +Alysha +Alyson +Alyssa +Alyssia +Amanda +Amari +Amaryllis +Amaya +Amber +Ambrosine +Amelia +Amira +Amiyah +Amy +Amya +Ana +Anahi +Anastasia +Anaya +Andrea +Angel +Angela +Angelica +Angelina +Angie +Aniya +Aniyah +Anjelica +Anna +Annabelle +Anne +Annie +Annika +Anya +April +Arabella +Ariana +Arianna +Ariel +Arielle +Arleen +Ashley +Ashlie +Ashlyn +Ashlynn +Asia +Astor +Athena +Aubree +Aubrey +Aubrie +Audrey +Audrina +Aurora +Autumn +Ava +Avalona +Averill +Avery +Ayla +Bailey +Barbara +Baylee +Beckah +Becky +Bella +Bernice +Bethany +Bethney +Betsy +Bianca +Bidelia +Breanna +Breanne +Brenda +Brenna +Briana +Brianna +Bridget +Brielle +Brittani +Brittany +Brooke +Brooklyn +Brooklynn +Brynn +Cadence +Caitlin +Caitlyn +Calanthia +Caleigh +Cali +Callie +Cameron +Camila +Camille +Camryn +Candace +Candice +Cara +Carly +Carlyle +Carmen +Carolina +Caroline +Carolyn +Carry +Caryl +Casey +Cassandra +Cassidy +Catherine +Cecilia +Cecily +Celeste +Charlotte +Chelsea +Cherette +Cheri +Cherry +Cheyanne +Cheyenne +Chloe +Christa +Christiana +Christina +Christobelle +Ciara +Cindy +Claire +Clara +Claribel +Claudia +Clover +Cora +Coreen +Corrine +Courtney +Crystal +Cynthia +Daisy +Dakota +Dalya +Dana +Danica +Daniela +Daniella +Danielle +Danika +Danna +Daria +Dayana +Dayna +Debbi +Dee +Deena +Delaney +Delilah +Della +Delma +Denise +Denys +Desiree +Destiny +Diamond +Diana +Dina +Dolores +Donella +Donna +Dorothy +Dortha +Dulce +Easter +Ebba +Eden +Effie +Elaina +Eleanor +Elena +Eliana +Elise +Eliza +Elizabeth +Ella +Elle +Ellie +Emely +Emerson +Emery +Emilee +Emilia +Emily +Emma +Erica +Erika +Erin +Ermintrude +Esmeralda +Esther +Estrella +Eugenia +Euphemia +Eustace +Eva +Evangeline +Eveleen +Evelina +Evelyn +Faith +Fatima +Fay +Fernanda +Fiona +Floella +Flora +Flossie +Fortune +Francesca +Gabriela +Gabriella +Gabrielle +Genette +Genevieve +Georgene +Georgia +Geraldine +Gervase +Gianna +Gina +Ginger +Giselle +Gladwyn +Glenna +Gloria +Grace +Gracie +Greta +Griselda +Guadalupe +Gwenda +Gwenevere +Hadley +Haidee +Hailee +Hailey +Hal +Haleigh +Haley +Hanna +Hannah +Harley +Harmony +Harper +Hayden +Haylee +Hayley +Haylie +Hazel +Heather +Heaven +Hedley +Heidi +Helen +Hepsie +Holly +Hope +Hortensia +Iantha +Ileen +Imani +Innocent +Irene +Iris +Isabel +Isabella +Isabelle +Itzel +Ivy +Izabella +Jacaline +Jacqueline +Jacquetta +Jacqui +Jada +Jade +Jaden +Jadyn +Jaelyn +Jakki +Jalen +Jamie +Jane +Janelle +Janette +Janie +Janina +Janine +Janiya +Janiyah +Jaslene +Jasmin +Jasmine +Jayda +Jayden +Jayla +Jaylee +Jaynie +Jazlyn +Jazmin +Jazmine +Jeanna +Jeannie +Jeannine +Jenifer +Jenna +Jennie +Jennifer +Jera +Jere +Jeri +Jessica +Jillian +Jillie +Jimena +Joanna +Jocelyn +Joetta +Johanna +Joi +Joni +Jordan +Jordyn +Joselyn +Josepha +Josephine +Josie +Joye +Julia +Juliana +Julianna +Julie +Juliet +Julissa +July +Kadence +Kaelea +Kaelyn +Kailey +Kailyn +Kaitlin +Kaitlyn +Kaleigh +Kamryn +Kara +Karen +Karenza +Karina +Karla +Karly +Karyn +Kassidy +Kat +Kate +Katelyn +Katelynn +Katherine +Kathleen +Kathryn +Kathy +Katie +Katlyn +Kayden +Kaydence +Kayla +Kaylee +Kayleigh +Kaylie +Kaylin +Keegan +Keira +Keith +Kellie +Kelly +Kelsey +Kendall +Kendra +Kennedy +Kenzie +Kerena +Kerensa +Keturah +Khloe +Kiana +Kiara +Kiera +Kiley +Kimberley +Kimberly +Kimora +Kira +Kristen +Kristina +Kyla +Kylee +Kyleigh +Kylie +Kyra +Lacey +Lacy +Laila +Lakeisha +Lalla +Lana +Latanya +Laura +Lauren +Laurencia +Laurissa +Lauryn +Layla +Leah +Leeann +Leia +Leila +Leilani +Lena +Leslie +Lesly +Lessie +Leta +Lexi +Lexia +Lexus +Lia +Lila +Lilah +Lilian +Liliana +Lillian +Lilliana +Lillie +Lilly +Lily +Lindsay +Lindsey +Lindsie +Lindy +Lizbeth +Lockie +Logan +Lola +London +Lori +Lorin +Luanne +Lucia +Lucian +Lucy +Luna +Luvenia +Lydia +Lyla +Lyndsey +Lynn +Lynsey +Lynwood +Lyric +Mabelle +Macey +Macie +Mackenzie +Macy +Madalyn +Maddison +Madeleine +Madeline +Madelyn +Madelynn +Madilyn +Madison +Madisyn +Madyson +Maegan +Maggie +Makayla +Makenna +Makenzie +Malia +Mallory +Marcia +Marely +Margaret +Maria +Mariabella +Mariah +Mariana +Marilene +Marion +Marisol +Marissa +Marje +Marjory +Marlee +Marley +Marlowe +Marlyn +Marshall +Mary +Maryann +Maudie +Maurene +May +Maya +Mckenna +Mckenzie +Megan +Meghan +Melanie +Melany +Melissa +Melody +Meredith +Merideth +Merrilyn +Meryl +Mia +Michaela +Michelle +Mikayla +Miley +Minnie +Miracle +Miranda +Miriam +Molly +Monica +Monna +Morgan +Muriel +Mya +Mylee +Myriam +Myrtie +Nadia +Nan +Nancy +Naomi +Natalia +Natalie +Nataly +Natasha +Nayeli +Nelle +Nena +Nerissa +Netta +Nettie +Nevaeh +Nia +Nicole +Nina +Noelle +Nonie +Nora +Norah +Nova +Nowell +Nydia +Nyla +Olive +Olivia +Oralie +Paige +Paisley +Paola +Paris +Patience +Patricia +Pauleen +Payton +Pene +Penelope +Peregrine +Perla +Peyton +Pheobe +Phoebe +Phyliss +Phyllida +Phyllis +Piper +Porsche +Presley +Priscilla +Prosper +Prue +Quanah +Quiana +Rachael +Rachel +Raegan +Raelene +Rain +Randa +Randal +Reagan +Rebecca +Rebeckah +Rebekah +Reene +Reese +Renie +Rexana +Rhetta +Rihanna +Riley +Ronnette +Rosa +Rose +Rosemary +Rowan +Ruby +Rubye +Ruth +Rylee +Ryleigh +Rylie +Sabella +Sabrina +Sachie +Sadie +Sage +Sally +Samantha +Samara +Sandra +Sara +Sarah +Sarai +Saranna +Sasha +Savanna +Savannah +Scarlett +Selena +Seneca +Serena +Serenity +Shana +Shanika +Shannah +Shannon +Shantae +Sharalyn +Sharla +Shayla +Shelby +Sheri +Sherie +Sherill +Sherri +Sienna +Sierra +Sissy +Skylar +Skyler +Sofia +Sophia +Sophie +Star +Stella +Steph +Stephanie +Stephany +Sue +Sukie +Summer +Sunshine +Susanna +Susannah +Suzan +Suzy +Sydney +Talia +Tamika +Tania +Tansy +Taryn +Tatiana +Tatum +Tatyanna +Taylor +Teagan +Tessa +Tiffany +Tolly +Topaz +Tori +Tracee +Tracey +Trinity +Ulyssa +Valary +Valentina +Valeria +Valerie +Vanessa +Verna +Veronica +Victoria +Vinnie +Violet +Vivian +Viviana +Vivyan +Wendi +Wendy +Willow +Wisdom +Wynonna +Wynter +Ximena +Yasmin +Yolanda +Ysabel +Zelda +Zoe +Zoey Zune \ No newline at end of file diff --git a/config/names/first_male.txt b/strings/names/first_male.txt similarity index 86% rename from config/names/first_male.txt rename to strings/names/first_male.txt index 928958d1a9..b86722dbaf 100644 --- a/config/names/first_male.txt +++ b/strings/names/first_male.txt @@ -1,668 +1,668 @@ -Aaden -Aaron -Abel -Abraham -Adam -Adan -Aden -Adolph -Adrian -Aidan -Aiden -Alan -Albert -Alberto -Alden -Alec -Alejandro -Alex -Alexander -Alexis -Alfred -Alfredo -Alger -Ali -Alijah -Allen -Alvin -Amari -Amir -Amos -Anderson -Andre -Andres -Andrew -Andy -Angel -Angelo -Anthony -Antonio -Apple -Archie -Armando -Arnie -Art -Arthur -Arturo -Asher -Ashton -August -Austin -Avery -Axel -Ayden -Baldric -Bartholomew -Beau -Beckett -Benjamin -Bennett -Bill -Blake -Braden -Bradley -Brady -Braeden -Braiden -Brandon -Braxton -Brayan -Brayden -Braydon -Braylon -Brendan -Brenden -Brennan -Brett -Brian -Brick -Brock -Brodie -Brody -Bronte -Bruce -Bryan -Bryant -Bryce -Brycen -Bryson -Buck -Burt -Butch -Byrne -Byron -Cade -Caden -Caiden -Caleb -Calvin -Camden -Cameron -Camron -Camryn -Carl -Carlos -Carson -Carter -Casey -Cash -Casimir -Cassian -Cayden -Cesar -Chad -Chance -Chandler -Charles -Charlie -Charlton -Chase -Chip -Chris -Christian -Christopher -Clark -Claudius -Clayton -Clement -Cletus -Cleveland -Cliff -Clinton -Cody -Cohen -Colby -Cole -Colin -Collin -Colten -Colton -Conner -Connor -Cooper -Corbin -Corey -Cory -Cristian -Cristopher -Crush -Cruz -Curtis -Cy -Dakota -Dallas -Dalton -Damian -Damien -Damon -Dane -Daniel -Danny -Dante -Darcey -Darell -Darin -Darius -Darren -David -Davion -Davis -Dawson -Dayton -Dean -Deandre -Deangelo -Declan -Denholm -Dennis -Derek -Derrick -Desmond -Devin -Devon -Diego -Dillon -Dirk -Dominic -Dominick -Donald -Donny -Donovan -Douglas -Drake -Drew -Driscoll -Duke -Duncan -Dustin -Dylan -Easton -Eddie -Edgar -Eduardo -Edward -Edwin -Eli -Elias -Elijah -Eliot -Eliott -Elliot -Elliott -Elric -Elwood -Emanuel -Emerson -Emiliano -Emilio -Emmanuel -Enrique -Eric -Erick -Erik -Ernesto -Esteban -Ethan -Evan -Everett -Ezekiel -Ezra -Fabian -Felix -Fenton -Fernando -Finn -Fitz -Flick -Flint -Flip -Francis -Francisco -Frank -Frankie -Franklin -Fridge -Fulton -Gabriel -Gael -Gage -Gannon -Garret -Garrett -Gary -Gavin -George -Gerardo -Giovanni -Goddard -Godwin -Goodwin -Gordon -Grady -Graeme -Graham -Grandpa -Grant -Gratian -Grayson -Gregory -Grendel -Greyson -Griffin -Guillermo -Gunner -Gustavo -Han -Harrison -Harry -Hartley -Harvey -Hayden -Hector -Henderson -Henry -Holden -Homer -Horatio -Hudson -Huffie -Hugo -Hungry -Hunter -Ian -Irvine -Isaac -Isaiah -Isaias -Isiah -Ismael -Israel -Issac -Ivan -Izaiah -Jace -Jack -Jackson -Jacob -Jacoby -Jaden -Jadon -Jaiden -Jaime -Jake -Jakob -Jalen -Jamar -Jamari -Jamarion -James -Jameson -Jamie -Jamison -Janel -Jared -Jason -Jasper -Javier -Javon -Jaxon -Jaxson -Jay -Jayce -Jayden -Jaydon -Jaye -Jaylen -Jayne -Jayson -Jean-Luc -Jeb -Jed -Jeffrey -Jemmy -Jeremiah -Jeremy -Jermaine -Jerrie -Jerry -Jesse -Jesus -Jim -Jimmy -Joachim -Joaquin -Joe -Joel -Joey -Johan -John -Johnathan -Johnny -Jonah -Jonas -Jonathan -Jonathon -Jordan -Jorge -Jose -Joseph -Josh -Joshua -Josiah -Josue -Juan -Judah -Jude -Julian -Julio -Julius -Justice -Justin -Kade -Kaden -Kai -Kaiden -Kale -Kaleb -Kameron -Kane -Karson -Kayden -Keagan -Keaton -Keegan -Keith -Kellen -Kelvin -Kennard -Kenneth -Kevin -Keziah -Khalil -Kingston -Kobe -Kolton -Kristopher -Kyle -Kyler -Lance -Landen -Lando -Landon -Landyn -Lane -Lanny -Larry -Launce -Lawrence -Leland -Lennox -Lenny -Leo -Leonard -Leonardo -Leonel -Leroy -Levi -Liam -Lief -Lincoln -Linden -Linton -Logan -Lorde -Lorenzo -Loreto -Lou -Louis -Luca -Lucas -Luis -Lukas -Luke -Maddox -Malachi -Malcolm -Malik -Manley -Manuel -Marc -Marco -Marcos -Marcus -Mario -Marion -Mark -Marshall -Martin -Marvin -Mason -Mateo -Mathew -Matthew -Maurice -Mauricio -Max -Maximilian -Maximus -Maxwell -Maynard -Mekhi -Melvin -Melvyn -Micah -Michael -Micheal -Miguel -Mike -Miles -Milo -Milton -Mitchell -Moises -Montague -Monte -Monty -Morgan -Moses -Myles -Nasir -Nat -Nathan -Nathaniel -Nehemiah -Nelson -Nicholas -Nick -Nickolas -Nicolas -Nikolas -Noah -Noel -Nolan -Oliver -Omar -Opie -Orlando -Osbert -Osborn -Osborne -Oscar -Osmund -Oswald -Owen -Pablo -Paget -Parker -Patrick -Patton -Paul -Paxton -Payton -Pedro -Percival -Persh -Peter -Peyton -Philip -Phillip -Phoenix -Porter -Preston -Quentin -Quinn -Quinton -Rafael -Ramon -Randy -Rastus -Raul -Raymond -Rayner -Reece -Reed -Reese -Reid -Reuben -Reynard -Ricardo -Richard -Ricky -Riley -River -Robert -Roberto -Rocco -Rodger -Rodrigo -Roger -Roman -Romayne -Romeo -Ronald -Roscoe -Roswell -Rowan -Roy -Royce -Rube -Ruben -Russell -Rusty -Ryan -Ryder -Ryker -Rylan -Sal -Salvador -Sam -Samuel -Santiago -Saul -Sawyer -Scott -Scotty -Sean -Sebastian -Sergio -Seth -Seymour -Shane -Shaun -Shawn -Shiloh -Silas -Simon -Skyler -Sloan -Smoke -Solomon -Sorrel -Spencer -Spike -Stephen -Steven -Sybil -Syd -Talon -Tamsin -Tanner -Tate -Taylor -Tel -Terrell -Terry -Theodore -Thomas -Tim -Timothy -Titus -Todd -Tony -Travis -Trent -Trenton -Trevor -Trey -Trip -Tristan -Tristen -Triston -Troy -Tucker -Ty -Tye -Tyler -Tyson -Uland -Ulric -Uriel -Vaughn -Victor -Vince -Vincent -Vinny -Walker -Walter -Ward -Warner -Wayne -Wesley -Weston -Whitaker -William -Willy -Woodrow -Wyatt -Xander -Xavier -Yahir -Zachariah -Zachary -Zack -Zackary -Zander -Zane -Zayden -Zeke +Aaden +Aaron +Abel +Abraham +Adam +Adan +Aden +Adolph +Adrian +Aidan +Aiden +Alan +Albert +Alberto +Alden +Alec +Alejandro +Alex +Alexander +Alexis +Alfred +Alfredo +Alger +Ali +Alijah +Allen +Alvin +Amari +Amir +Amos +Anderson +Andre +Andres +Andrew +Andy +Angel +Angelo +Anthony +Antonio +Apple +Archie +Armando +Arnie +Art +Arthur +Arturo +Asher +Ashton +August +Austin +Avery +Axel +Ayden +Baldric +Bartholomew +Beau +Beckett +Benjamin +Bennett +Bill +Blake +Braden +Bradley +Brady +Braeden +Braiden +Brandon +Braxton +Brayan +Brayden +Braydon +Braylon +Brendan +Brenden +Brennan +Brett +Brian +Brick +Brock +Brodie +Brody +Bronte +Bruce +Bryan +Bryant +Bryce +Brycen +Bryson +Buck +Burt +Butch +Byrne +Byron +Cade +Caden +Caiden +Caleb +Calvin +Camden +Cameron +Camron +Camryn +Carl +Carlos +Carson +Carter +Casey +Cash +Casimir +Cassian +Cayden +Cesar +Chad +Chance +Chandler +Charles +Charlie +Charlton +Chase +Chip +Chris +Christian +Christopher +Clark +Claudius +Clayton +Clement +Cletus +Cleveland +Cliff +Clinton +Cody +Cohen +Colby +Cole +Colin +Collin +Colten +Colton +Conner +Connor +Cooper +Corbin +Corey +Cory +Cristian +Cristopher +Crush +Cruz +Curtis +Cy +Dakota +Dallas +Dalton +Damian +Damien +Damon +Dane +Daniel +Danny +Dante +Darcey +Darell +Darin +Darius +Darren +David +Davion +Davis +Dawson +Dayton +Dean +Deandre +Deangelo +Declan +Denholm +Dennis +Derek +Derrick +Desmond +Devin +Devon +Diego +Dillon +Dirk +Dominic +Dominick +Donald +Donny +Donovan +Douglas +Drake +Drew +Driscoll +Duke +Duncan +Dustin +Dylan +Easton +Eddie +Edgar +Eduardo +Edward +Edwin +Eli +Elias +Elijah +Eliot +Eliott +Elliot +Elliott +Elric +Elwood +Emanuel +Emerson +Emiliano +Emilio +Emmanuel +Enrique +Eric +Erick +Erik +Ernesto +Esteban +Ethan +Evan +Everett +Ezekiel +Ezra +Fabian +Felix +Fenton +Fernando +Finn +Fitz +Flick +Flint +Flip +Francis +Francisco +Frank +Frankie +Franklin +Fridge +Fulton +Gabriel +Gael +Gage +Gannon +Garret +Garrett +Gary +Gavin +George +Gerardo +Giovanni +Goddard +Godwin +Goodwin +Gordon +Grady +Graeme +Graham +Grandpa +Grant +Gratian +Grayson +Gregory +Grendel +Greyson +Griffin +Guillermo +Gunner +Gustavo +Han +Harrison +Harry +Hartley +Harvey +Hayden +Hector +Henderson +Henry +Holden +Homer +Horatio +Hudson +Huffie +Hugo +Hungry +Hunter +Ian +Irvine +Isaac +Isaiah +Isaias +Isiah +Ismael +Israel +Issac +Ivan +Izaiah +Jace +Jack +Jackson +Jacob +Jacoby +Jaden +Jadon +Jaiden +Jaime +Jake +Jakob +Jalen +Jamar +Jamari +Jamarion +James +Jameson +Jamie +Jamison +Janel +Jared +Jason +Jasper +Javier +Javon +Jaxon +Jaxson +Jay +Jayce +Jayden +Jaydon +Jaye +Jaylen +Jayne +Jayson +Jean-Luc +Jeb +Jed +Jeffrey +Jemmy +Jeremiah +Jeremy +Jermaine +Jerrie +Jerry +Jesse +Jesus +Jim +Jimmy +Joachim +Joaquin +Joe +Joel +Joey +Johan +John +Johnathan +Johnny +Jonah +Jonas +Jonathan +Jonathon +Jordan +Jorge +Jose +Joseph +Josh +Joshua +Josiah +Josue +Juan +Judah +Jude +Julian +Julio +Julius +Justice +Justin +Kade +Kaden +Kai +Kaiden +Kale +Kaleb +Kameron +Kane +Karson +Kayden +Keagan +Keaton +Keegan +Keith +Kellen +Kelvin +Kennard +Kenneth +Kevin +Keziah +Khalil +Kingston +Kobe +Kolton +Kristopher +Kyle +Kyler +Lance +Landen +Lando +Landon +Landyn +Lane +Lanny +Larry +Launce +Lawrence +Leland +Lennox +Lenny +Leo +Leonard +Leonardo +Leonel +Leroy +Levi +Liam +Lief +Lincoln +Linden +Linton +Logan +Lorde +Lorenzo +Loreto +Lou +Louis +Luca +Lucas +Luis +Lukas +Luke +Maddox +Malachi +Malcolm +Malik +Manley +Manuel +Marc +Marco +Marcos +Marcus +Mario +Marion +Mark +Marshall +Martin +Marvin +Mason +Mateo +Mathew +Matthew +Maurice +Mauricio +Max +Maximilian +Maximus +Maxwell +Maynard +Mekhi +Melvin +Melvyn +Micah +Michael +Micheal +Miguel +Mike +Miles +Milo +Milton +Mitchell +Moises +Montague +Monte +Monty +Morgan +Moses +Myles +Nasir +Nat +Nathan +Nathaniel +Nehemiah +Nelson +Nicholas +Nick +Nickolas +Nicolas +Nikolas +Noah +Noel +Nolan +Oliver +Omar +Opie +Orlando +Osbert +Osborn +Osborne +Oscar +Osmund +Oswald +Owen +Pablo +Paget +Parker +Patrick +Patton +Paul +Paxton +Payton +Pedro +Percival +Persh +Peter +Peyton +Philip +Phillip +Phoenix +Porter +Preston +Quentin +Quinn +Quinton +Rafael +Ramon +Randy +Rastus +Raul +Raymond +Rayner +Reece +Reed +Reese +Reid +Reuben +Reynard +Ricardo +Richard +Ricky +Riley +River +Robert +Roberto +Rocco +Rodger +Rodrigo +Roger +Roman +Romayne +Romeo +Ronald +Roscoe +Roswell +Rowan +Roy +Royce +Rube +Ruben +Russell +Rusty +Ryan +Ryder +Ryker +Rylan +Sal +Salvador +Sam +Samuel +Santiago +Saul +Sawyer +Scott +Scotty +Sean +Sebastian +Sergio +Seth +Seymour +Shane +Shaun +Shawn +Shiloh +Silas +Simon +Skyler +Sloan +Smoke +Solomon +Sorrel +Spencer +Spike +Stephen +Steven +Sybil +Syd +Talon +Tamsin +Tanner +Tate +Taylor +Tel +Terrell +Terry +Theodore +Thomas +Tim +Timothy +Titus +Todd +Tony +Travis +Trent +Trenton +Trevor +Trey +Trip +Tristan +Tristen +Triston +Troy +Tucker +Ty +Tye +Tyler +Tyson +Uland +Ulric +Uriel +Vaughn +Victor +Vince +Vincent +Vinny +Walker +Walter +Ward +Warner +Wayne +Wesley +Weston +Whitaker +William +Willy +Woodrow +Wyatt +Xander +Xavier +Yahir +Zachariah +Zachary +Zack +Zackary +Zander +Zane +Zayden +Zeke Zion \ No newline at end of file diff --git a/config/names/golem.txt b/strings/names/golem.txt similarity index 89% rename from config/names/golem.txt rename to strings/names/golem.txt index 7cfcefa899..a26da78b04 100644 --- a/config/names/golem.txt +++ b/strings/names/golem.txt @@ -1,157 +1,157 @@ -Ablation -Alabaster -Alunite -Andesite -Anyhdrite -Basalt -Basin -Bauxite -Bedrock -Bismuth -Bismuthinite -Bituminous Coal -Borax -Boulder -Brimstone -Brittle -Calcite -Cassiterite -Cenozoic -Chalk -Chasm -Cheridite -Chert -Chromite -Cinnabar -Claystone -Coast -Cobaltite -Column -Conglomerate -Core -Crevasse -Crust -Cryolite -Crystal -Dacite -Diorite -Dolomite -Dolostone -Dragonforce -Earthflow -Epoch -Eutrophication -Fault -Flint -Foliation -Foreshock -Fossil -Gabbro -Galena -Garnierite -Geode -Geoge -Gneiss -Granite -Graphite -Gravel -Groove -Grotto -Gypsum -Hematite -Hornblende -Humus -Igneous -Ilmenite -Iron -Island -Jasper -Jet -Kaolinite -Kettle -Kimberlite -Komatiite -Landslide -Levee -Lignite -Limestone -Limonite -Luster -Madidite -Magnetite -Magnitude -Malachite -Mantle -Marble -Marcasite -Melange -Meme -Mica -Microcline -Migmatite -Mineral -Mountain -Mudstone -Obsidian -Olivine -Ore -Orpiment -Orthoclase -Outwash -Oxbow Lake -Oynx -Pahoehoe -Pebble -Pegmatite -Periclase -Petrified Wood -Phyllite -Pitchblende -Plate -Pothole -Puddingstone -Pyrite -Pyrolusite -Quake -Quarry -Quartz -Quartzite -Realgar -Reservoir -Rhyolite -Rock -Rock Salt -Rockfall -Rutile -Saltpeter -Sand -Sandstone -Satinspar -Schist -Sediment -Seismic -Selenite -Serpentine -Shale -Shore -Siltstone -Slag -Slate -Sphalerite -Stack -Stalactite -Stalagmite -Stibnite -Stone -Stress -Subduction -Sylvite -Talc -Tetrahedrite -Tidal -Trench -Valley -Volcano -Xenolith -Yardang -Zone +Ablation +Alabaster +Alunite +Andesite +Anyhdrite +Basalt +Basin +Bauxite +Bedrock +Bismuth +Bismuthinite +Bituminous Coal +Borax +Boulder +Brimstone +Brittle +Calcite +Cassiterite +Cenozoic +Chalk +Chasm +Cheridite +Chert +Chromite +Cinnabar +Claystone +Coast +Cobaltite +Column +Conglomerate +Core +Crevasse +Crust +Cryolite +Crystal +Dacite +Diorite +Dolomite +Dolostone +Dragonforce +Earthflow +Epoch +Eutrophication +Fault +Flint +Foliation +Foreshock +Fossil +Gabbro +Galena +Garnierite +Geode +Geoge +Gneiss +Granite +Graphite +Gravel +Groove +Grotto +Gypsum +Hematite +Hornblende +Humus +Igneous +Ilmenite +Iron +Island +Jasper +Jet +Kaolinite +Kettle +Kimberlite +Komatiite +Landslide +Levee +Lignite +Limestone +Limonite +Luster +Madidite +Magnetite +Magnitude +Malachite +Mantle +Marble +Marcasite +Melange +Meme +Mica +Microcline +Migmatite +Mineral +Mountain +Mudstone +Obsidian +Olivine +Ore +Orpiment +Orthoclase +Outwash +Oxbow Lake +Oynx +Pahoehoe +Pebble +Pegmatite +Periclase +Petrified Wood +Phyllite +Pitchblende +Plate +Pothole +Puddingstone +Pyrite +Pyrolusite +Quake +Quarry +Quartz +Quartzite +Realgar +Reservoir +Rhyolite +Rock +Rock Salt +Rockfall +Rutile +Saltpeter +Sand +Sandstone +Satinspar +Schist +Sediment +Seismic +Selenite +Serpentine +Shale +Shore +Siltstone +Slag +Slate +Sphalerite +Stack +Stalactite +Stalagmite +Stibnite +Stone +Stress +Subduction +Sylvite +Talc +Tetrahedrite +Tidal +Trench +Valley +Volcano +Xenolith +Yardang +Zone diff --git a/config/names/last.txt b/strings/names/last.txt similarity index 88% rename from config/names/last.txt rename to strings/names/last.txt index 6796c7519e..b9769055e3 100644 --- a/config/names/last.txt +++ b/strings/names/last.txt @@ -1,570 +1,570 @@ -Ackerley -Adams -Addison -Agg -Aggley -Ahmed -Albright -Alekseev -Ali -Alice -Allen -Alliman -Altmann -Anderson -Andreev -Ann -Archibald -Armstrong -Ashbaugh -Atkinson -Atweeke -Aultman -Auman -Baer -Bailey -Baker -Barnes -Barrett -Bash -Bashline -Basinger -Baskett -Basmanoff -Batten -Baum -Baxter -Beach -Beail -Beck -Beedell -Begum -Bell -Benford -Bennett -Berkheimer -Best -Bickerson -Bicknell -Biery -Black -Blackburn -Blaine -Blessig -Bloise -Bluetenberger -Blyant -Bode -Bould -Bousum -Bowchiew -Boyer -Brandenburg -Bratton -Braun -Briggs -Brindle -Briner -Brinigh -Brooks -Brown -Bullard -Bunten -Burkett -Burns -Burris -Butterfill -Buttersworth -Buzzard -Byers -Bynum -Caldwell -Callison -Camp -Campbell -Carmichael -Carr -Carter -Catherina -Catleay -Cavalet -Chapman -Chauvin -Cherry -Christman -Christopher -Clark -Clarke -Clewett -Coates -Coldsmith -Collins -Compton -Conrad -Cook -Cooper -Costello -Cowart -Cowper -Cox -Cressman -Curry -Cypret -David -Davies -Davis -Dawkins -Day -Dean -Demuth -Dennis -Dickinson -Digson -Dimeling -Donkin -Draudy -Driggers -Dryfus -Dugmore -Duncan -Durstine -Earl -Easter -Echard -Eckhardstein -Edwards -Eggbert -Ehret -Elderson -Eliza -Elliott -Ellis -Enderly -Endsley -Evans -Ewing -Faqua -Faust -Fea -Feufer -Fiddler -Field -Fields -Finlay -Fischer -Fiscina -Fisher -Fitzgerald -Fleming -Flickinger -Focell -Foster -Franks -Fraser -Fryer -Fuchs -Fulton -Gadow -Gardner -Garland -Garneys -Garratt -Garrison -Gettemy -Gibson -Glover -Goebbles -Goodman -Graham -Gray -Green -Greenawalt -Greene -Greenwood -Gregory -Griffiths -Gronko -Guess -Hall -Hanford -Hardie -Harding -Hardy -Harris -Harrison -Harrold -Harrow -Harshman -Hastings -Hawker -Hawking -Hawkins -Hayhurst -Haynes -Heckendora -Hegarty -Henry -Hice -Highlands -Hill -Hincken -Hirleman -Hoenshell -Holdeman -Holmes -Hook -Hooker -Hoopengarner -Hoover -Houser -Houston -Howard -Howe -Huey -Hughes -Hujsak -Hunt -Hunter -Hussain -Hutton -Hynes -Ironmonger -Isaman -Isemann -Ivanov -Jackson -James -Jardine -Jenkins -Jenner -Jerome -Jesse -Jewell -Joghs -Johnson -Jones -Jowers -Joyce -Judge -Jyllian -Kadel -Kanaga -Kaur -Keener -Kelley -Kellogg -Kelly -Kemble -Kemerer -Keppel -Kepplinger -Khan -Kiefer -Kifer -Kimple -King -Kirkson -Knapenberger -Knapp -Koepple -Koster -Kuster -Kuznetsov -Laborde -Lacon -Lafortune -Langston -Larson -Lauffer -Laurenzi -Leach -Lee -Leech -Leichter -Leslie -Lester -Levett -Lewis -Lineman -Linton -Llora -Lloyd -Logue -Lombardi -Lord -Losey -Lowe -Lowstetter -Lucy -Ludwig -Maclagan -Magor -Marcotte -Margaret -Marriman -Marshall -Martins -Mary -Mason -Mathews -Matthews -Mcclymonds -Mccullough -Mccune -McDonald -McDonohugh -Mcfall -Mcintosh -Mckendrick -Mcloskey -Mcmullen -McShain -Mens -Merryman -Metzer -Meyers -Mikhaylov -Mildred -Miller -Millhouse -Mills -Milne -Mingle -Minnie -Mitchell -Moberly -Moon -Moore -Morgan -Morris -Mortland -Mosser -Mueller -Muggins -Mull -Muller -Murphy -Murray -Nash -Neely -Nehling -Newbern -Newton -Nicholas -Nickolson -Northey -Noton -Olphert -Oneal -Oppenheimer -Osteen -Osterweis -Osterwise -Otis -Overstreet -Owen -Owens -Palmer -Parker -Parkinson -Patel -Patterson -Paulson -Pavlov -Paynter -Pearsall -Pennington -Perkins -Pershing -Peters -Petrov -Pfeifer -Philips -Phillips -Picard -Pinney -Poehl -Poley -Polson -Potter -Powell -Power -Powers -Pratt -Prechtl -Prescott -Prevatt -Price -Priebe -Pritchard -Pycroft -Quinn -Quirin -Rader -Rahl -Ramos -Randolph -Ratcliff -Rathen -Rathens -Raub -Ray -Reade -Reichard -Reid -Reighner -Rhinehart -Richards -Richardson -Richter -Rifler -Riggle -Riker -Ringer -Roadman -Roberts -Robertson -Robinson -Roby -Rockwell -Rogers -Rohtin -Rose -Rosensteel -Rowley -Russell -Ryals -Sagan -Sanders -Sandford -Sandys -Sauter -Saylor -Schaeffer -Scherer -Schmidt -Schofield -Schrader -Scott -Sealis -Seelig -Seidner -Semenov -Shafer -Shaffer -Shaner -Shaw -Sheets -Shick -Shirey -Sholl -Shupe -Sidower -Siegrist -Simmons -Simpson -Singh -Skywalker -Sloan -Smail -Smirnov -Smith -Snyder -Sommer -Spock -Stafford -Stahl -Stainforth -Stall -Stamos -Stange -Staymates -Steele -Stephenson -Stern -Stewart -Stocker -Stone -Stough -Straub -Stroble -Stroh -Styles -Sullivan -Sulyard -Summy -Sutton -Swabey -Swarner -Sybilla -Taggart -Tanner -Taylor -Teagarden -Tedrow -Tennant -Thomas -Thomlinson -Thompson -Thomson -Thorley -Tilton -Tireman -Todd -Treeby -Trovato -Turner -Ulery -Ullman -Unk -Vader -Vanleer -Vasilyev -Waldron -Walker -Wallick -Ward -Wardle -Warren -Watson -Webb -Weeter -Weinstein -Weisgarber -Wells -Welty -Wentzel -Werner -Werry -Wheeler -Whirlow -White -Whiteman -Whittier -Wible -Wile -Wilkerson -Wilkinson -Willey -Williams -Williamson -Wilo -Wilson -Winton -Wise -Wolfe -Wolff -Wood -Woodward -Woodworth -Woolery -Woollard -Wright -Yeskey -Young -Zadovsky -Zalack -Zaun -Zeal -Zimmer +Ackerley +Adams +Addison +Agg +Aggley +Ahmed +Albright +Alekseev +Ali +Alice +Allen +Alliman +Altmann +Anderson +Andreev +Ann +Archibald +Armstrong +Ashbaugh +Atkinson +Atweeke +Aultman +Auman +Baer +Bailey +Baker +Barnes +Barrett +Bash +Bashline +Basinger +Baskett +Basmanoff +Batten +Baum +Baxter +Beach +Beail +Beck +Beedell +Begum +Bell +Benford +Bennett +Berkheimer +Best +Bickerson +Bicknell +Biery +Black +Blackburn +Blaine +Blessig +Bloise +Bluetenberger +Blyant +Bode +Bould +Bousum +Bowchiew +Boyer +Brandenburg +Bratton +Braun +Briggs +Brindle +Briner +Brinigh +Brooks +Brown +Bullard +Bunten +Burkett +Burns +Burris +Butterfill +Buttersworth +Buzzard +Byers +Bynum +Caldwell +Callison +Camp +Campbell +Carmichael +Carr +Carter +Catherina +Catleay +Cavalet +Chapman +Chauvin +Cherry +Christman +Christopher +Clark +Clarke +Clewett +Coates +Coldsmith +Collins +Compton +Conrad +Cook +Cooper +Costello +Cowart +Cowper +Cox +Cressman +Curry +Cypret +David +Davies +Davis +Dawkins +Day +Dean +Demuth +Dennis +Dickinson +Digson +Dimeling +Donkin +Draudy +Driggers +Dryfus +Dugmore +Duncan +Durstine +Earl +Easter +Echard +Eckhardstein +Edwards +Eggbert +Ehret +Elderson +Eliza +Elliott +Ellis +Enderly +Endsley +Evans +Ewing +Faqua +Faust +Fea +Feufer +Fiddler +Field +Fields +Finlay +Fischer +Fiscina +Fisher +Fitzgerald +Fleming +Flickinger +Focell +Foster +Franks +Fraser +Fryer +Fuchs +Fulton +Gadow +Gardner +Garland +Garneys +Garratt +Garrison +Gettemy +Gibson +Glover +Goebbles +Goodman +Graham +Gray +Green +Greenawalt +Greene +Greenwood +Gregory +Griffiths +Gronko +Guess +Hall +Hanford +Hardie +Harding +Hardy +Harris +Harrison +Harrold +Harrow +Harshman +Hastings +Hawker +Hawking +Hawkins +Hayhurst +Haynes +Heckendora +Hegarty +Henry +Hice +Highlands +Hill +Hincken +Hirleman +Hoenshell +Holdeman +Holmes +Hook +Hooker +Hoopengarner +Hoover +Houser +Houston +Howard +Howe +Huey +Hughes +Hujsak +Hunt +Hunter +Hussain +Hutton +Hynes +Ironmonger +Isaman +Isemann +Ivanov +Jackson +James +Jardine +Jenkins +Jenner +Jerome +Jesse +Jewell +Joghs +Johnson +Jones +Jowers +Joyce +Judge +Jyllian +Kadel +Kanaga +Kaur +Keener +Kelley +Kellogg +Kelly +Kemble +Kemerer +Keppel +Kepplinger +Khan +Kiefer +Kifer +Kimple +King +Kirkson +Knapenberger +Knapp +Koepple +Koster +Kuster +Kuznetsov +Laborde +Lacon +Lafortune +Langston +Larson +Lauffer +Laurenzi +Leach +Lee +Leech +Leichter +Leslie +Lester +Levett +Lewis +Lineman +Linton +Llora +Lloyd +Logue +Lombardi +Lord +Losey +Lowe +Lowstetter +Lucy +Ludwig +Maclagan +Magor +Marcotte +Margaret +Marriman +Marshall +Martins +Mary +Mason +Mathews +Matthews +Mcclymonds +Mccullough +Mccune +McDonald +McDonohugh +Mcfall +Mcintosh +Mckendrick +Mcloskey +Mcmullen +McShain +Mens +Merryman +Metzer +Meyers +Mikhaylov +Mildred +Miller +Millhouse +Mills +Milne +Mingle +Minnie +Mitchell +Moberly +Moon +Moore +Morgan +Morris +Mortland +Mosser +Mueller +Muggins +Mull +Muller +Murphy +Murray +Nash +Neely +Nehling +Newbern +Newton +Nicholas +Nickolson +Northey +Noton +Olphert +Oneal +Oppenheimer +Osteen +Osterweis +Osterwise +Otis +Overstreet +Owen +Owens +Palmer +Parker +Parkinson +Patel +Patterson +Paulson +Pavlov +Paynter +Pearsall +Pennington +Perkins +Pershing +Peters +Petrov +Pfeifer +Philips +Phillips +Picard +Pinney +Poehl +Poley +Polson +Potter +Powell +Power +Powers +Pratt +Prechtl +Prescott +Prevatt +Price +Priebe +Pritchard +Pycroft +Quinn +Quirin +Rader +Rahl +Ramos +Randolph +Ratcliff +Rathen +Rathens +Raub +Ray +Reade +Reichard +Reid +Reighner +Rhinehart +Richards +Richardson +Richter +Rifler +Riggle +Riker +Ringer +Roadman +Roberts +Robertson +Robinson +Roby +Rockwell +Rogers +Rohtin +Rose +Rosensteel +Rowley +Russell +Ryals +Sagan +Sanders +Sandford +Sandys +Sauter +Saylor +Schaeffer +Scherer +Schmidt +Schofield +Schrader +Scott +Sealis +Seelig +Seidner +Semenov +Shafer +Shaffer +Shaner +Shaw +Sheets +Shick +Shirey +Sholl +Shupe +Sidower +Siegrist +Simmons +Simpson +Singh +Skywalker +Sloan +Smail +Smirnov +Smith +Snyder +Sommer +Spock +Stafford +Stahl +Stainforth +Stall +Stamos +Stange +Staymates +Steele +Stephenson +Stern +Stewart +Stocker +Stone +Stough +Straub +Stroble +Stroh +Styles +Sullivan +Sulyard +Summy +Sutton +Swabey +Swarner +Sybilla +Taggart +Tanner +Taylor +Teagarden +Tedrow +Tennant +Thomas +Thomlinson +Thompson +Thomson +Thorley +Tilton +Tireman +Todd +Treeby +Trovato +Turner +Ulery +Ullman +Unk +Vader +Vanleer +Vasilyev +Waldron +Walker +Wallick +Ward +Wardle +Warren +Watson +Webb +Weeter +Weinstein +Weisgarber +Wells +Welty +Wentzel +Werner +Werry +Wheeler +Whirlow +White +Whiteman +Whittier +Wible +Wile +Wilkerson +Wilkinson +Willey +Williams +Williamson +Wilo +Wilson +Winton +Wise +Wolfe +Wolff +Wood +Woodward +Woodworth +Woolery +Woollard +Wright +Yeskey +Young +Zadovsky +Zalack +Zaun +Zeal +Zimmer Zoucks \ No newline at end of file diff --git a/config/names/lizard_female.txt b/strings/names/lizard_female.txt similarity index 84% rename from config/names/lizard_female.txt rename to strings/names/lizard_female.txt index 078ee7bcff..cf588df9b1 100644 --- a/config/names/lizard_female.txt +++ b/strings/names/lizard_female.txt @@ -1,163 +1,163 @@ -Adzi -Ah -Ahaht -Ajim -Akeenus -Akish -Akishan -Aleeto -Am -Amussa -An -Anozz -Asheemar -Asska -Awas -Azala -Azbai -Azeez -Azum -Banalz -Bar -Baseenar -Beek -Beekatan -Beekus -Beela -Beelei -Beem -Beewos -Bejeen -Ber -Betzi -Bishalus -Bokeeus -Bur -Bura -Chalaree -Chana -Chanil -Chee -Cheesh -Chimatei -Chirurgeon -Cholasistu -Chuna -Churasu -Crath -Dar -Deeja -Deesei -Deesh -Deetsan -Deetwos -Dooka -Druja -Eepa -Ei -Eix -El -Ereel -Eutei -Gai -Gih -Gilm -Gish -Go -Hal -Hul -Ja -Jaseen -Jasuda -Jeed -Jeen -Kajul -Kal -Kasa -Keel -Keerava -Kiurz -Kud -La -Lee -Lei -Lifts -Liurz -Lurasha -Ma -Mach -Marz -Meedish -Meeh -Meema -Meen -Meena -Meenus -Meerana -Meesei -Meeus -Mei -Milah -Mim -Mota -Mudeska -Muz -Na -Nakuma -Nam -Nassa -Natoo -Neesha -Neetizei -Neetra -Neeus -Niima -Numeen -Nuralg -Nush -Ocheeva -Okur -Olank -On -Onasha -Osheeka -Pasha -Ra -Rana -Raniur -Ree -Reesa -Rei -Sa -Saak -Sanax -Seeba -Seed -Seen -Shah -Shahvee -Shaleez -Shatalg -Sheer -Shei -Sigerthe -Skaleel -Sudie -Tail -Tar -Tasha -Tei -Telixith -Tumma -Veek -Wan -Wazei -Weedum -Weewish -Witseidutsei -Wuja -Wujeeta -Wusha -Xil -Zish +Adzi +Ah +Ahaht +Ajim +Akeenus +Akish +Akishan +Aleeto +Am +Amussa +An +Anozz +Asheemar +Asska +Awas +Azala +Azbai +Azeez +Azum +Banalz +Bar +Baseenar +Beek +Beekatan +Beekus +Beela +Beelei +Beem +Beewos +Bejeen +Ber +Betzi +Bishalus +Bokeeus +Bur +Bura +Chalaree +Chana +Chanil +Chee +Cheesh +Chimatei +Chirurgeon +Cholasistu +Chuna +Churasu +Crath +Dar +Deeja +Deesei +Deesh +Deetsan +Deetwos +Dooka +Druja +Eepa +Ei +Eix +El +Ereel +Eutei +Gai +Gih +Gilm +Gish +Go +Hal +Hul +Ja +Jaseen +Jasuda +Jeed +Jeen +Kajul +Kal +Kasa +Keel +Keerava +Kiurz +Kud +La +Lee +Lei +Lifts +Liurz +Lurasha +Ma +Mach +Marz +Meedish +Meeh +Meema +Meen +Meena +Meenus +Meerana +Meesei +Meeus +Mei +Milah +Mim +Mota +Mudeska +Muz +Na +Nakuma +Nam +Nassa +Natoo +Neesha +Neetizei +Neetra +Neeus +Niima +Numeen +Nuralg +Nush +Ocheeva +Okur +Olank +On +Onasha +Osheeka +Pasha +Ra +Rana +Raniur +Ree +Reesa +Rei +Sa +Saak +Sanax +Seeba +Seed +Seen +Shah +Shahvee +Shaleez +Shatalg +Sheer +Shei +Sigerthe +Skaleel +Sudie +Tail +Tar +Tasha +Tei +Telixith +Tumma +Veek +Wan +Wazei +Weedum +Weewish +Witseidutsei +Wuja +Wujeeta +Wusha +Xil +Zish Zollassa \ No newline at end of file diff --git a/config/names/lizard_male.txt b/strings/names/lizard_male.txt similarity index 85% rename from config/names/lizard_male.txt rename to strings/names/lizard_male.txt index f14f1705ba..437d124b50 100644 --- a/config/names/lizard_male.txt +++ b/strings/names/lizard_male.txt @@ -1,328 +1,328 @@ -Abijoo -Ah -Ajum -Am -Amusei -An -Anoo -Aojee -Asum -Az -Azeel -Azinar -Azjai -Baar -Banka -Bar -Barnaxi -Batar -Batuus -Beem -Beshnus -Betu -Bex -Bijot -Bimee -Binyaar -Bosekus -Brand -Bun -Bunach -Bunish -Busheeus -Buujhan -Chakuk -Chalish -Chalureel -Chath -Chee -Cheedal -Chilwir -Chitakus -Chiwish -Chulz -Chuna -Da -Dakee -Dan -Dar -Darasken -DarJee -Debameel -Deed -Deegeeta -Deeh -Deekonus -Deekum -Deekus -Deerkaza -Deetum -Demeepa -Depasa -Derkeethus -Deroh -Dezanu -Dreet -Drumarz -Dum -Dunaxith -Effe -Ei -Eidu -Eius -Eiuus -Eix -Eleedal -Er -Esqoo -Etaku -Gah -Gajul -Gam -Geeh -Geel -Geem -Geh -Gei -Gih -Gin -Goh -Gulum -Haj -Han -Haran -Hareeya -Hathei -Heedul -Heem -Hei -Heir -Hixeeh -Huleeya -Huzei -Ilas -Im -Inee -Itan -J'Ram -Ja -Jah -Jaraleet -Jaree -Jas -Jasaiin -Jaseen -Jat -Jee -Jeela -Jeelius -Jeelus -Jeen -Jeer -Jeetum -Jei -Jilux -Jin -Jon -Jul -Julan -Junal -Jush -Juunei -Kai -Kajin -Kamax -Kas -Keema -Keer -Keerasa -Kepanuu -Kia -Kiameed -Kilaya -Kiurz -Kur -Kuz -La -Lah -Lai -Lan -Lara -Leem -Lei -Loh -Lotash -Luh -Lurz -Luteema -Maahi -Madesi -Maheelius -Mahei -Maht -Malz -Marz -Mathei -Maxath -Meej -Meejapa -Meensuda -Meer -Mema -Mere -Metaku -Miharil -Milos -Miun -Mobareed -Mohimeem -Mopakuz -Motuu -Mujeen -Muranatepa -Mush -Muz -Na -Napetui -Nazuux -Nebutil -Neeti -Neetinei -Neetrenaza -Neetzara -Neeus -Nema -Neposh -Netapatuu -Nexith -Nodeeus -Nomu -Nosaleeth -Nowajeem -Noyei -Nulaz -Nur -Obaxith -Okan -Okaw -Okeeh -Oleed -Oleen -Olik -Olink -Onuja -Onurai -Opatieel -Otumeel -Owai -Pachat -Pacheeva -Pad -Paduxi -Pajeen -Parash -Peeradeeh -Pejureel -Petaxai -Pideelus -Pimaxi -Pojeel -Ra -Radithax -Raj -Rareel -Rasha -Redieeus -Ree -Reeh -Reemukeeus -Reenum -Reesa -Reet -Reezal -Resari -Riker -Ru -Rupah -Sakeepa -Sakeeus -Sakka -Saliith -Sar -Schiavas -Seek -Seewul -Sei -Sejaijilax -Shakiis -Shehs -Shei -Silm -Skee -Skeetul -Sureeus -Ta -Taeed -Tah -Taleel -Talen -Tan -Tanaka -Tanan -Tee -Teeba -Teegla -Teeka -Teekeeus -Teemeeta -Teeus -Tehat -Tei -Teinaava -Teineeja -Terezeeus -Tikaasi -Tim -Topeeth -Topith -Tsleeixth -Tul -Tulm -Tun -Ukatsei -Ukawei -Ula -Ulawa -Ullis -Usha -Usheeja -Utadeek -Utamukeeus -Utatul -Uxith -Vara -Veekas -Veenaza -Veezara -Vistha -Vudeelal -Wanan -Wanum -Wayiteh -Weebam -Weeltul -Weer -Wih -Wud -Wuleen -Wulm -Wumeek -Xal -Xemo -Yinz -Yinz'r -Zaw -Ze -Zeen -Zeeus +Abijoo +Ah +Ajum +Am +Amusei +An +Anoo +Aojee +Asum +Az +Azeel +Azinar +Azjai +Baar +Banka +Bar +Barnaxi +Batar +Batuus +Beem +Beshnus +Betu +Bex +Bijot +Bimee +Binyaar +Bosekus +Brand +Bun +Bunach +Bunish +Busheeus +Buujhan +Chakuk +Chalish +Chalureel +Chath +Chee +Cheedal +Chilwir +Chitakus +Chiwish +Chulz +Chuna +Da +Dakee +Dan +Dar +Darasken +DarJee +Debameel +Deed +Deegeeta +Deeh +Deekonus +Deekum +Deekus +Deerkaza +Deetum +Demeepa +Depasa +Derkeethus +Deroh +Dezanu +Dreet +Drumarz +Dum +Dunaxith +Effe +Ei +Eidu +Eius +Eiuus +Eix +Eleedal +Er +Esqoo +Etaku +Gah +Gajul +Gam +Geeh +Geel +Geem +Geh +Gei +Gih +Gin +Goh +Gulum +Haj +Han +Haran +Hareeya +Hathei +Heedul +Heem +Hei +Heir +Hixeeh +Huleeya +Huzei +Ilas +Im +Inee +Itan +J'Ram +Ja +Jah +Jaraleet +Jaree +Jas +Jasaiin +Jaseen +Jat +Jee +Jeela +Jeelius +Jeelus +Jeen +Jeer +Jeetum +Jei +Jilux +Jin +Jon +Jul +Julan +Junal +Jush +Juunei +Kai +Kajin +Kamax +Kas +Keema +Keer +Keerasa +Kepanuu +Kia +Kiameed +Kilaya +Kiurz +Kur +Kuz +La +Lah +Lai +Lan +Lara +Leem +Lei +Loh +Lotash +Luh +Lurz +Luteema +Maahi +Madesi +Maheelius +Mahei +Maht +Malz +Marz +Mathei +Maxath +Meej +Meejapa +Meensuda +Meer +Mema +Mere +Metaku +Miharil +Milos +Miun +Mobareed +Mohimeem +Mopakuz +Motuu +Mujeen +Muranatepa +Mush +Muz +Na +Napetui +Nazuux +Nebutil +Neeti +Neetinei +Neetrenaza +Neetzara +Neeus +Nema +Neposh +Netapatuu +Nexith +Nodeeus +Nomu +Nosaleeth +Nowajeem +Noyei +Nulaz +Nur +Obaxith +Okan +Okaw +Okeeh +Oleed +Oleen +Olik +Olink +Onuja +Onurai +Opatieel +Otumeel +Owai +Pachat +Pacheeva +Pad +Paduxi +Pajeen +Parash +Peeradeeh +Pejureel +Petaxai +Pideelus +Pimaxi +Pojeel +Ra +Radithax +Raj +Rareel +Rasha +Redieeus +Ree +Reeh +Reemukeeus +Reenum +Reesa +Reet +Reezal +Resari +Riker +Ru +Rupah +Sakeepa +Sakeeus +Sakka +Saliith +Sar +Schiavas +Seek +Seewul +Sei +Sejaijilax +Shakiis +Shehs +Shei +Silm +Skee +Skeetul +Sureeus +Ta +Taeed +Tah +Taleel +Talen +Tan +Tanaka +Tanan +Tee +Teeba +Teegla +Teeka +Teekeeus +Teemeeta +Teeus +Tehat +Tei +Teinaava +Teineeja +Terezeeus +Tikaasi +Tim +Topeeth +Topith +Tsleeixth +Tul +Tulm +Tun +Ukatsei +Ukawei +Ula +Ulawa +Ullis +Usha +Usheeja +Utadeek +Utamukeeus +Utatul +Uxith +Vara +Veekas +Veenaza +Veezara +Vistha +Vudeelal +Wanan +Wanum +Wayiteh +Weebam +Weeltul +Weer +Wih +Wud +Wuleen +Wulm +Wumeek +Xal +Xemo +Yinz +Yinz'r +Zaw +Ze +Zeen +Zeeus Zish \ No newline at end of file diff --git a/config/names/mime.txt b/strings/names/mime.txt similarity index 87% rename from config/names/mime.txt rename to strings/names/mime.txt index 520d3affce..cc65af67fd 100644 --- a/config/names/mime.txt +++ b/strings/names/mime.txt @@ -1,24 +1,24 @@ -Invisible Man -Lemon Mime -Marcel -Marcel Mime -Mime -Mr Beret -Mr Mime -Mr Mute -Mute -Omerta -Oui Oui -Pantomime -Quiet -Quiet Riot -Silence -Silencio -Silent Knight -Silent Majority -Silent Night -Silent Sorrow -Transparency -Unspeakable -Untouchable +Invisible Man +Lemon Mime +Marcel +Marcel Mime +Mime +Mr Beret +Mr Mime +Mr Mute +Mute +Omerta +Oui Oui +Pantomime +Quiet +Quiet Riot +Silence +Silencio +Silent Knight +Silent Majority +Silent Night +Silent Sorrow +Transparency +Unspeakable +Untouchable Wall Runner \ No newline at end of file diff --git a/config/names/ninjaname.txt b/strings/names/ninjaname.txt similarity index 86% rename from config/names/ninjaname.txt rename to strings/names/ninjaname.txt index eb470493fa..fa0d0f1094 100644 --- a/config/names/ninjaname.txt +++ b/strings/names/ninjaname.txt @@ -1,44 +1,44 @@ -Aria -Baki -Blood -Bro -Cyrax -Daemon -Death -Donatello -Eater -Ermac -Fox -Goemon -Hanzo -Hayabusa -Hazuki -Hero -Hien -Hiro -Hiryu -Iga -Koga -Leonardo -McAwesome -McNinja -Michaelangelo -Midnight -Null -Ogre -Phantom -Raiden -Rain -Raphael -Ryu -Saibot -Samurai -Sarutobi -Scorpion -Seven -Shadow -Shredder -Smoke -Splinter -Throat +Aria +Baki +Blood +Bro +Cyrax +Daemon +Death +Donatello +Eater +Ermac +Fox +Goemon +Hanzo +Hayabusa +Hazuki +Hero +Hien +Hiro +Hiryu +Iga +Koga +Leonardo +McAwesome +McNinja +Michaelangelo +Midnight +Null +Ogre +Phantom +Raiden +Rain +Raphael +Ryu +Saibot +Samurai +Sarutobi +Scorpion +Seven +Shadow +Shredder +Smoke +Splinter +Throat Zero \ No newline at end of file diff --git a/config/names/ninjatitle.txt b/strings/names/ninjatitle.txt similarity index 86% rename from config/names/ninjatitle.txt rename to strings/names/ninjatitle.txt index f9776f56fe..41c5b338ba 100644 --- a/config/names/ninjatitle.txt +++ b/strings/names/ninjatitle.txt @@ -1,46 +1,46 @@ -Agile -Assassin -Awesome -Black -Crimson -Cruel -Deep -Dr -Dragon -Ender -Grandmaster -Grappler -Gray -Hunter -Initiate -Killer -Liquid -Master -Merciful -Merciless -Nickel -Night -Nightshade -Ninja -Noob -Orphaner -Quick -Remorseless -Rogue -Sensei -Shinobi -Silencing -Silent -Silver -Singing -Slayer -Snake -Solid -Solidus -Stalker -Steel -Strider -Striker -Swift -Ulimate +Agile +Assassin +Awesome +Black +Crimson +Cruel +Deep +Dr +Dragon +Ender +Grandmaster +Grappler +Gray +Hunter +Initiate +Killer +Liquid +Master +Merciful +Merciless +Nickel +Night +Nightshade +Ninja +Noob +Orphaner +Quick +Remorseless +Rogue +Sensei +Shinobi +Silencing +Silent +Silver +Singing +Slayer +Snake +Solid +Solidus +Stalker +Steel +Strider +Striker +Swift +Ulimate Widower \ No newline at end of file diff --git a/config/names/plasmaman.txt b/strings/names/plasmaman.txt similarity index 89% rename from config/names/plasmaman.txt rename to strings/names/plasmaman.txt index 045d2c5a0c..fa9f063773 100644 --- a/config/names/plasmaman.txt +++ b/strings/names/plasmaman.txt @@ -1,118 +1,118 @@ -Actinium -Aluminium -Americium -Antimony -Argon -Arsenic -Astatine -Barium -Berkelium -Beryllium -Bismuth -Bohrium -Boron -Bromine -Cadmium -Caesium -Calcium -Californium -Carbon -Cerium -Chlorine -Chromium -Cobalt -Copernicium -Copper -Curium -Darmstadtium -Dubnium -Dysprosium -Einsteinium -Erbium -Europium -Fermium -Flerovium -Fluorine -Francium -Gadolinium -Gallium -Germanium -Gold -Hafnium -Hassium -Helium -Holmium -Hydrogen -Indium -Iodine -Iridium -Iron -Krypton -Lanthanum -Lawrencium -Lead -Lithium -Livermorium -Lutetium -Magnesium -Manganese -Meitnerium -Mendelevium -Mercury -Molybdenum -Neodymium -Neon -Neptunium -Nickel -Niobium -Nitrogen -Nobelium -Osmium -Oxygen -Palladium -Phosphorus -Platinum -Plutonium -Polonium -Potassium -Praseodymium -Promethium -Protactinium -Radium -Radon -Rhenium -Rhodium -Roentgenium -Rubidium -Ruthenium -Rutherfordium -Samarium -Scandium -Seaborgium -Selenium -Silicon -Silver -Sodium -Strontium -Sulfur -Tantalum -Technetium -Tellurium -Terbium -Thallium -Thorium -Thulium -Tin -Titanium -Tungsten -Ununoctium -Ununpentium -Ununseptium -Ununtrium -Uranium -Vanadium -Xenon -Ytterbium -Yttrium -Zinc +Actinium +Aluminium +Americium +Antimony +Argon +Arsenic +Astatine +Barium +Berkelium +Beryllium +Bismuth +Bohrium +Boron +Bromine +Cadmium +Caesium +Calcium +Californium +Carbon +Cerium +Chlorine +Chromium +Cobalt +Copernicium +Copper +Curium +Darmstadtium +Dubnium +Dysprosium +Einsteinium +Erbium +Europium +Fermium +Flerovium +Fluorine +Francium +Gadolinium +Gallium +Germanium +Gold +Hafnium +Hassium +Helium +Holmium +Hydrogen +Indium +Iodine +Iridium +Iron +Krypton +Lanthanum +Lawrencium +Lead +Lithium +Livermorium +Lutetium +Magnesium +Manganese +Meitnerium +Mendelevium +Mercury +Molybdenum +Neodymium +Neon +Neptunium +Nickel +Niobium +Nitrogen +Nobelium +Osmium +Oxygen +Palladium +Phosphorus +Platinum +Plutonium +Polonium +Potassium +Praseodymium +Promethium +Protactinium +Radium +Radon +Rhenium +Rhodium +Roentgenium +Rubidium +Ruthenium +Rutherfordium +Samarium +Scandium +Seaborgium +Selenium +Silicon +Silver +Sodium +Strontium +Sulfur +Tantalum +Technetium +Tellurium +Terbium +Thallium +Thorium +Thulium +Tin +Titanium +Tungsten +Ununoctium +Ununpentium +Ununseptium +Ununtrium +Uranium +Vanadium +Xenon +Ytterbium +Yttrium +Zinc Zirconium \ No newline at end of file diff --git a/strings/names/posibrain.txt b/strings/names/posibrain.txt new file mode 100644 index 0000000000..119632bd81 --- /dev/null +++ b/strings/names/posibrain.txt @@ -0,0 +1,47 @@ +PBU +HIU +SINA +ARMA +OSI +HBL +MSO +RR +CHRI +CDB +HG +XSI +ORNG +GUN +KOR +MET +FRE +XIS +SLI +PKP +HOG +RZH +GOOF +MRPR +JJR +FIRC +INC +PHL +BGB +ANTR +MIW +WJ +JRD +CHOC +ANCL +JLLO +JNLG +KOS +TKRG +XAL +STLP +CBOS +DUNC +FXMC +DRSD +COI +CYBR \ No newline at end of file diff --git a/config/names/verbs.txt b/strings/names/verbs.txt similarity index 86% rename from config/names/verbs.txt rename to strings/names/verbs.txt index fc90f89e40..17bc127fd5 100644 --- a/config/names/verbs.txt +++ b/strings/names/verbs.txt @@ -1,632 +1,632 @@ -accept -add -admire -admit -advise -afford -agree -alert -allow -amuse -analyse -announce -annoy -answer -apologise -appear -applaud -appreciate -approve -argue -arrange -arrest -arrive -ask -attach -attack -attempt -attend -attract -avoid -back -bake -balance -ban -bang -bare -bat -bathe -battle -beam -beg -behave -belong -bleach -bless -blind -blink -blot -blush -boast -boil -bolt -bomb -book -bore -borrow -bounce -bow -box -brake -branch -breathe -bruise -brush -bubble -bump -burn -bury -buzz -calculate -call -camp -care -carry -carve -cause -challenge -change -charge -chase -cheat -check -cheer -chew -choke -chop -claim -clap -clean -clear -clip -close -coach -coil -collect -colour -comb -command -communicate -compare -compete -complain -complete -concentrate -concern -confess -confuse -connect -consider -consist -contain -continue -copy -correct -cough -count -cover -crack -crash -crawl -cross -crush -cry -cure -curl -curve -cycle -dam -damage -dance -dare -decay -deceive -decide -decorate -delay -delight -deliver -depend -describe -desert -deserve -destroy -detect -develop -disagree -disappear -disapprove -disarm -discover -dislike -divide -double -doubt -drag -drain -dream -dress -drip -drop -drown -drum -dry -dust -earn -educate -embarrass -employ -empty -encourage -end -enjoy -enter -entertain -escape -examine -excite -excuse -exercise -exist -expand -expect -explain -explode -extend -face -fade -fail -fancy -fasten -fax -fear -fence -fetch -file -fill -film -fire -fit -fix -flap -flash -float -flood -flow -flower -fold -follow -fool -force -form -found -frame -frighten -fry -gather -gaze -glow -glue -grab -grate -grease -greet -grin -grip -groan -guarantee -guard -guess -guide -hammer -hand -handle -hang -happen -harass -harm -hate -haunt -head -heal -heap -heat -help -hook -hop -hope -hover -hug -hum -hunt -hurry -identify -ignore -imagine -impress -improve -include -increase -influence -inform -inject -injure -instruct -intend -interest -interfere -interrupt -introduce -invent -invite -irritate -itch -jail -jam -jog -join -joke -judge -juggle -jump -kick -kill -kiss -kneel -knit -knock -knot -label -land -last -laugh -launch -learn -level -license -lick -lie -lighten -like -list -listen -live -load -lock -long -look -love -man -manage -march -mark -marry -match -mate -matter -measure -meddle -melt -memorise -mend -messup -milk -mine -miss -mix -moan -moor -mourn -move -muddle -mug -multiply -murder -nail -name -need -nest -nod -note -notice -number -obey -object -observe -obtain -occur -offend -offer -open -order -overflow -owe -own -pack -paddle -paint -park -part -pass -paste -pat -pause -peck -pedal -peel -peep -perform -permit -phone -pick -pinch -pine -place -plan -plant -play -please -plug -point -poke -polish -pop -possess -post -pour -practise -pray -preach -precede -prefer -prepare -present -preserve -press -pretend -prevent -prick -print -produce -program -promise -protect -provide -pull -pump -punch -puncture -punish -push -question -queue -race -radiate -rain -raise -reach -realise -receive -recognise -record -reduce -reflect -refuse -regret -reign -reject -rejoice -relax -release -rely -remain -remember -remind -remove -repair -repeat -replace -reply -report -reproduce -request -rescue -retire -return -rhyme -rinse -risk -rob -rock -roll -rot -rub -ruin -rule -rush -sack -sail -satisfy -save -saw -scare -scatter -scold -scorch -scrape -scratch -scream -screw -scribble -scrub -seal -search -separate -serve -settle -shade -share -shave -shelter -shiver -shock -shop -shrug -sigh -sign -signal -sin -sip -ski -skip -slap -slip -slow -smash -smell -smile -smoke -snatch -sneeze -sniff -snore -snow -soak -soothe -sound -spare -spark -sparkle -spell -spill -spoil -spot -spray -sprout -squash -squeak -squeal -squeeze -stain -stamp -stare -start -stay -steer -step -stir -stitch -stop -store -strap -strengthen -stretch -strip -stroke -stuff -subtract -succeed -suck -suffer -suggest -suit -supply -support -suppose -surprise -surround -suspect -suspend -switch -talk -tame -tap -taste -tease -telephone -tempt -terrify -test -thank -thaw -tick -tickle -tie -time -tip -tire -touch -tour -tow -trace -trade -train -transport -trap -travel -treat -tremble -trick -trip -trot -trouble -trust -try -tug -tumble -turn -twist -type -undress -unfasten -unite -unlock -unpack -untidy -use -vanish -visit -wail -wait -walk -wander -want -warm -warn -wash -waste -watch -water -wave -weigh -welcome -whine -whip -whirl -whisper -whistle -wink -wipe -wish -wobble -wonder -work -worry -wrap -wreck -wrestle -wriggle -yawn -yell -zip +accept +add +admire +admit +advise +afford +agree +alert +allow +amuse +analyse +announce +annoy +answer +apologise +appear +applaud +appreciate +approve +argue +arrange +arrest +arrive +ask +attach +attack +attempt +attend +attract +avoid +back +bake +balance +ban +bang +bare +bat +bathe +battle +beam +beg +behave +belong +bleach +bless +blind +blink +blot +blush +boast +boil +bolt +bomb +book +bore +borrow +bounce +bow +box +brake +branch +breathe +bruise +brush +bubble +bump +burn +bury +buzz +calculate +call +camp +care +carry +carve +cause +challenge +change +charge +chase +cheat +check +cheer +chew +choke +chop +claim +clap +clean +clear +clip +close +coach +coil +collect +colour +comb +command +communicate +compare +compete +complain +complete +concentrate +concern +confess +confuse +connect +consider +consist +contain +continue +copy +correct +cough +count +cover +crack +crash +crawl +cross +crush +cry +cure +curl +curve +cycle +dam +damage +dance +dare +decay +deceive +decide +decorate +delay +delight +deliver +depend +describe +desert +deserve +destroy +detect +develop +disagree +disappear +disapprove +disarm +discover +dislike +divide +double +doubt +drag +drain +dream +dress +drip +drop +drown +drum +dry +dust +earn +educate +embarrass +employ +empty +encourage +end +enjoy +enter +entertain +escape +examine +excite +excuse +exercise +exist +expand +expect +explain +explode +extend +face +fade +fail +fancy +fasten +fax +fear +fence +fetch +file +fill +film +fire +fit +fix +flap +flash +float +flood +flow +flower +fold +follow +fool +force +form +found +frame +frighten +fry +gather +gaze +glow +glue +grab +grate +grease +greet +grin +grip +groan +guarantee +guard +guess +guide +hammer +hand +handle +hang +happen +harass +harm +hate +haunt +head +heal +heap +heat +help +hook +hop +hope +hover +hug +hum +hunt +hurry +identify +ignore +imagine +impress +improve +include +increase +influence +inform +inject +injure +instruct +intend +interest +interfere +interrupt +introduce +invent +invite +irritate +itch +jail +jam +jog +join +joke +judge +juggle +jump +kick +kill +kiss +kneel +knit +knock +knot +label +land +last +laugh +launch +learn +level +license +lick +lie +lighten +like +list +listen +live +load +lock +long +look +love +man +manage +march +mark +marry +match +mate +matter +measure +meddle +melt +memorise +mend +messup +milk +mine +miss +mix +moan +moor +mourn +move +muddle +mug +multiply +murder +nail +name +need +nest +nod +note +notice +number +obey +object +observe +obtain +occur +offend +offer +open +order +overflow +owe +own +pack +paddle +paint +park +part +pass +paste +pat +pause +peck +pedal +peel +peep +perform +permit +phone +pick +pinch +pine +place +plan +plant +play +please +plug +point +poke +polish +pop +possess +post +pour +practise +pray +preach +precede +prefer +prepare +present +preserve +press +pretend +prevent +prick +print +produce +program +promise +protect +provide +pull +pump +punch +puncture +punish +push +question +queue +race +radiate +rain +raise +reach +realise +receive +recognise +record +reduce +reflect +refuse +regret +reign +reject +rejoice +relax +release +rely +remain +remember +remind +remove +repair +repeat +replace +reply +report +reproduce +request +rescue +retire +return +rhyme +rinse +risk +rob +rock +roll +rot +rub +ruin +rule +rush +sack +sail +satisfy +save +saw +scare +scatter +scold +scorch +scrape +scratch +scream +screw +scribble +scrub +seal +search +separate +serve +settle +shade +share +shave +shelter +shiver +shock +shop +shrug +sigh +sign +signal +sin +sip +ski +skip +slap +slip +slow +smash +smell +smile +smoke +snatch +sneeze +sniff +snore +snow +soak +soothe +sound +spare +spark +sparkle +spell +spill +spoil +spot +spray +sprout +squash +squeak +squeal +squeeze +stain +stamp +stare +start +stay +steer +step +stir +stitch +stop +store +strap +strengthen +stretch +strip +stroke +stuff +subtract +succeed +suck +suffer +suggest +suit +supply +support +suppose +surprise +surround +suspect +suspend +switch +talk +tame +tap +taste +tease +telephone +tempt +terrify +test +thank +thaw +tick +tickle +tie +time +tip +tire +touch +tour +tow +trace +trade +train +transport +trap +travel +treat +tremble +trick +trip +trot +trouble +trust +try +tug +tumble +turn +twist +type +undress +unfasten +unite +unlock +unpack +untidy +use +vanish +visit +wail +wait +walk +wander +want +warm +warn +wash +waste +watch +water +wave +weigh +welcome +whine +whip +whirl +whisper +whistle +wink +wipe +wish +wobble +wonder +work +worry +wrap +wreck +wrestle +wriggle +yawn +yell +zip zoom \ No newline at end of file diff --git a/config/names/wizardfirst.txt b/strings/names/wizardfirst.txt similarity index 87% rename from config/names/wizardfirst.txt rename to strings/names/wizardfirst.txt index 9dcab3f005..8c9e1e35fe 100644 --- a/config/names/wizardfirst.txt +++ b/strings/names/wizardfirst.txt @@ -1,36 +1,36 @@ -Alatar -Archchancellor -Boccob -Circe -Dumbledor -Elminister -Gandalf -Grimm -Gulstaff -Houdini -Jim -Kaschei -Khelben -Kreol -Lina -Merlin -Mogan -Mordenkainen -Morgan -Mystryl -Nihilus -Palando -Prospero -Radagast -Raistlin -Rasputin -Saruman -Tenser -Terefi -Tzeentch -Urza -Vaarsuvius -Vecna -Yoda -Zagyg +Alatar +Archchancellor +Boccob +Circe +Dumbledor +Elminister +Gandalf +Grimm +Gulstaff +Houdini +Jim +Kaschei +Khelben +Kreol +Lina +Merlin +Mogan +Mordenkainen +Morgan +Mystryl +Nihilus +Palando +Prospero +Radagast +Raistlin +Rasputin +Saruman +Tenser +Terefi +Tzeentch +Urza +Vaarsuvius +Vecna +Yoda +Zagyg Zul \ No newline at end of file diff --git a/config/names/wizardsecond.txt b/strings/names/wizardsecond.txt similarity index 90% rename from config/names/wizardsecond.txt rename to strings/names/wizardsecond.txt index 9193ef1e97..4233ad5430 100644 --- a/config/names/wizardsecond.txt +++ b/strings/names/wizardsecond.txt @@ -1,39 +1,39 @@ -Dark -Darkmagic -Darko -Gray -Honko -Inverse -le Fay -of Void -Shado -Smith -the All Knowing -the Amazing -the Bandit Killer -the Benevolent -the Blue -the Brown -the Conquerer -the Deathless -the Destroyer -the Dragon Spooker -the Emperor -the Gray -the Great -the Magician -the Powerful -the Raven -the Red -the Remorseful -the Seething -the Sorcelator -the Spiral King -the Unending -the Unstoppable -the Weeping -the White -the Wise -Unseen -Weatherwax +Dark +Darkmagic +Darko +Gray +Honko +Inverse +le Fay +of Void +Shado +Smith +the All Knowing +the Amazing +the Bandit Killer +the Benevolent +the Blue +the Brown +the Conquerer +the Deathless +the Destroyer +the Dragon Spooker +the Emperor +the Gray +the Great +the Magician +the Powerful +the Raven +the Red +the Remorseful +the Seething +the Sorcelator +the Spiral King +the Unending +the Unstoppable +the Weeping +the White +the Wise +Unseen +Weatherwax Yagg \ No newline at end of file From 6ec00d29a28fcae2f68e3dd5c41c90b031427aab Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 02:11:38 -0500 Subject: [PATCH 044/131] Fixes debraining messages showing up one place they shouldn't --- code/modules/mob/living/brain/brain_item.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index ea97bc30ae..a9ddbe02cb 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -50,7 +50,8 @@ if(C.has_brain_worms()) var/mob/living/simple_animal/borer/B = C.has_brain_worms() B.leave_victim() //Should remove borer if the brain is removed - RR - transfer_identity(C) + if(!gc_destroyed || (owner && !owner.gc_destroyed)) + transfer_identity(C) C.update_hair() /obj/item/organ/brain/prepare_eat() From 3799c28620f5651d5a91ce59ea626fab6d401c36 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 10:24:27 -0500 Subject: [PATCH 045/131] >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.) --- code/modules/admin/admin_investigate.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index f5704db604..53fefc30bc 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -25,7 +25,7 @@ F << "[time_stamp()] \ref[src] ([x],[y],[z]) || [src] [message]
" //ADMINVERBS -/client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "kudzu") ) +/client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "botany") ) set name = "Investigate" set category = "Admin" if(!holder) From b2a5a9fad55b5b8cb3277a246790f8df3d1e55d2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:22:17 -0500 Subject: [PATCH 046/131] Message monitor fix + spawn kill --- code/game/machinery/computer/message.dm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index c97f487718..7f8eb32648 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -455,14 +455,16 @@ name = "monitor decryption key" var/obj/machinery/message_server/server = null -/obj/item/weapon/paper/monitorkey/New() +/obj/item/weapon/paper/monitorkey/Initialize() ..() - spawn(10) - if(GLOB.message_servers) - for(var/obj/machinery/message_server/server in GLOB.message_servers) - if(!isnull(server)) - if(!isnull(server.decryptkey)) - info = "

Daily Key Reset


The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." - info_links = info - add_overlay("paper_words") - break + return INITIALIZE_HINT_LATELOAD + +/obj/item/weapon/paper/monitorkey/LateInitialize() + if(GLOB.message_servers) + for(var/obj/machinery/message_server/server in GLOB.message_servers) + if(!isnull(server)) + if(!isnull(server.decryptkey)) + info = "

Daily Key Reset


The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." + info_links = info + add_overlay("paper_words") + break From cee892fad36a52d187e1c83ed42869cce13764d9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:22:20 -0500 Subject: [PATCH 047/131] Fixes emitter sparks --- code/modules/power/singularity/emitter.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 39085ab8e3..ff7a79bc69 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -93,6 +93,7 @@ connect_to_network() sparks = new + sparks.attach(src) sparks.set_up(5, TRUE, src) /obj/machinery/power/emitter/Destroy() From 2338f75116281c4f231249543eed22c535e2eba5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:23:24 -0500 Subject: [PATCH 048/131] Removes Rest from Voice of God --- code/modules/surgery/organs/vocal_cords.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 2413a45870..a2048c2b71 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -175,7 +175,7 @@ var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt") var/static/regex/weaken_words = regex("drop|fall|trip|weaken") - var/static/regex/sleep_words = regex("sleep|slumber") + var/static/regex/sleep_words = regex("sleep|slumber|rest") var/static/regex/vomit_words = regex("vomit|throw up") var/static/regex/silence_words = regex("shut up|silence|ssh|quiet|hush") var/static/regex/hallucinate_words = regex("see the truth|hallucinate") @@ -206,7 +206,6 @@ var/static/regex/throwmode_words = regex("throw|catch") var/static/regex/flip_words = regex("flip|rotate|revolve|roll|somersault") var/static/regex/speak_words = regex("speak|say something") - var/static/regex/rest_words = regex("rest") var/static/regex/getup_words = regex("get up") var/static/regex/sit_words = regex("sit") var/static/regex/stand_words = regex("stand") @@ -443,17 +442,9 @@ L.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")) sleep(5) //So the chat flows more naturally - //REST - else if((findtext(message, rest_words))) - cooldown = COOLDOWN_MEME - for(var/V in listeners) - var/mob/living/L = V - if(!L.resting) - L.lay_down() - //GET UP else if((findtext(message, getup_words))) - cooldown = COOLDOWN_DAMAGE + cooldown = COOLDOWN_DAMAGE //because stun removal for(var/V in listeners) var/mob/living/L = V if(L.resting) From 3cd929cdbea08815f078abf3f3b1fa3dc69dfe01 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:24:28 -0500 Subject: [PATCH 049/131] Fixes seeing the you are a brain! message during monkey transformation --- code/modules/mob/living/brain/brain_item.dm | 2 + code/modules/mob/transform_procs.dm | 43 +++++++++++++-------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index ea97bc30ae..4648911985 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -60,6 +60,8 @@ name = "[L.name]'s brain" if(brainmob || decoy_override) return + if(!L.mind) + return brainmob = new(src) brainmob.name = L.real_name brainmob.real_name = L.real_name diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 0dded30e39..9e5e86836b 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -13,12 +13,6 @@ stored_implants += IMP IMP.removed(src, 1, 1) - if (tr_flags & TR_KEEPORGANS) - for(var/X in internal_organs) - var/obj/item/organ/I = X - int_organs += I - I.Remove(src, 1) - var/list/missing_bodyparts_zones = get_missing_limbs() var/obj/item/cavity_object @@ -92,10 +86,21 @@ var/obj/item/weapon/implant/IMP = Y IMP.implant(O, null, 1) - //re-add organs to new mob + //re-add organs to new mob. this order prevents moving the mind to a brain at any point if(tr_flags & TR_KEEPORGANS) for(var/X in O.internal_organs) - qdel(X) + var/obj/item/organ/I = X + I.Remove(O, 1) + + if(mind) + mind.transfer_to(O) + if(O.mind.changeling) + O.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/humanform(null) + + for(var/X in internal_organs) + var/obj/item/organ/I = X + int_organs += I + I.Remove(src, 1) for(var/X in int_organs) var/obj/item/organ/I = X @@ -118,7 +123,7 @@ qdel(G) //we lose the organs in the missing limbs qdel(BP) - //transfer mind and delete old mob + //transfer mind if we didn't yet if(mind) mind.transfer_to(O) if(O.mind.changeling) @@ -154,12 +159,6 @@ stored_implants += IMP IMP.removed(src, 1, 1) - if (tr_flags & TR_KEEPORGANS) - for(var/X in internal_organs) - var/obj/item/organ/I = X - int_organs += I - I.Remove(src, 1) - var/list/missing_bodyparts_zones = get_missing_limbs() var/obj/item/cavity_object @@ -244,7 +243,19 @@ if(tr_flags & TR_KEEPORGANS) for(var/X in O.internal_organs) - qdel(X) + var/obj/item/organ/I = X + I.Remove(O, 1) + + if(mind) + mind.transfer_to(O) + if(O.mind.changeling) + for(var/obj/effect/proc_holder/changeling/humanform/HF in O.mind.changeling.purchasedpowers) + mind.changeling.purchasedpowers -= HF + + for(var/X in internal_organs) + var/obj/item/organ/I = X + int_organs += I + I.Remove(src, 1) for(var/X in int_organs) var/obj/item/organ/I = X From 6d923dd303d308eeff0d47058837f4591d582d6d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:25:33 -0500 Subject: [PATCH 050/131] Fixes changelings being unable to revive from death without a brain --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 36035b9ae1..87cf246717 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -728,7 +728,7 @@ /mob/living/carbon/can_be_revived() . = ..() - if(!getorgan(/obj/item/organ/brain)) + if(!getorgan(/obj/item/organ/brain) && (!mind || !mind.changeling)) return 0 /mob/living/carbon/harvest(mob/living/user) From c1bd59b7cb2f931da0b05fb27cc73a089cae0fc1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:26:38 -0500 Subject: [PATCH 051/131] Mob directory --- code/_globalvars/lists/mobs.dm | 1 + code/modules/mob/mob.dm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 32969dd5d8..e378970225 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(stealthminID) //reference list with IDs that store ckeys, GLOBAL_LIST_EMPTY(player_list) //all mobs **with clients attached**. Excludes /mob/dead/new_player GLOBAL_LIST_EMPTY(mob_list) //all mobs, including clientless +GLOBAL_LIST_EMPTY(mob_directory) //mob_id -> mob GLOBAL_LIST_EMPTY(living_mob_list) //all alive mobs, including clientless. Excludes /mob/dead/new_player GLOBAL_LIST_EMPTY(dead_mob_list) //all dead mobs, including clientless. Excludes /mob/dead/new_player GLOBAL_LIST_EMPTY(joined_player_list) //all clients that have joined the game at round-start or as a latejoin. diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 4712594179..24b4d228cc 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -3,6 +3,7 @@ GLOB.dead_mob_list -= src GLOB.living_mob_list -= src GLOB.all_clockwork_mobs -= src + GLOB.mob_directory -= tag if(observers && observers.len) for(var/M in observers) var/mob/dead/observe = M @@ -22,6 +23,7 @@ /mob/Initialize() tag = "mob_[next_mob_id++]" GLOB.mob_list += src + GLOB.mob_directory[tag] = src if(stat == DEAD) GLOB.dead_mob_list += src else From fbe0803699696de467b346cb88c49ff42358570f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 11:30:44 -0500 Subject: [PATCH 052/131] [s] SDQL security patches --- code/modules/admin/admin_verbs.dm | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 19e2c372b3..eae23a9f35 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1,7 +1,8 @@ //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless +//the procs are cause you can't put the comments in the GLOB var define GLOBAL_PROTECT(admin_verbs_default) -GLOBAL_LIST_INIT(admin_verbs_default, AVerbsDefault()) -/proc/AVerbsDefault() +GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault()) +/world/proc/AVerbsDefault() return list( /client/proc/toggleadminhelpsound, /*toggles whether we hear a sound when adminhelps/PMs are used*/ /client/proc/toggleannouncelogin, /*toggles if an admin's login is announced during a round*/ @@ -28,8 +29,8 @@ GLOBAL_LIST_INIT(admin_verbs_default, AVerbsDefault()) /client/proc/stop_sounds ) GLOBAL_PROTECT(admin_verbs_admin) -GLOBAL_LIST_INIT(admin_verbs_admin, AVerbsAdmin()) -/proc/AVerbsAdmin() +GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) +/world/proc/AVerbsAdmin() return list( /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ /client/proc/invisimin, /*allows our mob to go invisible/visible*/ @@ -81,9 +82,7 @@ GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel,/client/proc/DB_ GLOBAL_PROTECT(admin_verbs_sounds) GLOBAL_LIST_INIT(admin_verbs_sounds, list(/client/proc/play_local_sound,/client/proc/play_sound,/client/proc/set_round_end_sound)) GLOBAL_PROTECT(admin_verbs_fun) -GLOBAL_LIST_INIT(admin_verbs_fun, AVerbsFun()) -/proc/AVerbsFun() - return list( +GLOBAL_LIST_INIT(admin_verbs_fun, list( /client/proc/cmd_admin_dress, /client/proc/cmd_admin_gib_self, /client/proc/drop_bomb, @@ -105,12 +104,12 @@ GLOBAL_LIST_INIT(admin_verbs_fun, AVerbsFun()) /client/proc/polymorph_all, /client/proc/show_tip, /client/proc/smite - ) + )) GLOBAL_PROTECT(admin_verbs_spawn) GLOBAL_LIST_INIT(admin_verbs_spawn, list(/datum/admins/proc/spawn_atom,/client/proc/respawn_character)) GLOBAL_PROTECT(admin_verbs_server) -GLOBAL_LIST_INIT(admin_verbs_server, AVerbsServer()) -/proc/AVerbsServer() +GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer()) +/world/proc/AVerbsServer() return list( /datum/admins/proc/startnow, /datum/admins/proc/restart, @@ -129,8 +128,8 @@ GLOBAL_LIST_INIT(admin_verbs_server, AVerbsServer()) /client/proc/toggle_hub ) GLOBAL_PROTECT(admin_verbs_debug) -GLOBAL_LIST_INIT(admin_verbs_debug, AVerbsDebug()) -/proc/AVerbsDebug() +GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug()) +/world/proc/AVerbsDebug() return list( /client/proc/restart_controller, /client/proc/cmd_admin_list_open_jobs, @@ -179,9 +178,7 @@ GLOBAL_LIST_INIT(admin_verbs_rejuv, list(/client/proc/respawn_character)) //verbs which can be hidden - needs work GLOBAL_PROTECT(admin_verbs_hideable) -GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) -/proc/AVerbsHideable() - return list( +GLOBAL_LIST_INIT(admin_verbs_hideable, list( /client/proc/set_ooc, /client/proc/reset_ooc, /client/proc/deadmin, @@ -251,7 +248,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, AVerbsHideable()) /client/proc/debug_huds, /client/proc/customiseSNPC, /client/proc/resetSNPC, - ) + )) /client/proc/add_admin_verbs() if(holder) From 724082121cbfd561da5f345cadcb0f780b891343 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 12:23:29 -0500 Subject: [PATCH 053/131] [FUN REMOVAL] Makes fire not able to become ice. --- code/modules/atmospherics/environmental/LINDA_fire.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index a52a725954..bbbc3f12ed 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -64,6 +64,8 @@ setDir(pick(GLOB.cardinal)) air_update_turf() +/obj/effect/hotspot/make_frozen_visual() + return //you take my fun i take yours /obj/effect/hotspot/proc/perform_exposure() var/turf/open/location = loc From 9be1a5db4f57644bfa9986d7339f20d46a9a3713 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 14:32:15 -0500 Subject: [PATCH 054/131] Moves antag datums to the mind --- code/__DEFINES/antagonists.dm | 3 + code/datums/antagonists/antag_datum.dm | 110 +++++-------- code/datums/antagonists/datum_clockcult.dm | 162 +++++++------------ code/datums/antagonists/datum_cult.dm | 63 +++----- code/datums/mind.dm | 54 ++++++- code/game/gamemodes/clock_cult/clock_cult.dm | 18 ++- code/game/gamemodes/cult/cult.dm | 10 +- tgstation.dme | 1 + 8 files changed, 191 insertions(+), 230 deletions(-) create mode 100644 code/__DEFINES/antagonists.dm diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm new file mode 100644 index 0000000000..d30a2d098f --- /dev/null +++ b/code/__DEFINES/antagonists.dm @@ -0,0 +1,3 @@ +#define ANTAG_DATUM_CULT /datum/antagonist/cult +#define ANTAG_DATUM_CLOCKCULT /datum/antagonist/clockcult +#define ANTAG_DATUM_CLOCKCULT_SILENT /datum/antagonist/clockcult/silent \ No newline at end of file diff --git a/code/datums/antagonists/antag_datum.dm b/code/datums/antagonists/antag_datum.dm index cdad092087..deee1111c0 100644 --- a/code/datums/antagonists/antag_datum.dm +++ b/code/datums/antagonists/antag_datum.dm @@ -1,87 +1,49 @@ -//The Datum, Antagonist. Handles various antag things via a datum. /datum/antagonist - var/mob/living/owner //who's our owner and accordingly an antagonist - var/some_flufftext = "yer an antag larry" - var/prevented_antag_datum_type //the type of antag datum that this datum can't coexist with; should probably be a list - var/silent_update = FALSE //if we suppress messages during on_gain, apply_innate_effects, remove_innate_effects, and on_remove + var/name = "Antagonist" -/datum/antagonist/New() - if(!prevented_antag_datum_type) - prevented_antag_datum_type = type + var/datum/mind/owner //Mind that owns this datum -/datum/antagonist/Destroy() - owner = null - return ..() + var/silent = FALSE //Silent will prevent the gain/lose texts to show -/datum/antagonist/proc/can_be_owned(mob/living/new_body) - return new_body && !new_body.has_antag_datum(prevented_antag_datum_type, TRUE) + var/can_coexist_with_others = TRUE //Whether or not the person will be able to have more than one datum + var/list/typecache_datum_blacklist = list() //List of datums this type can't coexist with -/datum/antagonist/proc/give_to_body(mob/living/new_body) //tries to give an antag datum to a mob. cancels out if it can't be owned by the new body - if(new_body && can_be_owned(new_body)) - new_body.antag_datums += src - owner = new_body - on_gain() - . = src //return the datum if successful - else - qdel(src) - . = FALSE -/datum/antagonist/proc/on_gain() //on initial gain of antag datum, do this. should only be called once per datum - apply_innate_effects() - if(!silent_update && some_flufftext) - to_chat(owner, some_flufftext) +/datum/antagonist/New(datum/mind/new_owner) + . = ..() + typecache_datum_blacklist = typecacheof(typecache_datum_blacklist) + if(new_owner) + owner = new_owner -/datum/antagonist/proc/apply_innate_effects() //applies innate effects to the owner, may be called multiple times due to mind transferral, but should only be called once per mob - //antag huds would go here if antag huds were less completely unworkable as-is +/datum/antagonist/proc/on_body_transfer(mob/living/old_body, mob/living/new_body) + remove_innate_effects(old_body) + apply_innate_effects(new_body) -/datum/antagonist/proc/remove_innate_effects() //removes innate effects from the owner, may be called multiple times due to mind transferral, but should only be called once per mob - //also antag huds but see above antag huds a shit +//This handles the application of antag huds/special abilities +/datum/antagonist/proc/apply_innate_effects(mob/living/mob_override) + return -/datum/antagonist/proc/on_remove() //totally removes the antag datum from the owner; can only be called once per owner +//This handles the removal of antag huds/special abilities +/datum/antagonist/proc/remove_innate_effects(mob/living/mob_override) + return + +//Proc called when the datum is given to a mind. +/datum/antagonist/proc/on_gain() + if(owner && owner.current) + if(!silent) + greet() + apply_innate_effects() + +/datum/antagonist/proc/on_removal() remove_innate_effects() - owner.antag_datums -= src + if(owner) + owner.antag_datums -= src + if(!silent && owner.current) + farewell() qdel(src) -/datum/antagonist/proc/transfer_to_new_body(mob/living/new_body) - remove_innate_effects() - if(!islist(new_body.antag_datums)) - new_body.antag_datums = list() - new_body.antag_datums += src - owner.antag_datums -= src - owner = new_body - apply_innate_effects() +/datum/antagonist/proc/greet() + return -//mob var and helper procs/Destroy override -/mob/living - var/list/antag_datums - -/mob/living/Destroy() //TODO: merge this with the living/Destroy() in code\modules\mob\living\living.dm (currently line 29) - if(islist(antag_datums)) - for(var/i in antag_datums) - qdel(i) - antag_datums = null - return ..() - -/mob/living/proc/can_have_antag_datum(datum_type) //if we can have this specific antagonist datum; neccessary, but requires creating a new antag datum each time. - var/datum/antagonist/D = new datum_type() - . = D.can_be_owned(src) //we can't exactly cache the results, either, because conditions might change. avoid use? TODO: better proc - qdel(D) - -/mob/living/proc/gain_antag_datum(datum_type) //tries to give a mob a specific antagonist datum; returns the datum if successful. - if(!islist(antag_datums)) - antag_datums = list() - var/datum/antagonist/D = new datum_type() - . = D.give_to_body(src) - -/mob/living/proc/has_antag_datum(type, check_subtypes) //checks this mob for if it has the antagonist datum. can either check specific type or subtypes - if(!islist(antag_datums)) - return FALSE - for(var/i in antag_datums) - var/datum/antagonist/D = i - if(check_subtypes) - if(istype(D, type)) - return D //if it finds the datum, will return it so you can mess with it - else - if(D.type == type) - return D - return FALSE +/datum/antagonist/proc/farewell() + return \ No newline at end of file diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index 0c39b5a989..ba18e76f02 100644 --- a/code/datums/antagonists/datum_clockcult.dm +++ b/code/datums/antagonists/datum_clockcult.dm @@ -1,92 +1,57 @@ //CLOCKCULT PROOF OF CONCEPT - -/datum/antagonist/clockcultist - prevented_antag_datum_type = /datum/antagonist/clockcultist - some_flufftext = null +/datum/antagonist/clockcult var/datum/action/innate/hierophant/hierophant_network = new() -/datum/antagonist/clockcultist/silent - silent_update = TRUE +/datum/antagonist/clockcult/silent + silent = TRUE -/datum/antagonist/clockcultist/Destroy() +/datum/antagonist/clockcult/Destroy() qdel(hierophant_network) - ..() + return ..() -/datum/antagonist/clockcultist/can_be_owned(mob/living/new_body) - . = ..() - if(.) - . = is_eligible_servant(new_body) - -/datum/antagonist/clockcultist/give_to_body(mob/living/new_body) - if(iscyborg(new_body)) - var/mob/living/silicon/robot/R = new_body - if(R.deployed) - var/mob/living/silicon/ai/AI = R.mainframe - R.undeploy() - var/converted = add_servant_of_ratvar(AI, silent_update) - to_chat(AI, "Anomaly Detected. Returned to core!") //The AI needs to be in its core to properly be converted - return converted - if(!silent_update) - if(issilicon(new_body)) - to_chat(new_body, "You are unable to compute this truth. Your vision glows a brilliant yellow, and all at once it comes to you. Ratvar, the Clockwork Justiciar, \ - lies in exile, derelict and forgotten in an unseen realm.") - else - to_chat(new_body, "[iscarbon(new_body) ? "Your mind is racing! Your body feels incredibly light! ":""]Your world glows a brilliant yellow! All at once it comes to you. \ - Ratvar, the Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm.") - . = ..() - if(!silent_update && new_body) - if(.) - new_body.visible_message("[new_body]'s eyes glow a blazing yellow!") - to_chat(new_body, "Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork Justiciar above all else. \ - Perform his every whim without hesitation.") - else - new_body.visible_message("[new_body] seems to resist an unseen force!") - to_chat(new_body, "And yet, you somehow push it all away.") - -/datum/antagonist/clockcultist/on_gain() - if(SSticker && SSticker.mode && owner.mind) - SSticker.mode.servants_of_ratvar += owner.mind - SSticker.mode.update_servant_icons_added(owner.mind) - if(jobban_isbanned(owner, ROLE_SERVANT_OF_RATVAR)) - INVOKE_ASYNC(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR) - if(owner.mind) - owner.mind.special_role = "Servant of Ratvar" - owner.log_message("Has been converted to the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) - if(issilicon(owner)) +/datum/antagonist/clockcult/on_gain() + if(!owner) + return + var/mob/living/current = owner.current + if(!istype(current)) + return + if(jobban_isbanned(current, ROLE_SERVANT_OF_RATVAR)) + addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0) + owner.current.log_message("Has been converted to the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) + if(issilicon(current)) var/mob/living/silicon/S = owner - if(iscyborg(S) && !silent_update) - to_chat(S, "You have been desynced from your master AI.\n\ - In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.") + if(iscyborg(S) && !silent) + to_chat(S, "You have been desynced from your master AI.") + to_chat(S, "In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.") if(isAI(S)) to_chat(S, "You are able to use your cameras to listen in on conversations.") to_chat(S, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") - else if(isbrain(owner) || isclockmob(owner)) - to_chat(owner, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") + else if(isbrain(current) || isclockmob(current)) + to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") ..() if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) var/datum/game_mode/clockwork_cult/C = SSticker.mode C.present_tasks(owner) //Memorize the objectives -/datum/antagonist/clockcultist/apply_innate_effects() - GLOB.all_clockwork_mobs += owner - owner.faction |= "ratvar" - owner.grant_language(/datum/language/ratvar) - owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them for whatever reason, we need to update buttons - if(issilicon(owner)) - var/mob/living/silicon/S = owner +/datum/antagonist/clockcult/apply_innate_effects(mob/living/mob_override) + . = ..() + var/mob/living/current = owner.current + if(istype(mob_override)) + current = mob_override + GLOB.all_clockwork_mobs += current + SSticker.mode.update_servant_icons_added(owner) + current.faction |= "ratvar" + current.grant_language(/datum/language/ratvar) + current.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them for whatever reason, we need to update buttons + if(issilicon(current)) + var/mob/living/silicon/S = current if(iscyborg(S)) var/mob/living/silicon/robot/R = S - if(!R.shell) - R.UnlinkSelf() + R.UnlinkSelf() R.module.rebuild_modules() else if(isAI(S)) var/mob/living/silicon/ai/A = S - A.can_be_carded = FALSE A.requires_power = POWER_REQ_CLOCKCULT - var/list/AI_frame = list(mutable_appearance('icons/mob/clockwork_mobs.dmi', "aiframe")) //make the AI's cool frame - for(var/d in GLOB.cardinal) - AI_frame += image('icons/mob/clockwork_mobs.dmi', A, "eye[rand(1, 10)]", dir = d) //the eyes are randomly fast or slow - A.add_overlay(AI_frame) if(!A.lacks_power()) A.ai_restore_power() if(A.eyeobj) @@ -106,58 +71,55 @@ hierophant_network.title = "Silicon" hierophant_network.span_for_name = "nezbere" hierophant_network.span_for_message = "brass" - else if(isbrain(owner)) - hierophant_network.Grant(owner) + else if(isbrain(current)) + hierophant_network.Grant(current) hierophant_network.title = "Vessel" hierophant_network.span_for_name = "nezbere" hierophant_network.span_for_message = "alloy" - else if(isclockmob(owner)) - hierophant_network.Grant(owner) + else if(isclockmob(current)) + hierophant_network.Grant(current) hierophant_network.title = "Construct" hierophant_network.span_for_name = "nezbere" hierophant_network.span_for_message = "brass" - owner.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump) + current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump) if(!GLOB.clockwork_gateway_activated) - owner.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs) - ..() + current.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs) + update_slab_info() -/datum/antagonist/clockcultist/remove_innate_effects() - GLOB.all_clockwork_mobs -= owner - owner.faction -= "ratvar" - owner.remove_language(/datum/language/ratvar) - owner.clear_alert("clockinfo") - owner.clear_alert("scripturereq") - for(var/datum/action/innate/function_call/F in owner.actions) //Removes any bound Ratvarian spears + +/datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override) + var/mob/living/current = owner.current + if(istype(mob_override)) + current = mob_override + GLOB.all_clockwork_mobs -= current + current.faction -= "ratvar" + current.remove_language(/datum/language/ratvar) + current.clear_alert("clockinfo") + current.clear_alert("scripturereq") + for(var/datum/action/innate/function_call/F in owner.current.actions) //Removes any bound Ratvarian spears qdel(F) - if(issilicon(owner)) - var/mob/living/silicon/S = owner + if(issilicon(current)) + var/mob/living/silicon/S = current if(isAI(S)) var/mob/living/silicon/ai/A = S - A.can_be_carded = initial(A.can_be_carded) A.requires_power = initial(A.requires_power) - A.cut_overlays() S.make_laws() S.update_icons() S.show_laws() - var/mob/living/temp_owner = owner + var/mob/living/temp_owner = current ..() if(iscyborg(temp_owner)) var/mob/living/silicon/robot/R = temp_owner R.module.rebuild_modules() if(temp_owner) temp_owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them, we need to update buttons + update_slab_info() -/datum/antagonist/clockcultist/on_remove() - if(!silent_update) - owner.visible_message("[owner] seems to have remembered their true allegiance!", \ +/datum/antagonist/clockcult/on_removal() + . = ..() + if(!silent) + owner.current.visible_message("[owner] seems to have remembered their true allegiance!", \ "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") - if(SSticker && SSticker.mode && owner.mind) - SSticker.mode.servants_of_ratvar -= owner.mind - SSticker.mode.update_servant_icons_removed(owner.mind) - if(owner.mind) - owner.mind.wipe_memory() - owner.mind.special_role = null - owner.log_message("Has renounced the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) - if(iscyborg(owner)) - to_chat(owner, "Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.") - ..() + owner.current.log_message("Has renounced the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) + if(iscyborg(owner.current)) + to_chat(owner.current, "Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.") \ No newline at end of file diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index 7d6806bab6..69c9849782 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -1,50 +1,33 @@ -/datum/antagonist/cultist - prevented_antag_datum_type = /datum/antagonist/cultist - some_flufftext = null - var/datum/action/innate/cultcomm/communion = new() +/datum/antagonist/cult + var/datum/action/innate/cultcomm/communion = new -/datum/antagonist/cultist/Destroy() +/datum/antagonist/cult/Destroy() qdel(communion) return ..() -/datum/antagonist/cultist/can_be_owned(mob/living/new_body) +/datum/antagonist/cult/on_gain() . = ..() - if(.) - . = is_convertable_to_cult(new_body) + if(!owner) + return + if(jobban_isbanned(owner.current, ROLE_CULTIST)) + addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST), 0) + owner.current.log_message("Has been converted to the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) -/datum/antagonist/cultist/on_gain() - if(SSticker && SSticker.mode && owner.mind) - SSticker.mode.cult += owner.mind - SSticker.mode.update_cult_icons_added(owner.mind) - if(istype(SSticker.mode, /datum/game_mode/cult)) - var/datum/game_mode/cult/C = SSticker.mode - C.memorize_cult_objectives(owner.mind) - if(jobban_isbanned(owner, ROLE_CULTIST)) - INVOKE_ASYNC(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST) - if(owner.mind) - owner.mind.special_role = "Cultist" - owner.log_message("Has been converted to the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) - ..() - -/datum/antagonist/cultist/apply_innate_effects() - owner.faction |= "cult" - owner.verbs += /mob/living/proc/cult_help +/datum/antagonist/cult/apply_innate_effects() + . = ..() + owner.current.faction |= "cult" + owner.current.verbs += /mob/living/proc/cult_help communion.Grant(owner) - ..() -/datum/antagonist/cultist/remove_innate_effects() - owner.faction -= "cult" - owner.verbs -= /mob/living/proc/cult_help - ..() +/datum/antagonist/cult/remove_innate_effects() + . = ..() + owner.current.faction -= "cult" + owner.current.verbs -= /mob/living/proc/cult_help -/datum/antagonist/cultist/on_remove() - if(owner.mind) - owner.mind.wipe_memory() - if(SSticker && SSticker.mode) - SSticker.mode.cult -= owner.mind - SSticker.mode.update_cult_icons_removed(owner.mind) + +/datum/antagonist/cult/on_removal() + . = ..() to_chat(owner, "An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.") - owner.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) - if(!silent_update) - owner.visible_message("[owner] looks like [owner.p_they()] just reverted to their old faith!") - ..() + owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) + if(!silent) + owner.current.visible_message("[owner] looks like [owner.current.p_they()] just reverted to their old faith!") \ No newline at end of file diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 5a6c34bcc4..5a1ba5b8c5 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -54,6 +54,7 @@ var/linglink var/miming = 0 // Mime's vow of silence + var/list/antag_datums = list() var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD var/datum/gang/gang_datum //Which gang this mind belongs to, if any @@ -86,13 +87,13 @@ if(new_character.mind) //disassociate any mind currently in our new body's mind variable new_character.mind.current = null - if(istype(current) && islist(current.antag_datums)) //wow apparently current isn't always living good fucking job SOMEONE - for(var/i in current.antag_datums) - var/datum/antagonist/D = i - D.transfer_to_new_body(new_character) var/datum/atom_hud/antag/hud_to_transfer = antag_hud//we need this because leave_hud() will clear this list + var/mob/living/old_current = current current = new_character //associate ourself with our new body new_character.mind = src //and associate our new body with ourself + for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body + var/datum/antagonist/A = a + A.on_body_transfer(old_current, current) if(iscarbon(new_character)) var/mob/living/carbon/C = new_character C.last_mind = src @@ -108,6 +109,51 @@ /datum/mind/proc/wipe_memory() memory = null +// Datum antag mind procs +/datum/mind/proc/add_antag_datum(datum_type, on_gain = TRUE) + if(!datum_type) + return + if(!can_hold_antag_datum(datum_type)) + return + var/datum/antagonist/A = new datum_type(src) + antag_datums += A + if(on_gain) + A.on_gain() + +/datum/mind/proc/remove_antag_datum(datum_type) + if(!datum_type) + return + var/datum/antagonist/A = has_antag_datum(datum_type) + if(A) + A.on_removal() + +/datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us. + for(var/a in antag_datums) + var/datum/antagonist/A = a + A.on_removal() + +/datum/mind/proc/has_antag_datum(datum_type, check_subtypes = TRUE) + if(!datum_type) + return + . = FALSE + for(var/a in antag_datums) + var/datum/antagonist/A = a + if(check_subtypes && istype(A, datum_type)) + return A + else if(A.type == datum_type) + return A + +/datum/mind/proc/can_hold_antag_datum(datum_type) + if(!datum_type) + return + . = TRUE + if(has_antag_datum(datum_type)) + return FALSE + for(var/i in antag_datums) + var/datum/antagonist/A = i + if(is_type_in_typecache(A, A.typecache_datum_blacklist)) + return FALSE + /* Removes antag type's references from a mind. diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 670e08e7a2..65e6b4ca6b 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -46,7 +46,7 @@ Credit where due: /////////// /proc/is_servant_of_ratvar(mob/living/M) - return istype(M) && M.has_antag_datum(/datum/antagonist/clockcultist, TRUE) + return istype(M) && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_CLOCKCULT) /proc/is_eligible_servant(mob/living/M) if(!istype(M)) @@ -65,17 +65,21 @@ Credit where due: return FALSE /proc/add_servant_of_ratvar(mob/living/L, silent = FALSE) - var/update_type = /datum/antagonist/clockcultist + if(!L || !L.mind) + return + var/update_type = ANTAG_DATUM_CLOCKCULT if(silent) - update_type = /datum/antagonist/clockcultist/silent - . = L.gain_antag_datum(update_type) + update_type = ANTAG_DATUM_CLOCKCULT_SILENT + . = L.mind.add_antag_datum(update_type) /proc/remove_servant_of_ratvar(mob/living/L, silent = FALSE) - var/datum/antagonist/clockcultist/clock_datum = L.has_antag_datum(/datum/antagonist/clockcultist, TRUE) + if(!L || !L.mind) + return + var/datum/antagonist/clockcult/clock_datum = L.mind.has_antag_datum(/datum/antagonist/clockcult) if(!clock_datum) return FALSE - clock_datum.silent_update = silent - clock_datum.on_remove() + clock_datum.silent = silent + clock_datum.on_removal() return TRUE /////////////// diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 65dcb863eb..6d188ae8e9 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -5,7 +5,7 @@ var/list/cult_objectives = list() /proc/iscultist(mob/living/M) - return istype(M) && M.has_antag_datum(/datum/antagonist/cultist, TRUE) + return istype(M) && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_CULT) /proc/is_sacrifice_target(datum/mind/mind) if(SSticker.mode.name == "cult") @@ -158,18 +158,18 @@ /datum/game_mode/proc/add_cultist(datum/mind/cult_mind, stun) //BASE if (!istype(cult_mind)) return 0 - if(cult_mind.current.gain_antag_datum(/datum/antagonist/cultist)) + if(cult_mind.add_antag_datum(ANTAG_DATUM_CULT)) if(stun) cult_mind.current.Paralyse(5) return 1 /datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1, stun) if(cult_mind.current) - var/datum/antagonist/cultist/cult_datum = cult_mind.current.has_antag_datum(/datum/antagonist/cultist, TRUE) + var/datum/antagonist/cult/cult_datum = cult_mind.has_antag_datum(ANTAG_DATUM_CULT) if(!cult_datum) return FALSE - cult_datum.silent_update = show_message - cult_datum.on_remove() + cult_datum.silent = show_message + cult_datum.on_removal() if(stun) cult_mind.current.Paralyse(5) return TRUE diff --git a/tgstation.dme b/tgstation.dme index 1647912f6c..c20dfa0110 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -24,6 +24,7 @@ #include "code\__DATASTRUCTURES\priority_queue.dm" #include "code\__DATASTRUCTURES\stacks.dm" #include "code\__DEFINES\admin.dm" +#include "code\__DEFINES\antagonists.dm" #include "code\__DEFINES\atmospherics.dm" #include "code\__DEFINES\atom_hud.dm" #include "code\__DEFINES\callbacks.dm" From 0ae4f76fb91f33adca895ffa8b3228c52dbb03e7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 15:12:51 -0500 Subject: [PATCH 055/131] Winter Wonderland holodeck no longer has freon, and it's no longer restricted --- _maps/map_files/generic/Centcomm.dmm | 16 ++++++++-------- code/game/area/areas/holodeck.dm | 7 +++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 6782e4cce4..d36c5165dc 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -20,7 +20,7 @@ /turf/closed/indestructible/riveted, /area/space) "af" = ( -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "ag" = ( /obj/structure/window/reinforced{ @@ -141,7 +141,7 @@ /area/space) "ax" = ( /obj/structure/flora/bush, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "ay" = ( /obj/item/toy/snowball{ @@ -155,7 +155,7 @@ /obj/item/toy/snowball{ pixel_x = -4 }, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "az" = ( /turf/open/floor/holofloor{ @@ -216,7 +216,7 @@ /area/holodeck/rec_center/court) "aI" = ( /obj/structure/flora/grass/brown, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aJ" = ( /obj/structure/table, @@ -268,7 +268,7 @@ /obj/structure/statue/snow/snowman{ anchored = 1 }, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aP" = ( /obj/structure/chair/wood/normal{ @@ -282,7 +282,7 @@ /area/holodeck/rec_center/lounge) "aQ" = ( /obj/structure/chair/wood/wings, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aR" = ( /obj/structure/window/reinforced/tinted{ @@ -303,11 +303,11 @@ /area/holodeck/rec_center/lounge) "aT" = ( /obj/structure/flora/tree/pine, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aU" = ( /obj/structure/chair/wood, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aV" = ( /obj/structure/table/wood, diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index c4b4e02f7b..7bf213be52 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -96,16 +96,15 @@ /area/holodeck/rec_center/kobayashi name = "Holodeck - Kobayashi Maru" +/area/holodeck/rec_center/winterwonderland + name = "Holodeck - Winter Wonderland" + // Bad programs /area/holodeck/rec_center/burn name = "Holodeck - Atmospheric Burn Test" restricted = 1 -/area/holodeck/rec_center/winterwonderland - name = "Holodeck - Winter Wonderland" - restricted = 1 - /area/holodeck/rec_center/wildlife name = "Holodeck - Wildlife Simulation" restricted = 1 From fc9e2a46d680154ee1ff031fc18bc8e7aad5fed3 Mon Sep 17 00:00:00 2001 From: TalkingCactus Date: Mon, 1 May 2017 05:29:35 -0400 Subject: [PATCH 056/131] fixes #618 (#675) --- code/citadel/organs/genitals.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/citadel/organs/genitals.dm b/code/citadel/organs/genitals.dm index 4066295350..c129d8e8fa 100644 --- a/code/citadel/organs/genitals.dm +++ b/code/citadel/organs/genitals.dm @@ -16,7 +16,8 @@ /obj/item/organ/genital/Initialize() . = ..() - reagents = create_reagents(fluid_max_volume) + if(!reagents) + create_reagents(fluid_max_volume) update() /obj/item/organ/genital/Destroy() From e4adf5d524ac9dd51b18427df9d6fe5a41d86a08 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:24:37 -0500 Subject: [PATCH 057/131] Buffs jump boot dash speed --- code/modules/clothing/shoes/miscellaneous.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 2cdd1dfb87..25e09b9af7 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -178,6 +178,7 @@ pockets = /obj/item/weapon/storage/internal/pocket/shoes actions_types = list(/datum/action/item_action/bhop) var/jumpdistance = 5 //-1 from to see the actual distance, e.g 4 goes over 3 tiles + var/jumpspeed = 3 var/recharging_rate = 60 //default 6 seconds between each dash var/recharging_time = 0 //time until next dash var/jumping = FALSE //are we mid-jump? @@ -198,7 +199,7 @@ jumping = TRUE playsound(src.loc, 'sound/effects/stealthoff.ogg', 50, 1, 1) usr.visible_message("[usr] dashes foward into the air!") - usr.throw_at(target, jumpdistance, 1, spin=0, diagonals_first = 1, callback = CALLBACK(src, .proc/hop_end)) + usr.throw_at(target, jumpdistance, jumpspeed, spin=0, diagonals_first = 1, callback = CALLBACK(src, .proc/hop_end)) /obj/item/clothing/shoes/bhop/proc/hop_end() jumping = FALSE @@ -214,4 +215,4 @@ name = "blue performer's boots" desc = "These boots were made for dancing." icon_state = "bsing" - put_on_delay = 50 \ No newline at end of file + put_on_delay = 50 From 87e306851dfe2b7da830ee17b2854965e286b4dd Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:24:41 -0500 Subject: [PATCH 058/131] Readds deepstorage w/ tweaks AND adds water bottles to vending machines --- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 6741 +++++++++++++++++ code/datums/ruins/space.dm | 7 + code/game/machinery/vending.dm | 5 +- .../reagents/reagent_containers/glass.dm | 24 + icons/obj/drinks.dmi | Bin 63973 -> 64535 bytes icons/obj/reagentfillings.dmi | Bin 2493 -> 3125 bytes 6 files changed, 6775 insertions(+), 2 deletions(-) create mode 100644 _maps/RandomRuins/SpaceRuins/deepstorage.dmm diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm new file mode 100644 index 0000000000..785d2e9456 --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -0,0 +1,6741 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/turf/closed/mineral/random/low_chance, +/area/ruin/unpowered) +"ac" = ( +/turf/closed/wall/mineral/iron, +/area/ruin/deepstorage) +"ad" = ( +/obj/structure/closet/cardboard, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ae" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/storage/box/monkeycubes, +/obj/item/weapon/storage/box/monkeycubes, +/obj/item/weapon/storage/box/monkeycubes, +/obj/item/weapon/storage/toolbox/drone, +/obj/item/weapon/storage/toolbox/drone, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"af" = ( +/obj/structure/closet/cardboard, +/obj/item/stack/sheet/cardboard, +/obj/item/stack/cable_coil, +/obj/item/stack/sheet/mineral/wood, +/obj/item/stack/sheet/mineral/wood, +/obj/item/stack/packageWrap, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ag" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/storage/box/mousetraps, +/obj/item/weapon/storage/box/mousetraps, +/obj/item/weapon/storage/box/drinkingglasses, +/obj/item/weapon/storage/box/zipties, +/obj/item/weapon/switchblade, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ah" = ( +/obj/structure/closet/cardboard, +/obj/item/stack/sheet/metal{ + amount = 50; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/sheet/metal{ + amount = 50; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/sheet/metal{ + amount = 50; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/sheet/metal{ + amount = 50; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ai" = ( +/obj/structure/closet/cardboard, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"aj" = ( +/obj/structure/closet/cardboard, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/weapon/shovel, +/obj/item/weapon/pickaxe/drill, +/obj/item/weapon/pickaxe/drill, +/obj/item/weapon/pickaxe/drill, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ak" = ( +/obj/structure/closet/cardboard, +/obj/item/device/flashlight/lantern, +/obj/item/device/flashlight/lantern, +/obj/item/device/flashlight/lantern, +/obj/item/device/tape/random, +/obj/item/device/tape/random, +/obj/item/device/tape/random, +/obj/item/weapon/storage/box/rxglasses, +/obj/item/weapon/extinguisher, +/obj/item/weapon/extinguisher, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"al" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/storage/box/syringes, +/obj/item/weapon/storage/box/syringes, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/storage/box/matches, +/obj/item/weapon/storage/box/bodybags, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"am" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/kitchen/knife, +/obj/item/weapon/kitchen/knife, +/obj/item/weapon/cultivator, +/obj/item/weapon/hatchet, +/obj/item/weapon/kitchen/rollingpin, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"an" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/defibrillator, +/obj/item/weapon/storage/box/medipens, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ao" = ( +/obj/structure/closet/cardboard, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ap" = ( +/obj/structure/closet/crate/freezer, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/random, +/obj/item/weapon/reagent_containers/blood/random, +/obj/item/weapon/reagent_containers/blood/random, +/obj/item/weapon/reagent_containers/blood/random, +/obj/item/weapon/reagent_containers/blood/random, +/obj/item/weapon/reagent_containers/blood/random, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"aq" = ( +/obj/machinery/iv_drip, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"ar" = ( +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"as" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"at" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"au" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Bunker" + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"av" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"aw" = ( +/obj/structure/mirror{ + pixel_x = 30 + }, +/obj/structure/sink{ + dir = 4; + icon_state = "sink"; + pixel_x = 11; + pixel_y = 0 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"ax" = ( +/obj/structure/table, +/obj/item/weapon/storage/toolbox/drone, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"ay" = ( +/obj/structure/table, +/obj/item/weapon/gun/ballistic/automatic/wt550{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/weapon/gun/ballistic/automatic/wt550{ + pixel_x = 2; + pixel_y = 0 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 30 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"az" = ( +/obj/structure/table, +/obj/item/weapon/storage/backpack/dufflebag/sec{ + contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); + desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; + name = "dufflebag"; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aA" = ( +/obj/structure/table, +/obj/item/device/radio{ + pixel_x = -4 + }, +/obj/item/device/radio, +/obj/item/device/radio{ + pixel_x = 4 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aB" = ( +/obj/structure/table, +/obj/item/stack/sheet/metal{ + amount = 50; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aC" = ( +/obj/structure/table, +/obj/item/weapon/storage/firstaid/brute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/brute, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aD" = ( +/obj/structure/table, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/regular, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aE" = ( +/obj/structure/closet/crate/radiation, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aF" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"aG" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"aH" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aI" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/wood, +/area/ruin/deepstorage) +"aJ" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/ruin/deepstorage) +"aK" = ( +/obj/structure/bed, +/turf/open/floor/wood, +/area/ruin/deepstorage) +"aL" = ( +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"aM" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"aN" = ( +/obj/structure/table, +/obj/item/clothing/gloves/combat{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/clothing/gloves/combat{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"aO" = ( +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aP" = ( +/obj/structure/table, +/obj/item/device/mass_spectrometer/adv, +/obj/item/device/mass_spectrometer/adv, +/obj/item/device/healthanalyzer, +/obj/item/device/healthanalyzer, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/gauze, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"aQ" = ( +/obj/structure/closet/radiation, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aR" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aS" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"aT" = ( +/obj/structure/closet/wardrobe/pink, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/ruin/deepstorage) +"aU" = ( +/turf/open/floor/wood, +/area/ruin/deepstorage) +"aV" = ( +/obj/structure/bed, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/ruin/deepstorage) +"aW" = ( +/obj/machinery/shower{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"aX" = ( +/obj/machinery/shower{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"aY" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/pill_bottle/charcoal, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"aZ" = ( +/obj/structure/table, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare{ + pixel_y = 6 + }, +/obj/item/device/flashlight/flare, +/obj/item/weapon/crowbar/red, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"ba" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bb" = ( +/obj/structure/closet/wardrobe/pjs, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ruin/deepstorage) +"bc" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/ruin/deepstorage) +"bd" = ( +/obj/structure/bed, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/ruin/deepstorage) +"be" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/item/weapon/soap, +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"bf" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ruin/deepstorage) +"bg" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bh" = ( +/obj/structure/closet/cardboard, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bi" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Bunker" + }, +/turf/open/floor/wood, +/area/ruin/deepstorage) +"bj" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Bunker" + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/deepstorage) +"bk" = ( +/obj/structure/fireaxecabinet{ + pixel_y = 30 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bl" = ( +/obj/machinery/sleeper{ + icon_state = "sleeper-open"; + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bm" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bn" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bo" = ( +/obj/machinery/sleeper{ + icon_state = "sleeper-open"; + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bp" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Bunker" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bq" = ( +/obj/machinery/processor{ + name = "processor" + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"br" = ( +/obj/structure/table, +/obj/item/weapon/storage/box/matches, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bs" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bt" = ( +/obj/structure/table, +/obj/machinery/recharger, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bu" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/light, +/area/ruin/deepstorage) +"bv" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/floor/light, +/area/ruin/deepstorage) +"bw" = ( +/obj/machinery/blackbox_recorder, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bx" = ( +/obj/structure/cable{ + icon_state = "0-4"; + d2 = 4 + }, +/obj/machinery/power/port_gen/pacman, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"by" = ( +/obj/machinery/power/smes/magical{ + desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; + name = "power storage unit" + }, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1; + d2 = 2 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bz" = ( +/obj/machinery/telecomms/relay/preset/telecomms, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bA" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bB" = ( +/obj/machinery/biogenerator, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bC" = ( +/obj/machinery/light, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/light, +/area/ruin/deepstorage) +"bD" = ( +/obj/machinery/autolathe, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bE" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/power/terminal{ + icon_state = "term"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bF" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bG" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bH" = ( +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bI" = ( +/obj/structure/table, +/obj/item/weapon/storage/box/donkpockets, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bJ" = ( +/obj/structure/table, +/obj/item/weapon/reagent_containers/food/snacks/beans, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bK" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bL" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bM" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "Bunker APC"; + pixel_x = -24; + pixel_y = 0 + }, +/obj/structure/cable{ + icon_state = "0-4"; + d2 = 4 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bN" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bO" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bP" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bQ" = ( +/obj/structure/table, +/obj/item/weapon/kitchen/knife, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bR" = ( +/obj/structure/table, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bS" = ( +/obj/structure/table, +/obj/item/weapon/kitchen/fork, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bT" = ( +/obj/machinery/vending/hydronutrients, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bU" = ( +/obj/machinery/space_heater, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"bV" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bW" = ( +/obj/structure/table/reinforced, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"bX" = ( +/obj/machinery/smartfridge, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bY" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/bar, +/area/ruin/deepstorage) +"bZ" = ( +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"ca" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"cb" = ( +/obj/structure/chair/office/dark, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"cc" = ( +/obj/structure/frame/computer, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"cd" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/security/telescreen{ + dir = 1; + name = "Bunker Entrance"; + network = list("Bunker1"); + pixel_x = 0; + pixel_y = 2 + }, +/turf/open/floor/plasteel, +/area/ruin/deepstorage) +"ce" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "bunker1"; + name = "Inner Doors"; + pixel_y = 6 + }, +/obj/machinery/button/door{ + id = "bunker2"; + name = "Outer Doors"; + pixel_y = -4 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/deepstorage) +"cf" = ( +/obj/machinery/door/poddoor{ + id = "bunker1"; + name = "Bunker Door"; + tag = "inner" + }, +/turf/open/floor/plating, +/area/ruin/deepstorage) +"cg" = ( +/turf/open/floor/plating, +/area/ruin/deepstorage) +"ch" = ( +/obj/machinery/camera{ + network = list("Bunker1") + }, +/turf/open/floor/plating, +/area/ruin/deepstorage) +"ci" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/deepstorage) +"cj" = ( +/obj/machinery/door/poddoor{ + id = "bunker2"; + name = "Bunker Door"; + tag = "outer" + }, +/turf/open/floor/plating, +/area/ruin/deepstorage) +"ck" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/deepstorage) + +(1,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(3,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(4,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(5,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(6,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(7,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(8,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(9,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +"} +(10,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(11,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(12,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(13,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(14,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(15,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(16,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(17,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(18,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(19,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(20,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(21,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(22,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(23,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ck +ck +ck +ab +ab +ab +ab +ab +"} +(24,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ab +ck +ck +ck +ck +ck +ck +ck +ck +ab +ab +ab +"} +(25,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +bl +bo +ac +bw +bD +bM +bU +ca +ar +cf +cg +cg +ac +ck +ck +ck +ck +ck +ck +ck +ck +ck +ck +ab +ab +"} +(26,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ar +ar +ac +bx +ar +bN +ar +aO +ar +cf +cg +cg +ac +ck +ck +ck +ck +ck +ck +ck +ck +ck +ck +ck +ck +"} +(27,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +bp +ac +by +bE +bO +aO +ar +aO +ac +cg +cg +ac +ck +ck +ck +ck +ck +ck +ck +ck +ck +ck +ck +ck +"} +(28,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aI +aT +bb +ac +ar +aO +ac +bz +aO +aO +ar +aO +cd +ac +ch +cg +cj +ck +ck +ck +ck +ab +ab +ab +ck +ck +ck +ck +ck +"} +(29,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aJ +aU +bc +bi +ar +ar +ac +aO +ar +aO +ar +cb +cc +ac +ci +cg +cj +ck +ck +ck +ck +ab +ab +ab +ab +ck +ck +ck +ck +"} +(30,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aK +aV +bd +ac +ar +aO +au +ar +ar +aO +bV +aO +ce +ac +ac +ac +ac +ck +ck +ab +ab +ab +ab +ab +ab +ab +ab +ck +ck +"} +(31,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +bm +aO +ac +bA +bF +bP +bW +cc +bW +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(32,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +av +aL +aW +be +ac +aO +aO +ac +ac +ac +ac +ac +ac +ac +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(33,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aw +aM +aX +aX +bj +aO +aO +ar +ar +bG +bQ +bX +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(34,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +aO +aO +aO +ar +bH +bH +bY +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(35,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ax +aN +aY +ac +bk +ar +bq +ac +ar +bI +bR +bH +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(36,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ay +ar +ar +bf +ar +ar +br +ac +aO +bJ +bS +bH +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(37,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +az +aO +aO +bf +aO +ar +bs +ac +aO +bK +bK +bH +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(38,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aA +ar +aO +au +aO +aO +bt +ac +ar +ar +ar +ar +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(39,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aB +ar +aO +bf +aO +aO +aO +aO +aO +ar +ar +aO +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(40,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aC +aO +ar +bf +aO +bn +aO +aO +bB +bL +bT +bZ +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(41,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +aD +aP +aZ +ac +au +ac +ac +au +ac +ac +ac +ac +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(42,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ad +aj +ap +ac +ac +ac +ac +ac +aO +ac +bu +aO +bC +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(43,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ae +ak +aq +ac +aE +aQ +ba +ba +aO +ac +bv +aO +bv +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(44,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +af +al +ar +au +ar +ar +aO +aO +ar +ac +bv +aO +bv +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(45,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ag +am +ar +ac +aF +aR +aR +bg +bg +ac +bu +aO +bC +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(46,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ah +an +as +ac +aG +aR +aR +bh +bh +ac +ac +ac +ac +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(47,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ai +ao +at +ac +aH +aS +aH +aH +aH +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(48,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +aH +aH +aH +aH +aH +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(49,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +ac +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(50,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(51,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(52,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(53,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(54,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(55,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(56,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +"} +(57,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(58,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(59,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(60,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(61,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(62,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(63,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(64,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(65,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(66,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(67,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(68,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(69,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(70,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(71,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(72,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(73,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(74,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(75,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(76,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +"} +(77,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +"} +(78,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +"} +(79,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +"} +(80,1,1) = {" +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +"} +(81,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +"} +(82,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +"} +(83,1,1) = {" +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(84,1,1) = {" +aa +aa +ab +ab +ab +aa +aa +ab +ab +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(85,1,1) = {" +aa +aa +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index ab55919a03..36883c59fe 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -43,6 +43,13 @@ name = "Asteroid 5" description = "Oh my god, another giant rock!" +/datum/map_template/ruin/space/deep_storage + id = "deep-storage" + suffix = "deepstorage.dmm" + name = "Survivalist Bunker" + description = "Assume the best, prepare for the worst. Generally, you should do so by digging a three man heavily fortified bunker into a giant unused asteroid. \ + Then make it self sufficient, mask any evidence of construction, hook it covertly into the telecommunications network and hope for the best." + /datum/map_template/ruin/space/bigderelict1 id = "bigderelict1" suffix = "bigderelict1.dmm" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index cbb4efd6b0..021b65743f 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -732,7 +732,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "sustenance" products = list(/obj/item/weapon/reagent_containers/food/snacks/tofu = 24, /obj/item/weapon/reagent_containers/food/drinks/ice = 12, - /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6) + /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6, + /obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/weapon/kitchen/knife = 6, /obj/item/weapon/reagent_containers/food/drinks/coffee = 12, /obj/item/weapon/tank/internals/emergency_oxygen = 6, @@ -749,7 +750,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10) + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 6) premium = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/air = 1) refill_canister = /obj/item/weapon/vending_refill/cola diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 10b584cdfb..726a21c58a 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -279,3 +279,27 @@ slot_equipment_priority.Insert(index, slot_head) return return ..() + +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle + name = "bottle of water" + desc = "A bottle of water filled at an old Earth bottling facility," + icon = 'icons/obj/drinks.dmi' + icon_state = "smallbottle" + item_state = "bottle" + list_reagents = list("water" = 49.5, "fluorine" = 0.5)//see desc, don't think about it too hard + materials = list(MAT_GLASS=0) + volume = 50 + amount_per_transfer_from_this = 10 + origin_tech = null + +/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large + desc = "A fresh commercial-sized bottle of water." + icon_state = "largebottle" + materials = list(MAT_GLASS=0) + list_reagents = list("water" = 100) + volume = 100 + amount_per_transfer_from_this = 20 + + + + diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 6067b02ad329009de1fcedfc6ba419a93a9821ab..69f6c087111f8f08d346ea815cd89a0bba8546cc 100644 GIT binary patch delta 9421 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 ADF6Tf diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 38c47790fc14a0032961c00127c0b8611ac936f9..aa4a6fc29953f29bdf3de64e3bf18608a96f4d6d 100644 GIT binary patch literal 3125 zcmb_edpr|*8~^RnsN5+OQWSN%OOrGsk}?NN7tQ@%a-A@4s7B!q$QiRy-{W3MC?9^0Do6wRxeo-}{Kjy0tTEe#by&+Atm zRQGIujU;N{(r{_5+PGe1k#;3v`QyNo)L#i#T7D4hDu2CowWb3WqjW7R*1(Rtts$o3 z17}G_=AHy|&!>}n_D%0i5eBrYdu!{Q8ED*aTg$m%rrn{W$<8EEvbF{OTj(D3f@kdx zv=w42L*<6}=03S0;u7Kh{o%dJ9`^8zyPT;Y7TFqRcQ}ZncC&hF$a-A6GX00}h&AlE z+M1HxcjJ$nO~@NHEzvVV$wlr7K~3vC@=jV#yCUrXSW#kcV|6SxTkyFwvhRq-o5=?b zYu*TIF0OQbBZfJ(`Mp2Qk#pv0w>})P;%sYt=v)U=pB>{m`$`ad!YoeM>5ns>cp3?zG(|f!mivPiF1qQ>RlWI>&lbcU2gG z@aI@q$(cav3;g|`b63JCb{=vZOK+{knDKd>4#a)tU6ecf1RTA5nKg}AueQLvWm#p>R-=eSd6!`9>^TKErky{wM@jmOTF1@@VuTVAHR^)*IU{i?b{-R1%P|ImwFUP3yQK<__Nr#qxA=Mu6U1Ew*(kemY*^xFO?D1 zqMsJFLP3F7c`rT>l|`ZW@MRwTpMw3byxo>S7l^Tq0?emlzHlHa7|=2-Hdzjs$K0TP za^&_X(3g4u#0G2HMmT4MWTy>MCXSqM%X*7>X77pF^h=#rIFV?YgJ2k&CnZf24ydZm zO$$!9y*}G(+kU^B_ik#ce4u6Y_8B!`)^BGwa8&sfRuto`fm{XUiQM=qJH_)gNl7@< zi8aS>z8lK#z9}W`Kq8T4R0kzjYsyC8R7a?}BO>HTp2ZP^16G%@g$?fk;$mXarke+Q zb6tZGPJ!ge?AGZ=Nb*u|aRv&y`eRGHCBC#a>8s<*=#{s17kbBP;}+T#C;+&<*Qpb7r@X3hO`nN+nRVyxK*e|_Ti7h)vf~fQ9HwcR z02bEu!+fAD&GhlAMcJ+Y0Gve=Bp`mfogr~Pie_}=E-Se>6dub^+a*7^{YaVcLq}Ia zAGj6sNjH(7wW|;5(KM*jUTa59YWz$@H4Qf2K!d&q;fRR@i|fDC4^2)+Ry#-+r9Kfl z1I;7fXK%d5e&a?VEZa611p+aPB+Z^Y{MG+Z$@q+K6d!5j&0b|1CB!38ZPr34XFfKY zT4rRwp?=8ePV*zfPem++@Te%KcuSVW(nxd0@UUfC+9W-UEf1yHx*VloQ#H%%CSM9o zy~AbL{ylWCu@_ErkDLLrGKiSCM{N@389%2>tyFXZp;jsyh(vjBKwhP5oPZnGgX!-V zAv;N`H+VeW@RWEnYX11^4Pg+kT($R$mic6AT^Xnya{)Rt;G1SjSBj@-zO-gCBXB~Z zd86B?B~&L}cbZ9(%D|-peMY?vB|?_mGhvbw61MdV#DeZ(6ZpJ_SGwVM5wE)o;UzX^ ze^lDucK_&;Nf$^s^W-(Z(!-bt{ur~d-^)@*Nl0q7c&n1H( zhc3UssS-1(j&`z%5LAuRQ$NpSH;0>9C=sSURvadgNOwj@M>C+su%*^v-vwuK97iWE zH8?BeIPV21$Au0_aqRWKJI$avvfX)1kKz$7caun}BV{y*G;r}!^G9Nk{7JwiG806e zT32>R$2Zn&mKpYAvgu^BMgwYbgqF$MTq2f4+b?6C*?qNqbfU8V2~i+2v{$oFHxv;E zyDjR6O0c7j?(;u@@0&HUVsf0I`N!K(PAF=f|3MaieAHdRkIauTz5AM5nDp?KPc^QV z@d13S9=x1Sl52%(*=jBl*QNPJ>7vKoD1zhZlV*1e_mNh`&0q4;Oq)2D*-}NScV@Rj za-+XrM+f{COm`P6hmu$8Gv9`x=y*0?Y!<0{^<)NIqQ2uD?5ZU*iPw& ztq_WMUmUirzc-|U>hQ(T-lhnHGRX|{WC|q`x6r_HXEDrHJOd5N9nhwn8YbbDDKGmk zeOz1t!8r`6QPvWG;AYH)W zhe4{Yu_hI=wg2tldlQVlbw}!yS-merGiNLIVW$4XxH?I-XbX$fhFy0ncU;M6?7}tu7 z+tLvom~XBM^!7ztnhmFi*>tYlou-|c@iOHWPjV>399AmFQSCk(E)bpb*2-U;T4e%S zt2{2AE#A>F#HCGKY&JC$F`mIW`LvA{K8lVBfudCNtoq2KJJV!ZE==8c5GP9U!1kBI zjo*pZ+>(5o0WT`x`d~|V4dPL4zhuLr((Kk^F~Ai=9v3r6;%7Z+g`e;>avWEX^itX| zTBAyxeM_(XCW(&H1%ull|J3Wgr9|0_OA!zh56i%m@o+krmDj1uFiy@gTV|%U!-3cD)Y7AYrPy%3Y>uB@T+UvqU E0N|^dsQ>@~ literal 2493 zcmbuBXH?V48pi(#MNqmR-~u8xy!2wkAfX7khEIqx}hX5Qz0e)FD5cX9f+?9RPA z0RWIioVIrpt+S%hE+r|NHE)Jf001N#=k6V49}*daxe^g|B|HoOVjkq@y|^l7B4a~a z_eu*6Lwwd)!TkKjCG51&Hr=E2#34xi<;9sBz1Y)b-s9*PDF)YIE`ejB@o+|dHM6oa z>ZV-dpdQ7yf}#kG8E-;Ws=-_RGRl>ro?9q69du@lbR2^@-jo}y<0_vVUg4*jrxcA! zHIAl}M$^MLL!KS15U=+Mylay?ghFO1_3CH4f{Fbmj@k`vu^*xSZHN59BS@1J$w+c= zLUqAiGep9XlV{bPhfioSVR1fPlc|fA0V-4OQ+*fm3SG}}5c$_W9Pxm#i`>WWhPj2D zdxgk9EB&q4H}&(#o!@)inMP*!e&r|5Dn+Mi{SeIJ0sZ>IPNeYxG5|=0BJ6G5V;-zf zTQL*f8mV*EA0Szi)OQkwDUl#$bM;8oc{?Wtv9F0um~Cml1D8-uS}|3=9PK0PH`W3B zZmZbYVP`E(c3w!bmW$?NDi7#mAv5HkfNW>_4geP{E+wU?t!=SEnU7yhTedM!P0jCYDTP`kNd;(2tCemNXOY8W3ipbqxw+BizhbTk@Z>!8Sp~uZ z=374{vP#YA` zeTh%+W=43L+oX!I{yM$Csp8dY-&m3(eTwXGDP+*HrBy(yMcx61_VU2J#Z`iSko(t9 z4Z*v$rs9Pl=c;k4N><*+`06gjl!H)Q)GN zlIV60a%rmy94vVehibptL;E4}fh4Mul!AhejZGQ=+7A~0XF-`~@qMj9ksthoIU?~? z!SK@JqWo!Xtl?%&x^+uyEkFKDaprqc5!p{=AS>JRyRC*^R?07_(|>4Lu9aGb;m8WVD29V#K)GL!tVkB{cJOP?M9*)5Cx1;Kw4 zk^gP86hp7GH7EFEtQQeCo$hWL6P00Qn(G(TYchcAxA9~$HvWxoh8Cjbg?!rQ@2r(( z`9!!#N5PTMGQUhmtY50LmGEeQsA3{N164Kv`8x>Tmpi>FrhLpBeP6=cXF+R{S&5EP zYc}){PA;s?j_$i$ip!YR`Yzt5BXhw)pp*2Z=ZFXd2em(gfs#Cbijjtt?w0xQW9B7Y zu3Q_$J8^Lp;%V>+6+g9asD=-#%qZwM`8|0w{6~7ZltQ*@3Bll`V)tOF^~(HwAR~Hf zlR>5GCQ81pmOzLO;IS;USwBgxBP}=|Kc2noS71o(aU?6EhgXMcpv9mXmV^2mRef<;f1n#+ znqFE`QZi#g?A+Y=(mQ+@<9675KqsUAe8fz3Fx^)pEIJxmj6S>^1wEhU5VYmt$^Lmr zB=q*o#zs*w3Pq#Q#sza(G%wqPTd?-E+xEi9X6ouF50)s@r|O67R?fbCEwIgdBkp?B znp-C+`Im-D)e;MfebnLMb3t;eyS4WoIJps_I7ORD#N)%Bj?mdNMrOe=QaT7F-sZ~W zDEJJXRfXUsqm#9Ijlkxy=`FP#DKzf6S!NtNGqIG+tTof%B^gw-L8f&wAa4liPV}kn zW$Zb|aR1qwt%j%h(AP`REt^|gmyyiX>0_v-wRx4+ysl*~kI!026%`o0&zMjA{rHJ~ ze5r&LHmP<(oXY;l)U-@aSg0B3!a5Xg6V^u=uZYCrku|kFt}oT2S{nUH*NoN1ME9k_ zw~UFMnhnc3M^GfQ!foPoZVzh&4RI{aq%d9)NO>&l%m{}seQ444nxdj15`(ctVPoI= zlYV;L_4x_F`d55w#R^`c_r=!vm{$LyQjn3MpP zx@2qBU)13D$eL}f_xqvD^ADt{xjoloG(MquO&3d$mE7U#8mP^l0GCH-91OC30>8d) z#Ug~t3A--O(QC#xufL06RT&h5UU*rg5O~-CG>TNl%_Uv^ww?hIcs=!iObVro9@#?nIwy}bY+ctfoZyA7aaI&wnyO{hRdOme@ From 7a4f1496e97dbbb46df925d1bca230b3aecc07d6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:24:45 -0500 Subject: [PATCH 059/131] Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted --- code/controllers/subsystem/vote.dm | 2 +- code/datums/mind.dm | 2 +- code/game/machinery/doors/airlock.dm | 2 -- code/game/machinery/doors/door.dm | 2 -- code/game/machinery/doors/windowdoor.dm | 2 -- code/modules/admin/secrets.dm | 4 ++-- code/modules/admin/topic.dm | 10 +++++----- code/modules/admin/topic.dm.rej | 10 ++++++++++ code/modules/admin/verbs/debug.dm | 12 ++++++------ code/modules/admin/verbs/onlyone.dm | 4 ++-- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 ++-- code/modules/mob/living/carbon/human/death.dm.rej | 10 ++++++++++ code/modules/mob/living/living.dm | 2 +- code/modules/mob/living/living_defense.dm | 2 +- code/modules/mob/living/silicon/ai/ai_defense.dm | 2 +- code/modules/mob/mob_helpers.dm | 2 +- code/world.dm | 2 +- 18 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 code/modules/admin/topic.dm.rej create mode 100644 code/modules/mob/living/carbon/human/death.dm.rej diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index b3b6dce98a..5deb0adf85 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -124,7 +124,7 @@ SUBSYSTEM_DEF(vote) if("gamemode") if(GLOB.master_mode != .) world.save_mode(.) - if(SSticker && SSticker.mode) + if(SSticker.HasRoundStarted()) restart = 1 else GLOB.master_mode = . diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 5a6c34bcc4..9077db63e1 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -255,7 +255,7 @@ to_chat(recipient, "[output]") /datum/mind/proc/edit_memory() - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("Not before round-start!", "Alert") return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a9331cd142..7ff38f53c9 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1283,8 +1283,6 @@ if(!density) return 1 - if(!SSticker || !SSticker.mode) - return 0 operating = 1 update_icon(AIRLOCK_OPENING, 1) src.set_opacity(0) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index cd587a0c44..4e076e3338 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -229,8 +229,6 @@ return 1 if(operating) return - if(!SSticker || !SSticker.mode) - return 0 operating = 1 do_animate("opening") set_opacity(0) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 20dd6860ea..99cdc1adc3 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -129,8 +129,6 @@ /obj/machinery/door/window/open(forced=0) if (src.operating == 1) //doors can still open when emag-disabled return 0 - if(!SSticker || !SSticker.mode) - return 0 if(!forced) if(!hasPower()) return 0 diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 7f0479eac9..a7a42da6d9 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -238,7 +238,7 @@ if("showgm") if(!check_rights(R_ADMIN)) return - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("The game hasn't started yet!") else if (SSticker.mode) alert("The game mode is [SSticker.mode.name]") @@ -327,7 +327,7 @@ if("traitor_all") if(!check_rights(R_FUN)) return - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("The game hasn't started yet!") return var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index dd32085681..c05db79983 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1170,7 +1170,7 @@ if(!check_rights(R_ADMIN)) return - if(SSticker && SSticker.mode) + if(SSticker.HasRoundStarted()) return alert(usr, "The game has already started.", null, null, null, null) var/dat = {"What mode do you wish to play?
"} for(var/mode in config.modes) @@ -1184,7 +1184,7 @@ if(!check_rights(R_ADMIN)) return - if(SSticker && SSticker.mode) + if(SSticker.HasRoundStarted()) return alert(usr, "The game has already started.", null, null, null, null) if(GLOB.master_mode != "secret") return alert(usr, "The game mode has to be secret!", null, null, null, null) @@ -1199,7 +1199,7 @@ if(!check_rights(R_ADMIN|R_SERVER)) return - if (SSticker && SSticker.mode) + if (SSticker.HasRoundStarted()) return alert(usr, "The game has already started.", null, null, null, null) GLOB.master_mode = href_list["c_mode2"] log_admin("[key_name(usr)] set the mode as [GLOB.master_mode].") @@ -1213,7 +1213,7 @@ if(!check_rights(R_ADMIN|R_SERVER)) return - if(SSticker && SSticker.mode) + if(SSticker.HasRoundStarted()) return alert(usr, "The game has already started.", null, null, null, null) if(GLOB.master_mode != "secret") return alert(usr, "The game mode has to be secret!", null, null, null, null) @@ -1810,7 +1810,7 @@ if(!check_rights(R_ADMIN)) return - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("The game hasn't started yet!") return diff --git a/code/modules/admin/topic.dm.rej b/code/modules/admin/topic.dm.rej new file mode 100644 index 0000000000..041ae92107 --- /dev/null +++ b/code/modules/admin/topic.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm (rejected hunks) +@@ -8,7 +8,7 @@ + if(href_list["ahelp"]) + if(!check_rights(R_ADMIN)) + return +- ++ + var/ahelp_ref = href_list["ahelp"] + var/datum/admin_help/AH = locate(ahelp_ref) + if(AH) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c9014da3b0..c49240ed66 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -207,7 +207,7 @@ GLOBAL_PROTECT(AdminProcCall) set category = "Fun" set name = "Make Robot" - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") return if(ishuman(M)) @@ -223,7 +223,7 @@ GLOBAL_PROTECT(AdminProcCall) set category = "Fun" set name = "Make Blob" - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") return if(ishuman(M)) @@ -241,7 +241,7 @@ GLOBAL_PROTECT(AdminProcCall) set category = "Fun" set name = "Make Simple Animal" - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") return @@ -289,7 +289,7 @@ GLOBAL_PROTECT(AdminProcCall) set category = "Fun" set name = "Make Alien" - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") return if(ishuman(M)) @@ -306,7 +306,7 @@ GLOBAL_PROTECT(AdminProcCall) set category = "Fun" set name = "Make slime" - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") return if(ishuman(M)) @@ -417,7 +417,7 @@ GLOBAL_PROTECT(AdminProcCall) set category = "Admin" set name = "Grant Full Access" - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") return if(ishuman(M)) diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index dd56f2a6a0..37dab65b0c 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -1,6 +1,6 @@ GLOBAL_VAR_INIT(highlander, FALSE) /client/proc/only_one() //Gives everyone kilts, berets, claymores, and pinpointers, with the objective to hijack the emergency shuttle. - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("The game hasn't started yet!") return GLOB.highlander = TRUE @@ -79,7 +79,7 @@ GLOBAL_VAR_INIT(highlander, FALSE) Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it.") /proc/only_me() - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) alert("The game hasn't started yet!") return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index f4dcc36576..04cf3e855a 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -701,7 +701,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set name = "Make Everyone Random" set desc = "Make everyone have a random appearance. You can only use this before rounds!" - if(SSticker && SSticker.mode) + if(SSticker.HasRoundStarted()) to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!") return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index ab6377b096..7d05d15624 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -298,7 +298,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/Stat() ..() if(statpanel("Status")) - if(SSticker && SSticker.mode) + if(SSticker.HasRoundStarted()) for(var/datum/gang/G in SSticker.mode.gangs) if(G.is_dominating) stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]") @@ -361,7 +361,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!A.hidden) filtered += A var/area/thearea = input("Area to jump to", "BOOYEA") as null|anything in filtered - + if(!thearea) return diff --git a/code/modules/mob/living/carbon/human/death.dm.rej b/code/modules/mob/living/carbon/human/death.dm.rej new file mode 100644 index 0000000000..a4a1fc5a7c --- /dev/null +++ b/code/modules/mob/living/carbon/human/death.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm (rejected hunks) +@@ -32,7 +32,7 @@ + + dna.species.spec_death(gibbed, src) + +- if(SSticker && SSticker.mode) ++ if(SSticker.HasRoundStarted()) + SSblackbox.ReportDeath(src) + if(mind && mind.devilinfo) + INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index e3502e7a90..d707f01e60 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -600,7 +600,7 @@ return name /mob/living/update_gravity(has_gravity,override = 0) - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) return if(has_gravity) clear_alert("weightless") diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 6ea921e560..e4129e642d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -172,7 +172,7 @@ /mob/living/attack_slime(mob/living/simple_animal/slime/M) - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) to_chat(M, "You cannot attack people before the game has started.") return diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm index 75ef88768f..d07f85ef6a 100644 --- a/code/modules/mob/living/silicon/ai/ai_defense.dm +++ b/code/modules/mob/living/silicon/ai/ai_defense.dm @@ -6,7 +6,7 @@ /mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M) - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) to_chat(M, "You cannot attack people before the game has started.") return ..() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 834d799b79..65e83d3c5d 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -326,7 +326,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return 0 /proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this. - if(!SSticker || !SSticker.mode) + if(!SSticker.HasRoundStarted()) return 0 if(!istype(M)) return 0 diff --git a/code/world.dm b/code/world.dm index 7af27a1504..c3ded147f2 100644 --- a/code/world.dm +++ b/code/world.dm @@ -116,7 +116,7 @@ s["map_name"] = SSmapping.config.map_name - if(key_valid && SSticker && SSticker.mode) + if(key_valid && SSticker.HasRoundStarted()) s["real_mode"] = SSticker.mode.name // Key-authed callers may know the truth behind the "secret" From 08497579d8a6a40766fcf9e25672b9c26825fa55 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:24:49 -0500 Subject: [PATCH 060/131] Fixes some null.add_reagents runtimes --- code/modules/hydroponics/hydroitemdefines.dm | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 0b97df8a11..f2528878e2 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -28,8 +28,8 @@ throw_speed = 3 throw_range = 10 -/obj/item/weapon/reagent_containers/spray/weedspray/New() - ..() +/obj/item/weapon/reagent_containers/spray/weedspray/Initialize() + . = ..() reagents.add_reagent("weedkiller", 100) /obj/item/weapon/reagent_containers/spray/weedspray/suicide_act(mob/user) @@ -50,8 +50,8 @@ throw_speed = 3 throw_range = 10 -/obj/item/weapon/reagent_containers/spray/pestspray/New() - ..() +/obj/item/weapon/reagent_containers/spray/pestspray/Initialize() + . = ..() reagents.add_reagent("pestkiller", 100) /obj/item/weapon/reagent_containers/spray/pestspray/suicide_act(mob/user) @@ -135,8 +135,8 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = list(1,2,5,10,15,25,50) -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/nutrient/Initialize() + . = ..() src.pixel_x = rand(-5, 5) src.pixel_y = rand(-5, 5) @@ -147,8 +147,8 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez/Initialize() + . = ..() reagents.add_reagent("eznutriment", 50) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z @@ -157,8 +157,8 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle18" -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z/Initialize() + . = ..() reagents.add_reagent("left4zednutriment", 50) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh @@ -167,8 +167,8 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle15" -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh/Initialize() + . = ..() reagents.add_reagent("robustharvestnutriment", 50) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/empty @@ -191,8 +191,8 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle19" -/obj/item/weapon/reagent_containers/glass/bottle/killer/weedkiller/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/killer/weedkiller/Initialize() + . = ..() reagents.add_reagent("weedkiller", 50) /obj/item/weapon/reagent_containers/glass/bottle/killer/pestkiller @@ -201,6 +201,6 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle20" -/obj/item/weapon/reagent_containers/glass/bottle/killer/pestkiller/New() - ..() +/obj/item/weapon/reagent_containers/glass/bottle/killer/pestkiller/Initialize() + . = ..() reagents.add_reagent("pestkiller", 50) From cd8e9399ae081b1ed73184426911e9e2ea05e114 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:39:36 -0500 Subject: [PATCH 061/131] Automatic changelog generation for PR #609 [ci skip] --- html/changelogs/AutoChangeLog-pr-609.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-609.yml diff --git a/html/changelogs/AutoChangeLog-pr-609.yml b/html/changelogs/AutoChangeLog-pr-609.yml new file mode 100644 index 0000000000..ac39499919 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-609.yml @@ -0,0 +1,5 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - tweak: "Server hop verb moved to the OOC tab" + - rscadd: "Server hop verb can now be used in the lobby as well as while a ghost." From 542d1632bc19a992943b213a32169b7dca185d80 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:40:44 -0500 Subject: [PATCH 062/131] Automatic changelog generation for PR #622 [ci skip] --- html/changelogs/AutoChangeLog-pr-622.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-622.yml diff --git a/html/changelogs/AutoChangeLog-pr-622.yml b/html/changelogs/AutoChangeLog-pr-622.yml new file mode 100644 index 0000000000..2ecadf9ac7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-622.yml @@ -0,0 +1,5 @@ +author: "coiax, WJohnston" +delete-after: True +changes: + - rscdel: "Languages no longer colour their text." + - rscadd: "Languages now have icons to identify them. Galatic Common does not have an icon if understood." From a0f090b926ed857e8909adddec8baf678a2f1df9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:41:18 -0500 Subject: [PATCH 063/131] Automatic changelog generation for PR #625 [ci skip] --- html/changelogs/AutoChangeLog-pr-625.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-625.yml diff --git a/html/changelogs/AutoChangeLog-pr-625.yml b/html/changelogs/AutoChangeLog-pr-625.yml new file mode 100644 index 0000000000..0f872b5227 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-625.yml @@ -0,0 +1,4 @@ +author: "Kor" +delete-after: True +changes: + - rscadd: "Librarians can speak any language" From 7ec11b3ca134534309e88966fedbda86aafcd395 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:41:54 -0500 Subject: [PATCH 064/131] Automatic changelog generation for PR #629 [ci skip] --- html/changelogs/AutoChangeLog-pr-629.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-629.yml diff --git a/html/changelogs/AutoChangeLog-pr-629.yml b/html/changelogs/AutoChangeLog-pr-629.yml new file mode 100644 index 0000000000..f61d3657a9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-629.yml @@ -0,0 +1,4 @@ +author: "tacolizard forever" +delete-after: True +changes: + - bugfix: "Rechargers no longer flash the 'fully charged' animation before charging something" From 98c3823327a496e64d03cfa9dc7200727af9ec9f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:42:38 -0500 Subject: [PATCH 065/131] Automatic changelog generation for PR #631 [ci skip] --- html/changelogs/AutoChangeLog-pr-631.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-631.yml diff --git a/html/changelogs/AutoChangeLog-pr-631.yml b/html/changelogs/AutoChangeLog-pr-631.yml new file mode 100644 index 0000000000..509a489f02 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-631.yml @@ -0,0 +1,4 @@ +author: "Swindly" +delete-after: True +changes: + - rscadd: "Added organ storage bags for medical cyborgs. They can hold an organic body part. Use the bag on a carbon during organ manipulation or prosthetic replacement to add the held body part." From 9b505d004b4069ebb300002350492040410a0a00 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:42:52 -0500 Subject: [PATCH 066/131] Automatic changelog generation for PR #632 [ci skip] --- html/changelogs/AutoChangeLog-pr-632.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-632.yml diff --git a/html/changelogs/AutoChangeLog-pr-632.yml b/html/changelogs/AutoChangeLog-pr-632.yml new file mode 100644 index 0000000000..a55e75440a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-632.yml @@ -0,0 +1,6 @@ +author: "Joan" +delete-after: True +changes: + - rscdel: "Removed Mending Motor." + - rscadd: "Added Mending Mantra, which is a script that causes you to repair nearby constructs and structures as long as you continue chanting it." + - tweak: "Mending Mantra will also heal Servants as long as they're wearing clockwork armor." From feef059cefbdfad05063cb75a9a494cffd8f4cc0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:43:02 -0500 Subject: [PATCH 067/131] Automatic changelog generation for PR #633 [ci skip] --- html/changelogs/AutoChangeLog-pr-633.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-633.yml diff --git a/html/changelogs/AutoChangeLog-pr-633.yml b/html/changelogs/AutoChangeLog-pr-633.yml new file mode 100644 index 0000000000..0688139dbe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-633.yml @@ -0,0 +1,4 @@ +author: "Cobby" +delete-after: True +changes: + - rscadd: "Syndicate Lavabase now has more explicit instructions when it comes to outing non-syndicate affiliated enemies of Nanotrasen." From f553fbe4b3ae887748a7ac4308c95446a4d533f4 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:43:28 -0500 Subject: [PATCH 068/131] Automatic changelog generation for PR #635 [ci skip] --- html/changelogs/AutoChangeLog-pr-635.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-635.yml diff --git a/html/changelogs/AutoChangeLog-pr-635.yml b/html/changelogs/AutoChangeLog-pr-635.yml new file mode 100644 index 0000000000..5329c0f58f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-635.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - experiment: "Songs can now be added to disco machines with add_track(file, name, length, beat). Only file is required, the other 3 should still be put in, though." From c3c8688cbdbcc3e99d0ca5501761bd16975aac0d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:44:16 -0500 Subject: [PATCH 069/131] Automatic changelog generation for PR #638 [ci skip] --- html/changelogs/AutoChangeLog-pr-638.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-638.yml diff --git a/html/changelogs/AutoChangeLog-pr-638.yml b/html/changelogs/AutoChangeLog-pr-638.yml new file mode 100644 index 0000000000..8517f8d6ee --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-638.yml @@ -0,0 +1,11 @@ +author: "coiax" +delete-after: True +changes: + - rscdel: "Swarmer traps are no longer summoned by The Traps. +balance: Wizard traps automatically disappear five minutes after being +summoned. +balance: Wizard traps disappear after firing, whether triggered via +person or something being thrown across it. +balance: Wizards are immune to their own traps." + - tweak: "The Traps are now marked as a Defensive spell, rather than an +Offensive spell." From 1bdd4e43c2ee063f95a8d861d859690938ed9a74 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 07:56:18 -0500 Subject: [PATCH 070/131] Automatic changelog generation for PR #644 [ci skip] --- html/changelogs/AutoChangeLog-pr-644.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-644.yml diff --git a/html/changelogs/AutoChangeLog-pr-644.yml b/html/changelogs/AutoChangeLog-pr-644.yml new file mode 100644 index 0000000000..b56956b08c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-644.yml @@ -0,0 +1,5 @@ +author: "Kor" +delete-after: True +changes: + - rscdel: "Removed double agents mode." + - rscadd: "Replaced it with Internal Affairs mode." From 69df03ff9ec0b00429a4201547770c5a8f96c688 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 08:00:42 -0500 Subject: [PATCH 071/131] Automatic changelog generation for PR #656 [ci skip] --- html/changelogs/AutoChangeLog-pr-656.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-656.yml diff --git a/html/changelogs/AutoChangeLog-pr-656.yml b/html/changelogs/AutoChangeLog-pr-656.yml new file mode 100644 index 0000000000..039b45e249 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-656.yml @@ -0,0 +1,6 @@ +author: "coiax" +delete-after: True +changes: + - rscadd: "The Bank Machine in the vault now uses the radio to announce +unauthorized withdrawals, rather than an endless stream of +loud announcements." From 888e7295779a63667bfc8d23f996c856cf545741 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 08:03:51 -0500 Subject: [PATCH 072/131] Automatic changelog generation for PR #666 [ci skip] --- html/changelogs/AutoChangeLog-pr-666.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-666.yml diff --git a/html/changelogs/AutoChangeLog-pr-666.yml b/html/changelogs/AutoChangeLog-pr-666.yml new file mode 100644 index 0000000000..5cdb323b10 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-666.yml @@ -0,0 +1,4 @@ +author: "XDTM" +delete-after: True +changes: + - rscdel: "Voice of God's Rest command now no longer makes listeners rest. It instead activates the sleep command." From 7d263860fe96e528a4ecaa220dae892a3d98c045 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 08:04:22 -0500 Subject: [PATCH 073/131] Automatic changelog generation for PR #668 [ci skip] --- html/changelogs/AutoChangeLog-pr-668.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-668.yml diff --git a/html/changelogs/AutoChangeLog-pr-668.yml b/html/changelogs/AutoChangeLog-pr-668.yml new file mode 100644 index 0000000000..abdde5dbda --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-668.yml @@ -0,0 +1,4 @@ +author: "QualityVan" +delete-after: True +changes: + - bugfix: "Changelings can once again revive with their brain missing" From 4f614ba978757d9387144f0e718ac0e920fa48ba Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 08:10:14 -0500 Subject: [PATCH 074/131] Automatic changelog generation for PR #679 [ci skip] --- html/changelogs/AutoChangeLog-pr-679.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-679.yml diff --git a/html/changelogs/AutoChangeLog-pr-679.yml b/html/changelogs/AutoChangeLog-pr-679.yml new file mode 100644 index 0000000000..aff6c88e4c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-679.yml @@ -0,0 +1,5 @@ +author: "Bawhoppen" +delete-after: True +changes: + - rscadd: "Deep storage space ruin has been readded." + - rscadd: "Space Cola machines now stock bottles of water." From de997bba41ddcc37005b4f121359108a5b31bfef Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 08:37:09 -0500 Subject: [PATCH 075/131] Fixes the 'stuffed legion' recipie --- .../recipes/tablecraft/recipes_misc.dm | 2 +- icons/obj/food/food.dmi | Bin 51075 -> 51075 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 6d14d13254..708f49628a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -264,7 +264,7 @@ time = 40 reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/goliath = 1, - /obj/item/weapon/legion_skull = 1, + /obj/item/organ/hivelord_core/legion = 1, /datum/reagent/consumable/ketchup = 2, /datum/reagent/consumable/capsaicin = 2 ) diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index c0af32afea9b848042cea80a4f0b5b864bda79ce..c4713bd08688afc0a55ac8fb50dccf354a665018 100644 GIT binary patch delta 29 lcmZqfXKwCi-tdN*(QWcu=5UT%K}j3qelNed*@wmaFaWrs4F~`L delta 29 lcmZqfXKwCi-tdN*(Pi>m=5UVWElEWix8L8q*@wmaFaWj!4ATGr From 1842665af6c38f1aa6c78a4e8187909e4aac9752 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 1 May 2017 08:38:03 -0500 Subject: [PATCH 076/131] idjeet --- code/game/machinery/dance_machine.dm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index d38ff18340..cf18a99875 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -13,7 +13,6 @@ var/list/rangers = list() var/charge = 35 var/stop = 0 - var/list/select_name = list() var/list/spotlights = list() var/list/sparkles = list() var/static/list/songs = list( @@ -46,9 +45,8 @@ if(!beat) beat = 5 if(!length) - length = 2400 //Unless there's a way to discern via BYOND. + length = 2400 //Unless there's a way to discern via BYOND. var/datum/track/T = new /datum/track(name, file, length, beat) - available |= T.song_name songs += T /obj/machinery/disco/Initialize() @@ -143,14 +141,11 @@ var/list/available = list() for(var/datum/track/S in songs) - available += S.song_name - select_name = input(usr, "Choose your song", "Track:") as null|anything in available - if (QDELETED(src)) + available[S.song_name] = S + var/selected = input(usr, "Choose your song", "Track:") as null|anything in available + if(QDELETED(src) || !selected || !istype(available[selected], /datum/track)) return - for(var/datum/track/S in songs) - if(select_name == S.song_name) - selection = S - break + selection = available[selected] updateUsrDialog() if("horn") deejay('sound/items/AirHorn2.ogg') From 99754380b59084ea0f87de37d4cbfd8bd07a918a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 08:39:14 -0500 Subject: [PATCH 077/131] Makes surplus crates less likely to contain implants --- code/modules/uplink/uplink_item.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 7fcbb87c59..da0840b551 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -1100,6 +1100,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. // Implants /datum/uplink_item/implants category = "Implants" + surplus = 50 /datum/uplink_item/implants/freedom name = "Freedom Implant" From 242cc65eac5aa7651eb3ff8dc6f24f2b9a0599fe Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 11:05:28 -0500 Subject: [PATCH 078/131] Gang Pen Is now Stealthy --- code/game/gamemodes/gang/gang_pen.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/gang/gang_pen.dm b/code/game/gamemodes/gang/gang_pen.dm index 0e01532190..621d40cc45 100644 --- a/code/game/gamemodes/gang/gang_pen.dm +++ b/code/game/gamemodes/gang/gang_pen.dm @@ -11,7 +11,7 @@ ..() last_used = world.time -/obj/item/weapon/pen/gang/attack(mob/living/M, mob/user) +/obj/item/weapon/pen/gang/attack(mob/living/M, mob/user, stealth = TRUE) if(!istype(M)) return if(ishuman(M) && ishuman(user) && M.stat != DEAD) From 1426a20834757cf5cc38cb295a511f212ceeeb57 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 11:07:33 -0500 Subject: [PATCH 079/131] Gaining Vanguard will remove existing stuns --- code/datums/status_effects/buffs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index d07f66609b..3f261c7991 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -72,6 +72,8 @@ add_logs(owner, null, "gained Vanguard stun immunity") owner.add_stun_absorption("vanguard", 200, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!") owner.visible_message("[owner] begins to faintly glow!", "You will absorb all stuns for the next twenty seconds.") + owner.SetStunned(0, FALSE) + owner.SetWeakened(0) progbar = new(owner, duration, owner) progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0)) progbar.update(duration - world.time) From 34a701a1bcf06f388e8105cd1a606ac05f4a4f6d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 11:38:04 -0500 Subject: [PATCH 080/131] You can no longer queue up ahelps by queing up prompts --- code/modules/admin/verbs/adminhelp.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 16249b4b6d..c912584851 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -485,6 +485,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.") current_ticket.Close() + if(!(/client/verb/adminhelp in verbs)) + to_chat(usr, "Nice try!") + return + new /datum/admin_help(msg, src, FALSE) //admin proc From 185e077f33cf7af4062b6821f36d03078238121c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 11:38:08 -0500 Subject: [PATCH 081/131] Port SM shards to initialize --- code/modules/power/supermatter/supermatter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index fee8859de4..4b48d19857 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -127,7 +127,7 @@ /obj/machinery/power/supermatter_shard/make_frozen_visual() return -/obj/machinery/power/supermatter_shard/New() +/obj/machinery/power/supermatter_shard/Initialize() . = ..() countdown = new(src) countdown.start() From faaf0c17ba70f5a071046f3f8b1b0a974941cd1a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 11:39:13 -0500 Subject: [PATCH 082/131] Small fixes to spatial gateways --- .../clock_effects/spatial_gateway.dm | 13 +++---- .../clock_structures/clockwork_obelisk.dm | 39 +++++++++++-------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm index f376410124..1c49d36693 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm @@ -15,9 +15,8 @@ var/obj/effect/clockwork/spatial_gateway/linked_gateway //The gateway linked to this one var/timerid -/obj/effect/clockwork/spatial_gateway/New() - ..() - update_light() +/obj/effect/clockwork/spatial_gateway/Initialize() + . = ..() addtimer(CALLBACK(src, .proc/check_setup), 1) /obj/effect/clockwork/spatial_gateway/Destroy() @@ -99,12 +98,12 @@ if(severity == 1 && uses) uses = 0 visible_message("[src] is disrupted!") - animate(src, alpha = 0, transform = matrix()*2, time = 10) + animate(src, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) deltimer(timerid) timerid = QDEL_IN(src, 10) linked_gateway.uses = 0 linked_gateway.visible_message("[linked_gateway] is disrupted!") - animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10) + animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) deltimer(linked_gateway.timerid) linked_gateway.timerid = QDEL_IN(linked_gateway, 10) return TRUE @@ -131,9 +130,9 @@ playsound(src, 'sound/effects/EMPulse.ogg', 50, 1) playsound(linked_gateway, 'sound/effects/EMPulse.ogg', 50, 1) transform = matrix() * 1.5 - animate(src, transform = matrix() / 1.5, time = 10) + animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW) linked_gateway.transform = matrix() * 1.5 - animate(linked_gateway, transform = matrix() / 1.5, time = 10) + animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW) A.forceMove(get_turf(linked_gateway)) if(!no_cost) uses = max(0, uses - 1) diff --git a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm index c32bcb0b4b..2bebb4c9a5 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/clockwork_obelisk.dm @@ -44,45 +44,50 @@ /obj/structure/destructible/clockwork/powered/clockwork_obelisk/attack_hand(mob/living/user) if(!is_servant_of_ratvar(user) || total_accessable_power() < hierophant_cost || !anchored) - to_chat(user, "You place your hand on the obelisk, but it doesn't react.") + to_chat(user, "You place your hand on [src], but it doesn't react.") return - var/choice = alert(user,"You place your hand on the obelisk...",,"Hierophant Broadcast","Spatial Gateway","Cancel") + var/choice = alert(user,"You place your hand on [src]...",,"Hierophant Broadcast","Spatial Gateway","Cancel") switch(choice) if("Hierophant Broadcast") if(active) - to_chat(user, "The obelisk is sustaining a gateway and cannot broadcast!") + to_chat(user, "[src] is sustaining a gateway and cannot broadcast!") return if(!user.can_speak_vocal()) - to_chat(user, "You cannot speak through the obelisk!") + to_chat(user, "You cannot speak through [src]!") return var/input = stripped_input(usr, "Please choose a message to send over the Hierophant Network.", "Hierophant Broadcast", "") if(!is_servant_of_ratvar(user) || !input || !user.canUseTopic(src, !issilicon(user))) return + if(anchored) + to_chat(user, "[src] is no longer secured!") + return FALSE if(active) - to_chat(user, "The obelisk is sustaining a gateway and cannot broadcast!") - return - if(!try_use_power(hierophant_cost)) - to_chat(user, "The obelisk lacks the power to broadcast!") + to_chat(user, "[src] is sustaining a gateway and cannot broadcast!") return if(!user.can_speak_vocal()) - to_chat(user, "You cannot speak through the obelisk!") + to_chat(user, "You cannot speak through [src]!") + return + if(!try_use_power(hierophant_cost)) + to_chat(user, "[src] lacks the power to broadcast!") return clockwork_say(user, text2ratvar("Hierophant Broadcast, activate! [html_decode(input)]")) titled_hierophant_message(user, input, "big_brass", "large_brass") if("Spatial Gateway") if(active) - to_chat(user, "The obelisk is already sustaining a gateway!") - return - if(!try_use_power(gateway_cost)) - to_chat(user, "The obelisk lacks the power to open a gateway!") + to_chat(user, "[src] is already sustaining a gateway!") return if(!user.can_speak_vocal()) to_chat(user, "You need to be able to speak to open a gateway!") return - if(procure_gateway(user, round(100 * get_efficiency_mod(), 1), round(5 * get_efficiency_mod(), 1), 1) && !active) - clockwork_say(user, text2ratvar("Spatial Gateway, activate!")) - else - return_power(gateway_cost) + if(!try_use_power(gateway_cost)) + to_chat(user, "[src] lacks the power to open a gateway!") + return + if(procure_gateway(user, round(100 * get_efficiency_mod(), 1), round(5 * get_efficiency_mod(), 1), 1)) + process() + if(!active) + clockwork_say(user, text2ratvar("Spatial Gateway, activate!")) + return + return_power(gateway_cost) //if we didn't return above, ie, successfully create a gateway, we give the power back /obj/structure/destructible/clockwork/powered/clockwork_obelisk/process() if(!anchored) From 529125d3dd19143be27aa22d4f463923b58dc55a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 11:51:27 -0500 Subject: [PATCH 083/131] Moves tips from config to strings tree --- code/controllers/subsystem/ticker.dm | 4 ++-- code/modules/admin/verbs/deadsay.dm.rej | 10 ++++++++++ {config => strings}/admin_nicknames.txt | 0 {config => strings}/sillytips.txt | 0 {config => strings}/tips.txt | 0 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 code/modules/admin/verbs/deadsay.dm.rej rename {config => strings}/admin_nicknames.txt (100%) rename {config => strings}/sillytips.txt (100%) rename {config => strings}/tips.txt (100%) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index f701c051da..67599e4f4c 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -625,8 +625,8 @@ SUBSYSTEM_DEF(ticker) if(selected_tip) m = selected_tip else - var/list/randomtips = world.file2list("config/tips.txt") - var/list/memetips = world.file2list("config/sillytips.txt") + var/list/randomtips = world.file2list("strings/tips.txt") + var/list/memetips = world.file2list("strings/sillytips.txt") if(randomtips.len && prob(95)) m = pick(randomtips) else if(memetips.len) diff --git a/code/modules/admin/verbs/deadsay.dm.rej b/code/modules/admin/verbs/deadsay.dm.rej new file mode 100644 index 0000000000..7d0347427b --- /dev/null +++ b/code/modules/admin/verbs/deadsay.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm (rejected hunks) +@@ -19,7 +19,7 @@ + + if (!msg) + return +- var/static/nicknames = world.file2list("strings/admin_nicknames.txt") ++ var/static/nicknames = world.file2list("config/admin_nicknames.txt") + + var/rendered = "DEAD: ADMIN([src.holder.fakekey ? pick(nicknames) : src.key]) says, \"[msg]\"" + diff --git a/config/admin_nicknames.txt b/strings/admin_nicknames.txt similarity index 100% rename from config/admin_nicknames.txt rename to strings/admin_nicknames.txt diff --git a/config/sillytips.txt b/strings/sillytips.txt similarity index 100% rename from config/sillytips.txt rename to strings/sillytips.txt diff --git a/config/tips.txt b/strings/tips.txt similarity index 100% rename from config/tips.txt rename to strings/tips.txt From e2a95703de58f3a5b51bcc8b641e0b9cc9d5735a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 11:54:33 -0500 Subject: [PATCH 084/131] Ore redemption machine cleanup --- code/modules/mining/machine_processing.dm | 4 +- code/modules/mining/machine_redemption.dm | 214 +++++++++++----------- 2 files changed, 114 insertions(+), 104 deletions(-) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index e62392a8c8..668013e0de 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -71,7 +71,6 @@ var/selected_material = MAT_METAL var/selected_alloy = null var/datum/research/files - var/list/categories = list("Alloys") /obj/machinery/mineral/processing_unit/Initialize() . = ..() @@ -81,7 +80,8 @@ /obj/machinery/mineral/processing_unit/Destroy() CONSOLE = null - qdel(materials) + QDEL_NULL(materials) + QDEL_NULL(files) return ..() /obj/machinery/mineral/processing_unit/HasProximity(atom/movable/AM) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index db0b400fda..d93bcb5028 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -12,9 +12,6 @@ output_dir = SOUTH req_access = list(GLOB.access_mineral_storeroom) var/req_access_reclaim = GLOB.access_mining_station - var/stk_types = list() - var/stk_amt = list() - var/stack_list = list() //Key: Type. Value: Instance of type. var/obj/item/weapon/card/id/inserted_id var/points = 0 var/ore_pickup_rate = 15 @@ -24,11 +21,20 @@ speed_process = 1 var/message_sent = FALSE var/list/ore_buffer = list() + var/datum/material_container/materials + var/datum/research/files -/obj/machinery/mineral/ore_redemption/New() - ..() +/obj/machinery/mineral/ore_redemption/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/ore_redemption/B = new B.apply_default_parts(src) + materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY) + files = new /datum/research/smelter(src) + +/obj/machinery/mineral/ore_redemption/Destroy() + QDEL_NULL(materials) + QDEL_NULL(files) + return ..() /obj/item/weapon/circuitboard/machine/ore_redemption name = "Ore Redemption (Machine Board)" @@ -55,35 +61,67 @@ point_upgrade = point_upgrade_temp sheet_per_ore = sheet_per_ore_temp -/obj/machinery/mineral/ore_redemption/proc/process_sheet(obj/item/weapon/ore/O) - var/obj/item/stack/sheet/processed_sheet = SmeltMineral(O) - if(processed_sheet) - var/obj/item/stack/sheet/s - if(!stack_list[processed_sheet]) - s = new processed_sheet(src, FALSE) - s.amount = 0 - stack_list[processed_sheet] = s - s = stack_list[processed_sheet] - s.amount += sheet_per_ore //Stack the sheets - ore_buffer -= O - qdel(O) //... garbage collect +/obj/machinery/mineral/ore_redemption/proc/smelt_ore(obj/item/weapon/ore/O) + + ore_buffer -= O + + if(O && O.refined_type) + points += O.points * point_upgrade + + var/material_amount = materials.get_item_material_amount(O) + + if(!material_amount) + qdel(O) //no materials, incinerate it + + else if(!materials.has_space(material_amount)) //if there is no space, eject it + unload_mineral(O) + + else + materials.insert_item(O) //insert it + qdel(O) + +/obj/machinery/mineral/ore_redemption/proc/can_smelt_alloy(datum/design/D) + if(D.make_reagents.len) + return 0 + + var/build_amount = 1 + + for(var/mat_id in D.materials) + var/M = D.materials[mat_id] + var/datum/material/redemption_mat = materials.materials[mat_id] + + if(!M || !redemption_mat) + return 0 + + build_amount = min(build_amount, round(redemption_mat.amount / M)) + + return build_amount /obj/machinery/mineral/ore_redemption/proc/process_ores(list/ores_to_process) var/current_amount = 0 for(var/ore in ores_to_process) if(current_amount >= ore_pickup_rate) break - process_sheet(ore) + smelt_ore(ore) /obj/machinery/mineral/ore_redemption/proc/send_console_message() - if(z != ZLEVEL_STATION || !LAZYLEN(stack_list)) + if(z != ZLEVEL_STATION) return message_sent = TRUE var/area/A = get_area(src) var/msg = "Now available in [A]:
" - for(var/s in stack_list) - var/obj/item/stack/sheet/sheet = stack_list[s] - msg += "[capitalize(sheet.name)]: [sheet.amount] sheets
" + + var/has_minerals = FALSE + + for(var/mat_id in materials.materials) + var/datum/material/M = materials.materials[mat_id] + var/mineral_amount = M.amount / MINERAL_MATERIAL_AMOUNT + if(mineral_amount) + has_minerals = TRUE + msg += "[capitalize(M.name)]: [mineral_amount] sheets
" + + if(!has_minerals) + return for(var/obj/machinery/requests_console/D in GLOB.allConsoles) if(D.receive_ore_updates) @@ -144,15 +182,8 @@ return ..() /obj/machinery/mineral/ore_redemption/on_deconstruction() - empty_content() - -/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(obj/item/weapon/ore/O) - if(O && O.refined_type) - var/obj/item/stack/sheet/M = O.refined_type - points += O.points * point_upgrade - return M - qdel(O)//No refined type? Purge it. - return + materials.retrieve_all() + ..() /obj/machinery/mineral/ore_redemption/attack_hand(mob/user) if(..()) @@ -169,30 +200,26 @@ else dat += "No ID inserted. Insert ID.

" - for(var/O in stack_list) - var/obj/item/stack/sheet/s = stack_list[O] - if(s.amount) - dat += "[capitalize(s.name)]: [s.amount] Release
" + for(var/mat_id in materials.materials) + var/datum/material/M = materials.materials[mat_id] + if(M.amount) + var/sheet_amount = M.amount / MINERAL_MATERIAL_AMOUNT + dat += "[capitalize(M.name)]: [sheet_amount] " + if(sheet_amount >= 1) + dat += "Release
" + else + dat += "Release
" - var/obj/item/stack/sheet/metalstack - if(/obj/item/stack/sheet/metal in stack_list) - metalstack = stack_list[/obj/item/stack/sheet/metal] + for(var/v in files.known_designs) + var/datum/design/D = files.known_designs[v] + if(can_smelt_alloy(D)) + dat += "[D.name]: Smelt
" + else + dat += "[D.name]: Smelt
" - var/obj/item/stack/sheet/plasmastack - if((/obj/item/stack/sheet/mineral/plasma in stack_list)) - plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma] + dat += "
Mineral Value List:
[get_ore_values()]
" - var/obj/item/stack/sheet/mineral/titaniumstack - if((/obj/item/stack/sheet/mineral/titanium in stack_list)) - titaniumstack = stack_list[/obj/item/stack/sheet/mineral/titanium] - - if(metalstack && plasmastack && min(metalstack.amount, plasmastack.amount)) - dat += "Plasteel Alloy (Metal + Plasma): Smelt
" - if(titaniumstack && plasmastack && min(titaniumstack.amount, plasmastack.amount)) - dat += "Plastitanium Alloy (Titanium + Plasma): Smelt
" - dat += "
Mineral Value List:
[get_ore_values()]
" - - var/datum/browser/popup = new(user, "console_stacking_machine", "Ore Redemption Machine", 400, 500) + var/datum/browser/popup = new(user, "ore_redemption_machine", "Ore Redemption Machine", 400, 500) popup.set_content(dat) popup.open() return @@ -228,69 +255,52 @@ else to_chat(usr, "Not a valid ID!") if(href_list["release"]) - if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user. - if(!(text2path(href_list["release"]) in stack_list)) + if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user + var/mat_id = href_list["release"] + if(!materials.materials[mat_id]) return - var/obj/item/stack/sheet/inp = stack_list[text2path(href_list["release"])] - var/obj/item/stack/sheet/out = new inp.type(src, 0, FALSE) + + var/datum/material/mat = materials.materials[mat_id] + var/stored_amount = mat.amount / MINERAL_MATERIAL_AMOUNT + + if(!stored_amount) + return + var/desired = input("How many sheets?", "How many sheets to eject?", 1) as null|num - out.amount = round(min(desired,50,inp.amount)) - if(out.amount >= 1) - inp.amount -= out.amount - unload_mineral(out) - if(inp.amount < 1) - stack_list -= text2path(href_list["release"]) - qdel(inp) + var/sheets_to_remove = round(min(desired,50,stored_amount)) + + var/out = get_step(src, output_dir) + materials.retrieve_sheets(sheets_to_remove, mat_id, out) + else to_chat(usr, "Required access not found.") - if(href_list["alloytype1"] && href_list["alloytype2"] && href_list["alloytypeout"]) - var/alloytype1 = text2path(href_list["alloytype1"]) - var/alloytype2 = text2path(href_list["alloytype2"]) - var/alloytypeout = text2path(href_list["alloytypeout"]) - if(check_access(inserted_id) || allowed(usr)) - if(!(alloytype1 in stack_list)) - return - if(!(alloytype2 in stack_list)) - return - var/obj/item/stack/sheet/stack1 = stack_list[alloytype1] - var/obj/item/stack/sheet/stack2 = stack_list[alloytype2] + + if(href_list["alloy"]) + var/alloy_id = href_list["alloy"] + var/datum/design/alloy = files.FindDesignByID(alloy_id) + if((check_access(inserted_id) || allowed(usr)) && alloy) var/desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num - var/obj/item/stack/sheet/alloyout = new alloytypeout - alloyout.amount = round(min(desired,50,stack1.amount,stack2.amount)) - if(alloyout.amount >= 1) - stack1.amount -= alloyout.amount - stack2.amount -= alloyout.amount - unload_mineral(alloyout) - if(stack1.amount < 1) - stack_list -= stack1 - qdel(stack1) - if(stack2.amount < 1) - stack_list -= stack2 - qdel(stack2) + var/smelt_amount = can_smelt_alloy(alloy) + var/amount = round(min(desired,50,smelt_amount)) + materials.use_amount(alloy.materials, amount) + + var/output = new alloy.build_path(src) + if(istype(output, /obj/item/stack/sheet)) + var/obj/item/stack/sheet/mineral/produced_alloy = output + produced_alloy.amount = amount + unload_mineral(produced_alloy) + else + unload_mineral(output) + else to_chat(usr, "Required access not found.") updateUsrDialog() return /obj/machinery/mineral/ore_redemption/ex_act(severity, target) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(5, 1, src) - s.start() + do_sparks(5, TRUE, src) ..() -//empty the redemption machine by stacks of at most max_amount (50 at this time) size -/obj/machinery/mineral/ore_redemption/proc/empty_content() - var/obj/item/stack/sheet/s - - for(var/O in stack_list) - s = stack_list[O] - while(s.amount > s.max_amount) - new s.type(loc,s.max_amount) - s.use(s.max_amount) - s.forceMove(get_turf(src)) - s.layer = initial(s.layer) - s.plane = initial(s.plane) - /obj/machinery/mineral/ore_redemption/power_change() ..() update_icon() From 3e80105ffb962857aeed64e9b0d3e418ab5c3833 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 12:55:45 -0500 Subject: [PATCH 085/131] Saline-glucose changes --- .../chemistry/reagents/medicine_reagents.dm | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index aa913ba8f0..500147d233 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -288,30 +288,43 @@ /datum/reagent/medicine/salglu_solution name = "Saline-Glucose Solution" id = "salglu_solution" - description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a blood substitute on an IV drip." + description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute." reagent_state = LIQUID color = "#DCDCDC" metabolization_rate = 0.5 * REAGENTS_METABOLISM + overdose_threshold = 60 taste_description = "sweetness and salt" + var/last_added = 0 + var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active /datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M) + if(last_added) + M.blood_volume -= last_added + last_added = 0 + if(M.blood_volume < maximum_reachable) //Can only up to double your effective blood level. + var/amount_to_add = min(M.blood_volume, volume*5) + var/new_blood_level = min(M.blood_volume + amount_to_add, maximum_reachable) + last_added = new_blood_level - M.blood_volume + M.blood_volume = new_blood_level if(prob(33)) M.adjustBruteLoss(-0.5*REM, 0) M.adjustFireLoss(-0.5*REM, 0) - if(iscarbon(M)) - var/mob/living/carbon/C = M - C.blood_volume += 0.2 . = 1 ..() -/datum/reagent/medicine/salglu_solution/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1) - if(ishuman(M) && method == INJECT) - var/mob/living/carbon/human/H = M - if(H.dna && !(NOBLOOD in H.dna.species.species_traits)) - var/efficiency = (BLOOD_VOLUME_NORMAL-H.blood_volume)/700 + 0.2//The lower the blood of the patient, the better it is as a blood substitute. - efficiency = Clamp(efficiency, 0.1, 0.75) - //As it's designed for an IV drip, make large injections not as effective as repeated small injections. - H.blood_volume += round(efficiency * min(5,reac_volume), 0.1) +/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M) + if(prob(3)) + to_chat(M, "You feel salty.") + holder.add_reagent("sodiumchloride", 1) + holder.remove_reagent("salglu_solution", 0.5) + else if(prob(3)) + to_chat(M, "You feel sweet.") + holder.add_reagent("sugar", 1) + holder.remove_reagent("salglu_solution", 0.5) + if(prob(33)) + M.adjustBruteLoss(0.5*REM, 0) + M.adjustFireLoss(0.5*REM, 0) + . = 1 ..() /datum/reagent/medicine/mine_salve From 161891e51b8b8fd6e2cadbc700f7645ad9509e49 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 1 May 2017 15:26:17 -0500 Subject: [PATCH 086/131] conflict res --- code/game/gamemodes/wizard/artefact.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index e409b087d8..137514d1e3 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -471,7 +471,7 @@ else if(istype(I,/obj/item/weapon/bikehorn)) to_chat(target, "HONK") target << 'sound/items/AirHorn.ogg' - target.adjustEarDamage(0,3) + target.adjustEarDamage(0,3) GiveHint(target) cooldown = world.time +cooldown_time return @@ -630,6 +630,6 @@ duration = 40 pixel_x = 500 -/obj/effect/overlay/temp/tornado/Initialize() - . = ..() +/obj/effect/overlay/temp/tornado/Initialize() + . = ..() animate(src, pixel_x = -500, time = 40) From 64fd72f1cf5c4086b99608141a237e4bb7197427 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 1 May 2017 15:31:51 -0500 Subject: [PATCH 087/131] Update artefact.dm --- code/game/gamemodes/wizard/artefact.dm | 645 +------------------------ 1 file changed, 1 insertion(+), 644 deletions(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index b22fa60986..137514d1e3 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -1,3 +1,4 @@ + //Apprenticeship contract - moved to antag_spawner.dm ///////////////////////////Veil Render////////////////////// @@ -632,647 +633,3 @@ /obj/effect/overlay/temp/tornado/Initialize() . = ..() animate(src, pixel_x = -500, time = 40) -======= - -//Apprenticeship contract - moved to antag_spawner.dm - -///////////////////////////Veil Render////////////////////// - -/obj/item/weapon/veilrender - name = "veil render" - desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." - icon = 'icons/obj/wizard.dmi' - icon_state = "render" - item_state = "render" - force = 15 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/bladeslice.ogg' - var/charges = 1 - var/spawn_type = /obj/singularity/wizard - var/spawn_amt = 1 - var/activate_descriptor = "reality" - var/rend_desc = "You should run now." - var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning - -/obj/item/weapon/veilrender/attack_self(mob/user) - if(charges > 0) - new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc, spawn_fast) - charges-- - user.visible_message("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!") - else - to_chat(user, "The unearthly energies that powered the blade are now dormant.") - -/obj/effect/rend - name = "tear in the fabric of reality" - desc = "You should run now." - icon = 'icons/obj/biomass.dmi' - icon_state = "rift" - density = 1 - anchored = 1 - var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies - var/spawn_amt_left = 20 - var/spawn_fast = 0 - -/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast) - src.spawn_path = spawn_type - src.spawn_amt_left = spawn_amt - src.desc = desc - src.spawn_fast = spawn_fast - START_PROCESSING(SSobj, src) - return - -/obj/effect/rend/process() - if(!spawn_fast) - if(locate(/mob) in loc) - return - new spawn_path(loc) - spawn_amt_left-- - if(spawn_amt_left <= 0) - qdel(src) - -/obj/effect/rend/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/nullrod)) - user.visible_message("[user] seals \the [src] with \the [I].") - qdel(src) - return - else - return ..() - -/obj/item/weapon/veilrender/vealrender - name = "veal render" - desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm." - spawn_type = /mob/living/simple_animal/cow - spawn_amt = 20 - activate_descriptor = "hunger" - rend_desc = "Reverberates with the sound of ten thousand moos." - -/obj/item/weapon/veilrender/honkrender - name = "honk render" - desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast circus." - spawn_type = /mob/living/simple_animal/hostile/retaliate/clown - spawn_amt = 10 - activate_descriptor = "depression" - rend_desc = "Gently wafting with the sounds of endless laughter." - icon_state = "clownrender" - -////TEAR IN REALITY - -/obj/singularity/wizard - name = "tear in the fabric of reality" - desc = "This isn't right." - icon = 'icons/effects/224x224.dmi' - icon_state = "reality" - pixel_x = -96 - pixel_y = -96 - grav_pull = 6 - consume_range = 3 - current_size = STAGE_FOUR - allowed_size = STAGE_FOUR - -/obj/singularity/wizard/process() - move() - eat() - return -/////////////////////////////////////////Scrying/////////////////// - -/obj/item/weapon/scrying - name = "scrying orb" - desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means." - icon = 'icons/obj/projectiles.dmi' - icon_state ="bluespace" - throw_speed = 3 - throw_range = 7 - throwforce = 15 - damtype = BURN - force = 15 - hitsound = 'sound/items/welder2.ogg' - -/obj/item/weapon/scrying/attack_self(mob/user) - to_chat(user, "You can see...everything!") - visible_message("[user] stares into [src], their eyes glazing over.") - user.ghostize(1) - return - -/////////////////////////////////////////Necromantic Stone/////////////////// - -/obj/item/device/necromantic_stone - name = "necromantic stone" - desc = "A shard capable of resurrecting humans as skeleton thralls." - icon = 'icons/obj/wizard.dmi' - icon_state = "necrostone" - item_state = "electronic" - origin_tech = "bluespace=4;materials=4" - w_class = WEIGHT_CLASS_TINY - var/list/spooky_scaries = list() - var/unlimited = 0 - -/obj/item/device/necromantic_stone/unlimited - unlimited = 1 - -/obj/item/device/necromantic_stone/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) - if(!istype(M)) - return ..() - - if(!istype(user) || !user.canUseTopic(M,1)) - return - - if(M.stat != DEAD) - to_chat(user, "This artifact can only affect the dead!") - return - - if(!M.mind || !M.client) - to_chat(user, "There is no soul connected to this body...") - return - - check_spooky()//clean out/refresh the list - if(spooky_scaries.len >= 3 && !unlimited) - to_chat(user, "This artifact can only affect three undead at a time!") - return - - M.set_species(/datum/species/skeleton, icon_update=0) - M.revive(full_heal = 1, admin_revive = 1) - spooky_scaries |= M - to_chat(M, "You have been revived by [user.real_name]!") - to_chat(M, "[user.p_they(TRUE)] [user.p_are()] your master now, assist them even if it costs you your new life!") - - equip_roman_skeleton(M) - - desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" - -/obj/item/device/necromantic_stone/proc/check_spooky() - if(unlimited) //no point, the list isn't used. - return - - for(var/X in spooky_scaries) - if(!ishuman(X)) - spooky_scaries.Remove(X) - continue - var/mob/living/carbon/human/H = X - if(H.stat == DEAD) - spooky_scaries.Remove(X) - continue - listclearnulls(spooky_scaries) - -//Funny gimmick, skeletons always seem to wear roman/ancient armour -/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H) - for(var/obj/item/I in H) - H.dropItemToGround(I) - - var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - H.equip_to_slot_or_del(new hat(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes) - H.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(H)) - H.put_in_hands_or_del(new /obj/item/weapon/claymore(H)) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) - - - -/////////////////////Multiverse Blade//////////////////// - -/obj/item/weapon/multisword - name = "multiverse sword" - desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side." - icon = 'icons/obj/weapons.dmi' - icon_state = "multiverse" - item_state = "multiverse" - hitsound = 'sound/weapons/bladeslice.ogg' - flags = CONDUCT - slot_flags = SLOT_BELT - sharpness = IS_SHARP - force = 20 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - var/faction = list("unassigned") - var/cooldown = 0 - var/assigned = "unassigned" - var/static/list/multiverse = list() - -/obj/item/weapon/multisword/New() - ..() - multiverse += src - - -/obj/item/weapon/multisword/Destroy() - multiverse.Remove(src) - return ..() - -/obj/item/weapon/multisword/attack_self(mob/user) - if(user.mind.special_role == "apprentice") - to_chat(user, "You know better than to touch your teacher's stuff.") - return - if(cooldown < world.time) - var/faction_check = 0 - for(var/F in faction) - if(F in user.faction) - faction_check = 1 - break - if(faction_check == 0) - faction = list("[user.real_name]") - assigned = "[user.real_name]" - user.faction = list("[user.real_name]") - to_chat(user, "You bind the sword to yourself. You can now use it to summon help.") - if(!is_gangster(user)) - var/datum/gang/multiverse/G = new(src, "[user.real_name]") - SSticker.mode.gangs += G - G.bosses += user.mind - G.add_gang_hud(user.mind) - user.mind.gang_datum = G - to_chat(user, "With your new found power you could easily conquer the station!") - var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone - hijack_objective.owner = user.mind - user.mind.objectives += hijack_objective - hijack_objective.explanation_text = "Ensure only [user.real_name] and their copies are on the shuttle!" - to_chat(user, "Objective #[1]: [hijack_objective.explanation_text]") - SSticker.mode.traitors += user.mind - user.mind.special_role = "[user.real_name] Prime" - else - var/list/candidates = get_candidates(ROLE_WIZARD) - if(candidates.len) - var/client/C = pick(candidates) - spawn_copy(C, get_turf(user.loc), user) - to_chat(user, "The sword flashes, and you find yourself face to face with...you!") - cooldown = world.time + 400 - for(var/obj/item/weapon/multisword/M in multiverse) - if(M.assigned == assigned) - M.cooldown = cooldown - - else - to_chat(user, "You fail to summon any copies of yourself. Perhaps you should try again in a bit.") - else - to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") - - -/obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) - var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) - C.prefs.copy_to(M, icon_updates=0) - M.key = C.key - M.mind.name = user.real_name - to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.") - SSticker.mode.add_gangster(M.mind, user.mind.gang_datum, FALSE) - M.real_name = user.real_name - M.name = user.real_name - M.faction = list("[user.real_name]") - if(prob(50)) - var/list/all_species = list() - for(var/speciestype in subtypesof(/datum/species)) - var/datum/species/S = speciestype - if(!initial(S.dangerous_existence)) - all_species += speciestype - M.set_species(pick(all_species), icon_update=0) - M.update_body() - M.update_hair() - M.update_body_parts() - M.dna.update_dna_identity() - equip_copy(M) - -/obj/item/weapon/multisword/proc/equip_copy(var/mob/living/carbon/human/M) - - var/obj/item/weapon/multisword/sword = new /obj/item/weapon/multisword - sword.assigned = assigned - sword.faction = list("[assigned]") - - var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator") - - switch(randomize) - if("mobster") - M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("roman") - var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - M.equip_to_slot_or_del(new hat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/roman(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes) - M.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(M)) - M.put_in_hands_or_del(sword) - - if("wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) - M.put_in_hands_or_del(sword) - if("cyborg") - for(var/X in M.bodyparts) - var/obj/item/bodypart/affecting = X - affecting.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) - M.put_in_hands_or_del(sword) - - if("syndicate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),slot_wear_mask) - M.put_in_hands_or_del(sword) - - if("assistant") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes) - M.put_in_hands_or_del(sword) - - if("animu") - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl/red(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("cultist") - M.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.put_in_hands_or_del(sword) - - if("highlander") - M.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.put_in_hands_or_del(sword) - - if("clown") - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_l_store) - M.put_in_hands_or_del(sword) - - if("killer") - M.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_l_store) - M.equip_to_slot_or_del(new /obj/item/weapon/scalpel(M), slot_r_store) - M.put_in_hands_or_del(sword) - for(var/obj/item/carried_item in M.get_equipped_items()) - carried_item.add_mob_blood(M) - for(var/obj/item/I in M.held_items) - I.add_mob_blood(M) - if("pirate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.put_in_hands_or_del(sword) - - if("soviet") - M.equip_to_slot_or_del(new /obj/item/clothing/head/pirate/captain(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate/captain(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform) - M.put_in_hands_or_del(sword) - - if("officer") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.put_in_hands_or_del(sword) - - if("gladiator") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/gladiator(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.put_in_hands_or_del(sword) - - - else - return - - M.update_body_parts() - - var/obj/item/weapon/card/id/W = new /obj/item/weapon/card/id - W.icon_state = "centcom" - W.access += GLOB.access_maint_tunnels - W.assignment = "Multiverse Traveller" - W.registered_name = M.real_name - W.update_label(M.real_name) - M.equip_to_slot_or_del(W, slot_wear_id) - - -/obj/item/voodoo - name = "wicker doll" - desc = "Something creepy about it." - icon = 'icons/obj/wizard.dmi' - icon_state = "voodoo" - item_state = "electronic" - var/mob/living/carbon/human/target = null - var/list/mob/living/carbon/human/possible = list() - var/obj/item/link = null - var/cooldown_time = 30 //3s - var/cooldown = 0 - obj_integrity = 10 - max_integrity = 10 - resistance_flags = FLAMMABLE - -/obj/item/voodoo/attackby(obj/item/I, mob/user, params) - if(target && cooldown < world.time) - if(I.is_hot()) - to_chat(target, "You suddenly feel very hot") - target.bodytemperature += 50 - GiveHint(target) - else if(is_pointed(I)) - to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") - target.Weaken(2) - GiveHint(target) - else if(istype(I,/obj/item/weapon/bikehorn)) - to_chat(target, "HONK") - target << 'sound/items/AirHorn.ogg' - target.adjustEarDamage(0,3) - GiveHint(target) - cooldown = world.time +cooldown_time - return - - if(!link) - if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL) - user.drop_item() - I.loc = src - link = I - to_chat(user, "You attach [I] to the doll.") - update_targets() - -/obj/item/voodoo/check_eye(mob/user) - if(loc != user) - user.reset_perspective(null) - user.unset_machine() - -/obj/item/voodoo/attack_self(mob/user) - if(!target && possible.len) - target = input(user, "Select your victim!", "Voodoo") as null|anything in possible - return - - if(user.zone_selected == "chest") - if(link) - target = null - link.loc = get_turf(src) - to_chat(user, "You remove the [link] from the doll.") - link = null - update_targets() - return - - if(target && cooldown < world.time) - switch(user.zone_selected) - if("mouth") - var/wgw = sanitize(input(user, "What would you like the victim to say", "Voodoo", null) as text) - target.say(wgw) - log_game("[user][user.key] made [target][target.key] say [wgw] with a voodoo doll.") - if("eyes") - user.set_machine(src) - user.reset_perspective(target) - spawn(100) - user.reset_perspective(null) - user.unset_machine() - if("r_leg","l_leg") - to_chat(user, "You move the doll's legs around.") - var/turf/T = get_step(target,pick(GLOB.cardinal)) - target.Move(T) - if("r_arm","l_arm") - target.click_random_mob() - GiveHint(target) - if("head") - to_chat(user, "You smack the doll's head with your hand.") - target.Dizzy(10) - to_chat(target, "You suddenly feel as if your head was hit with a hammer!") - GiveHint(target,user) - if("groin") - if(target.canbearoused) - to_chat(user, "You rub the groin on [src]. You're weird.") - target.adjustArousalLoss(5) - to_chat(target, "You suddenly feel hot... and quite good") - if(prob(33)) - target.emote(pick("moan","blush")) - GiveHint(target, user) - cooldown = world.time + cooldown_time - -/obj/item/voodoo/proc/update_targets() - possible = list() - if(!link) - return - for(var/mob/living/carbon/human/H in GLOB.living_mob_list) - if(md5(H.dna.uni_identity) in link.fingerprints) - possible |= H - -/obj/item/voodoo/proc/GiveHint(mob/victim,force=0) - if(prob(50) || force) - var/way = dir2text(get_dir(victim,get_turf(src))) - to_chat(victim, "You feel a dark presence from [way]") - if(prob(20) || force) - var/area/A = get_area(src) - to_chat(victim, "You feel a dark presence from [A.name]") - -/obj/item/voodoo/fire_act(exposed_temperature, exposed_volume) - if(target) - target.adjust_fire_stacks(20) - target.IgniteMob() - GiveHint(target,1) - return ..() - - -//Provides a decent heal, need to pump every 6 seconds -/obj/item/organ/heart/cursed/wizard - pump_delay = 60 - heal_brute = 25 - heal_burn = 25 - heal_oxy = 25 - -//Warp Whistle: Provides uncontrolled long distance teleportation. - -/obj/item/warpwhistle - name = "warp whistle" - desc = "One toot on this whistle will send you to a far away land!" - icon = 'icons/obj/wizard.dmi' - icon_state = "whistle" - var/on_cooldown = 0 //0: usable, 1: in use, 2: on cooldown - var/mob/living/carbon/last_user - -/obj/item/warpwhistle/proc/interrupted(mob/living/carbon/user) - if(!user || QDELETED(src)) - on_cooldown = FALSE - return TRUE - return FALSE - -/obj/item/warpwhistle/attack_self(mob/living/carbon/user) - if(!istype(user) || on_cooldown) - return - on_cooldown = TRUE - last_user = user - var/turf/T = get_turf(user) - playsound(T,'sound/magic/WarpWhistle.ogg', 200, 1) - user.canmove = 0 - new /obj/effect/overlay/temp/tornado(T) - sleep(20) - if(interrupted(user)) - return - user.invisibility = INVISIBILITY_MAXIMUM - user.status_flags |= GODMODE - sleep(20) - if(interrupted(user)) - return - var/breakout = 0 - while(breakout < 50) - var/turf/potential_T = find_safe_turf() - if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) - user.forceMove(potential_T) - user.canmove = 0 - T = potential_T - break - breakout += 1 - new /obj/effect/overlay/temp/tornado(T) - sleep(20) - if(interrupted(user)) - return - user.invisibility = initial(user.invisibility) - user.status_flags &= ~GODMODE - user.canmove = 1 - on_cooldown = 2 - sleep(40) - on_cooldown = 0 - -/obj/item/warpwhistle/Destroy() - if(on_cooldown == 1 && last_user) //Flute got dunked somewhere in the teleport - last_user.invisibility = initial(last_user.invisibility) - last_user.status_flags &= ~GODMODE - last_user.canmove = 1 - return ..() - -/obj/effect/overlay/temp/tornado - icon = 'icons/obj/wizard.dmi' - icon_state = "tornado" - name = "tornado" - desc = "This thing sucks!" - layer = FLY_LAYER - randomdir = 0 - duration = 40 - pixel_x = 500 - -/obj/effect/overlay/temp/tornado/New(loc) - ..() - animate(src, pixel_x = -500, time = 40) From 875879127842cbb46cbe2f848039040bf9d8d553 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 17:28:18 -0500 Subject: [PATCH 088/131] Fixes Biogenerator --- code/modules/research/research.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 25b3a98980..dfd64c3101 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -185,7 +185,7 @@ research holder datum. if((D.build_type & SMELTER) && ("initial" in D.category)) AddDesign2Known(D) -/datum/research/biogenerator/AddDesign2Known(datum/design/D) +/datum/research/smelter/AddDesign2Known(datum/design/D) if(!(D.build_type & SMELTER)) return ..() From ea3ee7accc1decdd12a228248fdd6e39ae9ef291 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 17:31:24 -0500 Subject: [PATCH 089/131] Adds persistent trophy cases --- code/_globalvars/lists/objects.dm | 1 + code/controllers/subsystem/persistence.dm | 57 +++++++++- code/game/objects/structures/displaycase.dm | 109 ++++++++++++++++++-- 3 files changed, 157 insertions(+), 10 deletions(-) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index be771e0676..e82976d4a3 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -29,6 +29,7 @@ GLOBAL_LIST_EMPTY(zombie_infection_list) // A list of all zombie_infection org GLOBAL_LIST_EMPTY(meteor_list) // List of all meteors. GLOBAL_LIST_EMPTY(active_jammers) // List of active radio jammers GLOBAL_LIST_EMPTY(ladders) +GLOBAL_LIST_EMPTY(trophy_cases) GLOBAL_LIST_EMPTY(wire_color_directory) GLOBAL_LIST_EMPTY(wire_name_directory) \ No newline at end of file diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index e1cf992e8b..6b3e47054c 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -11,10 +11,14 @@ SUBSYSTEM_DEF(persistence) var/list/saved_messages = list() var/savefile/chisel_messages_sav + var/savefile/trophy_sav + var/list/saved_trophies = list() + /datum/controller/subsystem/persistence/Initialize() LoadSatchels() LoadPoly() LoadChiselMessages() + LoadTrophies() ..() /datum/controller/subsystem/persistence/proc/LoadSatchels() @@ -105,10 +109,49 @@ SUBSYSTEM_DEF(persistence) M.persists = FALSE qdel(M) +/datum/controller/subsystem/persistence/proc/LoadTrophies() + trophy_sav = new /savefile("data/npc_saves/TrophyItems.sav") + var/saved_json + trophy_sav >> saved_json + + var/decoded_json = json_decode(saved_json) + + if(!islist(decoded_json)) + return + + saved_trophies = decoded_json + + SetUpTrophies(saved_trophies.Copy()) + +/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items) + for(var/A in GLOB.trophy_cases) + var/obj/structure/displaycase/trophy/T = A + T.added_roundstart = TRUE + + var/trophy_data = pick_n_take(trophy_items) + + if(!islist(trophy_data)) + continue + + var/list/chosen_trophy = trophy_data + + if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed + continue + + var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null + if(!path) + continue + + T.showpiece = new /obj/item/showpiece_dummy(T, path) + T.trophy_message = chosen_trophy["message"] + T.placer_key = chosen_trophy["placer_key"] + T.update_icon() + /datum/controller/subsystem/persistence/proc/CollectData() CollectChiselMessages() CollectSecretSatchels() + CollectTrophies() /datum/controller/subsystem/persistence/proc/CollectSecretSatchels() for(var/A in new_secret_satchels) @@ -135,4 +178,16 @@ SUBSYSTEM_DEF(persistence) chisel_messages_sav[SSmapping.config.map_name] << json_encode(saved_messages) /datum/controller/subsystem/persistence/proc/SaveChiselMessage(obj/structure/chisel_message/M) - saved_messages += list(M.pack()) // dm eats one list. + saved_messages += list(M.pack()) // dm eats one list + + +/datum/controller/subsystem/persistence/proc/CollectTrophies() + trophy_sav << json_encode(saved_trophies) + +/datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T) + if(!T.added_roundstart && T.showpiece) + var/list/data = list() + data["path"] = T.showpiece.type + data["message"] = T.trophy_message + data["placer_key"] = T.placer_key + saved_trophies += list(data) \ No newline at end of file diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index be1b49074d..3817a16685 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -16,27 +16,25 @@ var/obj/item/weapon/electronics/airlock/electronics var/start_showpiece_type = null //add type for items on display -/obj/structure/displaycase/New() - ..() +/obj/structure/displaycase/Initialize() + . = ..() if(start_showpiece_type) showpiece = new start_showpiece_type (src) update_icon() /obj/structure/displaycase/Destroy() if(electronics) - qdel(electronics) - electronics = null + QDEL_NULL(electronics) if(showpiece) - qdel(showpiece) - showpiece = null + QDEL_NULL(showpiece) return ..() /obj/structure/displaycase/examine(mob/user) ..() - if(showpiece) - to_chat(user, "There's [showpiece] inside.") if(alert) to_chat(user, "Hooked up with an anti-theft system.") + if(showpiece) + to_chat(user, "There's [showpiece] inside.") /obj/structure/displaycase/proc/dump() @@ -176,8 +174,8 @@ /obj/structure/displaycase/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) if (showpiece && (broken || open)) - dump() to_chat(user, "You deactivate the hover field built into the case.") + dump() src.add_fingerprint(user) update_icon() return @@ -249,3 +247,96 @@ desc = "A glass lab container for storing interesting creatures." start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr req_access = list(GLOB.access_rd) + + + +/obj/structure/displaycase/trophy + name = "trophy display case" + desc = "Store your trophies of accomplishment in here, and they will stay forever." + var/trophy_message = "" + var/placer_key = "" + var/added_roundstart = TRUE + alert = TRUE + integrity_failure = 0 + +/obj/structure/displaycase/trophy/Initialize() + . = ..() + GLOB.trophy_cases += src + +/obj/structure/displaycase/trophy/Destroy() + GLOB.trophy_cases -= src + return ..() + +/obj/structure/displaycase/trophy/examine(mob/user) + ..() + if(trophy_message) + to_chat(user, "The plaque reads:") + to_chat(user, trophy_message) + +/obj/structure/displaycase/trophy/attackby(obj/item/weapon/W, mob/user, params) + + if(!user.Adjacent(src)) //no TK museology + return + + if(!added_roundstart) + to_chat(user, "You've already put something new in this case.") + return + + if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types)) + to_chat(user, "The case rejects the [W].") + return + + for(var/a in W.GetAllContents()) + if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types)) + to_chat(user, "The case rejects the [W].") + return + + if(user.drop_item()) + + if(showpiece) + to_chat(user, "You press a button, and [showpiece] descends into the floor of the case.") + QDEL_NULL(showpiece) + + to_chat(user, "You insert [W] into the case.") + W.forceMove(src) + showpiece = W + added_roundstart = FALSE + update_icon() + + placer_key = user.ckey + + trophy_message = W.desc //default value + + var/chosen_plaque = stripped_input(user, "What would you like the plaque to say? Default value is item's description.", "Trophy Plaque") + if(chosen_plaque) + if(user.Adjacent(src)) + trophy_message = chosen_plaque + to_chat(user, "You set the plaque's text.") + else + to_chat(user, "You are too far to set the plaque's text.") + + SSpersistence.SaveTrophy(src) + + else + to_chat(user, "\The [W] is stuck to your hand, you can't put it in the [src.name]!") + + return + +/obj/structure/displaycase/trophy/dump() + if (showpiece) + if(added_roundstart) + visible_message("The [showpiece] crumbles to dust!") + new /obj/effect/decal/cleanable/ash(loc) + QDEL_NULL(showpiece) + else + ..() + +/obj/item/showpiece_dummy + name = "Cheap replica" + +/obj/item/showpiece_dummy/Initialize(mapload, path) + . = ..() + var/obj/item/I = path + name = initial(I.name) + icon = initial(I.icon) + icon_state = initial(I.icon_state) From b45d4ba6685f3bf705d62a3f65e26e2a47c41c38 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 17:32:29 -0500 Subject: [PATCH 090/131] Makes admin sound announcement use the right span --- code/modules/admin/verbs/playsound.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index ddc44592c0..613881281e 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -21,7 +21,7 @@ var/res = alert(usr, "Show the title of this song to the players?",, "No", "Yes", "Cancel") switch(res) if("Yes") - to_chat(world, "An admin played: [S]") + to_chat(world, "An admin played: [S]") if("Cancel") return From d29de62d697a87b6e6b1a124d663cde2ea643294 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 17:34:34 -0500 Subject: [PATCH 091/131] Plants now react with turfs on squash() --- code/modules/hydroponics/grown.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 555df764b8..5104ab333a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -111,6 +111,7 @@ for(var/datum/plant_gene/trait/trait in seed.genes) trait.on_squash(src, target) + reagents.reaction(T) for(var/A in T) reagents.reaction(A) From 3fff6d4a1d36706e15adc3c4002123de4cf52718 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 20:27:03 -0500 Subject: [PATCH 092/131] Fixes cult datum giving the action button to the mind instead of mob --- code/datums/antagonists/datum_clockcult.dm | 2 +- code/datums/antagonists/datum_cult.dm | 26 +++++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index ba18e76f02..85ff6f8930 100644 --- a/code/datums/antagonists/datum_clockcult.dm +++ b/code/datums/antagonists/datum_clockcult.dm @@ -16,7 +16,7 @@ if(!istype(current)) return if(jobban_isbanned(current, ROLE_SERVANT_OF_RATVAR)) - addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0) + addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0) owner.current.log_message("Has been converted to the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) if(issilicon(current)) var/mob/living/silicon/S = owner diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index 69c9849782..e6db239241 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -10,24 +10,30 @@ if(!owner) return if(jobban_isbanned(owner.current, ROLE_CULTIST)) - addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST), 0) + addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner.current, ROLE_CULTIST, ROLE_CULTIST), 0) owner.current.log_message("Has been converted to the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) -/datum/antagonist/cult/apply_innate_effects() +/datum/antagonist/cult/apply_innate_effects(mob/living/mob_override) . = ..() - owner.current.faction |= "cult" - owner.current.verbs += /mob/living/proc/cult_help - communion.Grant(owner) + var/mob/living/current = owner.current + if(mob_override) + current = mob_override + current.faction |= "cult" + current.verbs += /mob/living/proc/cult_help + communion.Grant(current) -/datum/antagonist/cult/remove_innate_effects() +/datum/antagonist/cult/remove_innate_effects(mob/living/mob_override) . = ..() - owner.current.faction -= "cult" - owner.current.verbs -= /mob/living/proc/cult_help - + var/mob/living/current = owner.current + if(mob_override) + current = mob_override + current.faction -= "cult" + current.verbs -= /mob/living/proc/cult_help + communion.Remove(current) /datum/antagonist/cult/on_removal() . = ..() to_chat(owner, "An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.") owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) if(!silent) - owner.current.visible_message("[owner] looks like [owner.current.p_they()] just reverted to their old faith!") \ No newline at end of file + owner.current.visible_message("[owner] looks like [owner.current.p_they()] just reverted to their old faith!") From 22f6aecdf7df4c25b3a79eabccaa76b017d6b092 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 1 May 2017 21:03:40 -0500 Subject: [PATCH 093/131] Fixes cult and clockcult icons --- code/datums/antagonists/datum_clockcult.dm | 3 ++- code/datums/antagonists/datum_cult.dm | 1 + code/datums/antagonists/datum_cult.dm.rej | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 code/datums/antagonists/datum_cult.dm.rej diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index ba18e76f02..f30c6505c5 100644 --- a/code/datums/antagonists/datum_clockcult.dm +++ b/code/datums/antagonists/datum_clockcult.dm @@ -29,6 +29,7 @@ else if(isbrain(current) || isclockmob(current)) to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") ..() + SSticker.mode.update_servant_icons_added(owner) if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) var/datum/game_mode/clockwork_cult/C = SSticker.mode C.present_tasks(owner) //Memorize the objectives @@ -39,7 +40,6 @@ if(istype(mob_override)) current = mob_override GLOB.all_clockwork_mobs += current - SSticker.mode.update_servant_icons_added(owner) current.faction |= "ratvar" current.grant_language(/datum/language/ratvar) current.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them for whatever reason, we need to update buttons @@ -117,6 +117,7 @@ /datum/antagonist/clockcult/on_removal() . = ..() + SSticker.mode.update_servant_icons_removed(owner) if(!silent) owner.current.visible_message("[owner] seems to have remembered their true allegiance!", \ "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index 69c9849782..691494568c 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -27,6 +27,7 @@ /datum/antagonist/cult/on_removal() . = ..() + SSticker.mode.update_cult_icons_removed(owner) to_chat(owner, "An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.") owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) if(!silent) diff --git a/code/datums/antagonists/datum_cult.dm.rej b/code/datums/antagonists/datum_cult.dm.rej new file mode 100644 index 0000000000..991ad512c9 --- /dev/null +++ b/code/datums/antagonists/datum_cult.dm.rej @@ -0,0 +1,9 @@ +diff a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm (rejected hunks) +@@ -11,6 +11,7 @@ + return + if(jobban_isbanned(owner.current, ROLE_CULTIST)) + addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner.current, ROLE_CULTIST, ROLE_CULTIST), 0) ++ SSticker.mode.update_cult_icons_added(owner) + owner.current.log_message("Has been converted to the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) + + /datum/antagonist/cult/apply_innate_effects(mob/living/mob_override) From fa888cc5214c69f433512cad7f4535f1c9b8c65f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 02:49:41 -0500 Subject: [PATCH 094/131] Fixes drakes continuing to swoop when killed (#713) --- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 3425d08e23..45139747fa 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -187,8 +187,9 @@ Difficulty: Medium animate(src, transform = matrix()*0.9, time = 3, easing = BOUNCE_EASING) for(var/i in 1 to 3) sleep(1) - if(QDELETED(src)) //we got hit and died, rip us + if(QDELETED(src) || stat == DEAD) //we got hit and died, rip us qdel(F) + swooping &= ~SWOOP_DAMAGEABLE return animate(src, transform = matrix()*0.7, time = 7) swooping |= SWOOP_INVULNERABLE From ed39a1200282716fedb05e9de0a80af2a367b495 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 03:04:10 -0500 Subject: [PATCH 095/131] Automatic changelog generation for PR #686 [ci skip] --- html/changelogs/AutoChangeLog-pr-686.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-686.yml diff --git a/html/changelogs/AutoChangeLog-pr-686.yml b/html/changelogs/AutoChangeLog-pr-686.yml new file mode 100644 index 0000000000..a99d84632f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-686.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - tweak: "Syndicate surplus crates now contain fewer implants" From 596a4e5a9c2dc77cd086a89062d8fbf47c0b479d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 03:04:26 -0500 Subject: [PATCH 096/131] Automatic changelog generation for PR #689 [ci skip] --- html/changelogs/AutoChangeLog-pr-689.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-689.yml diff --git a/html/changelogs/AutoChangeLog-pr-689.yml b/html/changelogs/AutoChangeLog-pr-689.yml new file mode 100644 index 0000000000..6c917057bc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-689.yml @@ -0,0 +1,4 @@ +author: "Joan" +delete-after: True +changes: + - rscadd: "Gaining Vanguard, such as from the Linked Vanguard scripture, will remove existing stuns." From 4a6ffec4129612c61df11d1391e8e2d4fd9d70a1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 04:56:46 -0500 Subject: [PATCH 097/131] rej cleanup --- code/__DEFINES/subsystems.dm.rej | 18 ------- code/controllers/subsystem/atoms.dm.rej | 9 ---- code/game/objects/effects/overlays.dm.rej | 21 --------- code/game/objects/items.dm.rej | 10 ---- code/modules/admin/admin_verbs.dm.rej | 11 ----- code/modules/admin/verbs/debug.dm.rej | 41 ---------------- code/modules/holodeck/computer.dm.rej | 47 ------------------- .../mob/dead/new_player/new_player.dm.rej | 9 ---- .../hostile/megafauna/colossus.dm.rej | 10 ---- .../hostile/megafauna/dragon.dm.rej | 23 --------- code/modules/recycling/conveyor2.dm.rej | 10 ---- code/modules/shuttle/arrivals.dm.rej | 11 ----- code/modules/shuttle/shuttle.dm.rej | 10 ---- code/modules/station_goals/bsa.dm.rej | 12 ----- .../surgery/organs/organ_internal.dm.rej | 10 ---- code/modules/surgery/surgery.dm.rej | 10 ---- code/modules/vehicles/atv.dm.rej | 12 ----- code/modules/vehicles/speedbike.dm.rej | 23 --------- 18 files changed, 297 deletions(-) delete mode 100644 code/__DEFINES/subsystems.dm.rej delete mode 100644 code/controllers/subsystem/atoms.dm.rej delete mode 100644 code/game/objects/effects/overlays.dm.rej delete mode 100644 code/game/objects/items.dm.rej delete mode 100644 code/modules/admin/admin_verbs.dm.rej delete mode 100644 code/modules/admin/verbs/debug.dm.rej delete mode 100644 code/modules/holodeck/computer.dm.rej delete mode 100644 code/modules/mob/dead/new_player/new_player.dm.rej delete mode 100644 code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej delete mode 100644 code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej delete mode 100644 code/modules/recycling/conveyor2.dm.rej delete mode 100644 code/modules/shuttle/arrivals.dm.rej delete mode 100644 code/modules/shuttle/shuttle.dm.rej delete mode 100644 code/modules/station_goals/bsa.dm.rej delete mode 100644 code/modules/surgery/organs/organ_internal.dm.rej delete mode 100644 code/modules/surgery/surgery.dm.rej delete mode 100644 code/modules/vehicles/atv.dm.rej delete mode 100644 code/modules/vehicles/speedbike.dm.rej diff --git a/code/__DEFINES/subsystems.dm.rej b/code/__DEFINES/subsystems.dm.rej deleted file mode 100644 index cf39977224..0000000000 --- a/code/__DEFINES/subsystems.dm.rej +++ /dev/null @@ -1,18 +0,0 @@ -diff a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm (rejected hunks) -@@ -26,4 +26,13 @@ - - #define INITIALIZE_HINT_NORMAL 0 //Nothing happens - #define INITIALIZE_HINT_LATELOAD 1 //Call LateInitialize --#define INITIALIZE_HINT_QDEL 2 //Call qdel on the atom -\ No newline at end of file -+#define INITIALIZE_HINT_QDEL 2 //Call qdel on the atom -+ -+//type and all subtypes should always call Initialize in New() -+#define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\ -+ ..();\ -+ if(!initialized) {\ -+ args[1] = TRUE;\ -+ SSatoms.InitAtom(src, args);\ -+ }\ -+} -\ No newline at end of file diff --git a/code/controllers/subsystem/atoms.dm.rej b/code/controllers/subsystem/atoms.dm.rej deleted file mode 100644 index 4d7225164f..0000000000 --- a/code/controllers/subsystem/atoms.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm (rejected hunks) -@@ -12,6 +12,7 @@ SUBSYSTEM_DEF(atoms) - var/old_initialized - - var/list/late_loaders -+ var/list/created_atoms - - var/list/BadInitializeCalls = list() - diff --git a/code/game/objects/effects/overlays.dm.rej b/code/game/objects/effects/overlays.dm.rej deleted file mode 100644 index f25f8f24e9..0000000000 --- a/code/game/objects/effects/overlays.dm.rej +++ /dev/null @@ -1,21 +0,0 @@ -diff a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm (rejected hunks) -@@ -31,8 +31,8 @@ - . = ..() - deltimer(timerid) - --/obj/effect/overlay/temp/New() -- ..() -+/obj/effect/overlay/temp/Initialize() -+ . = ..() - if(randomdir) - setDir(pick(GLOB.cardinal)) - flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation. -@@ -214,7 +221,7 @@ - icon = 'icons/effects/fire.dmi' - icon_state = "3" - duration = 20 -- -+ - /obj/effect/overlay/temp/cult - randomdir = 0 - duration = 10 diff --git a/code/game/objects/items.dm.rej b/code/game/objects/items.dm.rej deleted file mode 100644 index 7366e22899..0000000000 --- a/code/game/objects/items.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/objects/items.dm b/code/game/objects/items.dm (rejected hunks) -@@ -102,7 +102,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s - /obj/item/Initialize() - if (!materials) - materials = list() -- ..() -+ . = ..() - for(var/path in actions_types) - new path(src) - actions_types = null diff --git a/code/modules/admin/admin_verbs.dm.rej b/code/modules/admin/admin_verbs.dm.rej deleted file mode 100644 index e710d417c2..0000000000 --- a/code/modules/admin/admin_verbs.dm.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm (rejected hunks) -@@ -153,7 +153,8 @@ var/list/admin_verbs_debug = list( - /client/proc/clear_dynamic_transit, - /client/proc/toggle_medal_disable, - /client/proc/view_runtimes, -- /client/proc/pump_random_event -+ /client/proc/pump_random_event, -+ /client/proc/cmd_display_init_log - ) - var/list/admin_verbs_possess = list( - /proc/possess, diff --git a/code/modules/admin/verbs/debug.dm.rej b/code/modules/admin/verbs/debug.dm.rej deleted file mode 100644 index b5277b316c..0000000000 --- a/code/modules/admin/verbs/debug.dm.rej +++ /dev/null @@ -1,41 +0,0 @@ -diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm (rejected hunks) -@@ -83,17 +83,23 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that - to_chat(usr, .) - feedback_add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - --GLOBAL_VAR_INIT(AdminProcCall, null) --GLOBAL_PROTECT(AdminProcCall) -+GLOBAL_VAR_INIT(AdminProcCaller, null) -+GLOBAL_PROTECT(AdminProcCaller) -+GLOBAL_VAR_INIT(AdminProcCallCount, 0) -+GLOBAL_PROTECT(AdminProcCallCount) - - /proc/WrapAdminProcCall(target, procname, list/arguments) -- if(GLOB.AdminProcCall) -- to_chat(usr, "Another admin called proc is still running, your proc will be run after theirs finishes") -- UNTIL(!GLOB.AdminProcCall) -+ var/current_caller = GLOB.AdminProcCaller -+ var/ckey = usr.client.ckey -+ if(current_caller && current_caller != ckey) -+ to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") -+ UNTIL(!GLOB.AdminProcCaller) - to_chat(usr, "Running your proc") -- GLOB.AdminProcCall = usr.client.ckey //if this runtimes, too bad for you -+ GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you -+ ++GLOB.AdminProcCallCount - world.WrapAdminProcCall(target, procname, arguments) -- GLOB.AdminProcCall = null -+ if(--GLOB.AdminProcCallCount == 0) -+ GLOB.AdminProcCaller = null - - //adv proc call this, ya nerds - /world/proc/WrapAdminProcCall(target, procname, list/arguments) -@@ -103,7 +109,7 @@ GLOBAL_PROTECT(AdminProcCall) - return call(procname)(arglist(arguments)) - - /proc/IsAdminAdvancedProcCall() -- return usr && usr.client && GLOB.AdminProcCall == usr.client.ckey -+ return usr && usr.client && GLOB.AdminProcCaller == usr.client.ckey - - /client/proc/callproc_datum(datum/A as null|area|mob|obj|turf) - set category = "Debug" diff --git a/code/modules/holodeck/computer.dm.rej b/code/modules/holodeck/computer.dm.rej deleted file mode 100644 index 7a8dcd75cd..0000000000 --- a/code/modules/holodeck/computer.dm.rej +++ /dev/null @@ -1,47 +0,0 @@ -diff a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm (rejected hunks) -@@ -64,25 +64,26 @@ - ..() - - /obj/machinery/computer/holodeck/Initialize(mapload) -- . = mapload //late-initialize, area_copy need turfs to have air -- if(!mapload) -- ..() -- program_cache = list() -- emag_programs = list() -- for(var/typekey in subtypesof(program_type)) -- var/area/holodeck/A = locate(typekey) -- if(!A || A == offline_program) continue -- if(A.contents.len == 0) continue // not loaded -- if(A.restricted) -- emag_programs += A -- else -- program_cache += A -- if(typekey == init_program) -- load_program(A,force=1) -- if(random_program && program_cache.len && init_program == null) -- load_program(pick(program_cache),force=1) -- else if(!program) -- load_program(offline_program) -+ ..() -+ return INITIALIZE_HINT_LATELOAD -+ -+/obj/machinery/computer/holodeck/LateInitialize() -+ program_cache = list() -+ emag_programs = list() -+ for(var/typekey in subtypesof(program_type)) -+ var/area/holodeck/A = locate(typekey) -+ if(!A || A == offline_program) continue -+ if(A.contents.len == 0) continue // not loaded -+ if(A.restricted) -+ emag_programs += A -+ else -+ program_cache += A -+ if(typekey == init_program) -+ load_program(A,force=1) -+ if(random_program && program_cache.len && init_program == null) -+ load_program(pick(program_cache),force=1) -+ else if(!program) -+ load_program(offline_program) - - /obj/machinery/computer/holodeck/power_change() - ..() diff --git a/code/modules/mob/dead/new_player/new_player.dm.rej b/code/modules/mob/dead/new_player/new_player.dm.rej deleted file mode 100644 index 9ebe59e8f8..0000000000 --- a/code/modules/mob/dead/new_player/new_player.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm (rejected hunks) -@@ -30,6 +30,7 @@ - loc = pick(newplayer_start) - else - loc = locate(1,1,1) -+ return INITIALIZE_HINT_NORMAL - - /mob/dead/new_player/proc/new_player_panel() - diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej deleted file mode 100644 index 3dab6ff0a6..0000000000 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm (rejected hunks) -@@ -106,7 +106,7 @@ Difficulty: Very Hard - var/target - - /obj/effect/overlay/temp/at_shield/Initialize(mapload, new_target) -- ..() -+ . = ..() - target = new_target - INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE) - diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej deleted file mode 100644 index 84c2ab0b38..0000000000 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm.rej +++ /dev/null @@ -1,23 +0,0 @@ -diff a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm (rejected hunks) -@@ -96,8 +96,8 @@ Difficulty: Medium - duration = 12 - pixel_z = 500 - --/obj/effect/overlay/temp/fireball/Initialize(loc) -- ..() -+/obj/effect/overlay/temp/fireball/Initialize() -+ . = ..() - animate(src, pixel_z = 0, time = 12) - - /obj/effect/overlay/temp/target -@@ -121,8 +121,8 @@ Difficulty: Medium - /obj/effect/overlay/temp/target/ex_act() - return - --/obj/effect/overlay/temp/target/Initialize(loc) -- ..() -+/obj/effect/overlay/temp/target/Initialize() -+ . = ..() - INVOKE_ASYNC(src, .proc/fall) - - /obj/effect/overlay/temp/target/proc/fall() diff --git a/code/modules/recycling/conveyor2.dm.rej b/code/modules/recycling/conveyor2.dm.rej deleted file mode 100644 index 328ac26919..0000000000 --- a/code/modules/recycling/conveyor2.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm (rejected hunks) -@@ -220,7 +220,7 @@ - id = newid - update() - -- return INITIALIZE_HINT_LATELOAD -+ return INITIALIZE_HINT_LATELOAD //for machines list - - /obj/machinery/conveyor_switch/LateInitialize() - conveyors = list() diff --git a/code/modules/shuttle/arrivals.dm.rej b/code/modules/shuttle/arrivals.dm.rej deleted file mode 100644 index 8310a4f3db..0000000000 --- a/code/modules/shuttle/arrivals.dm.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm (rejected hunks) -@@ -30,6 +30,9 @@ - ..() - - preferred_direction = dir -+ return INITIALIZE_HINT_LATELOAD //for latejoin list -+ -+/obj/docking_port/mobile/arrivals/LateInitialize() - areas = list() - - var/list/new_latejoin = list() diff --git a/code/modules/shuttle/shuttle.dm.rej b/code/modules/shuttle/shuttle.dm.rej deleted file mode 100644 index 5dc3c5a13a..0000000000 --- a/code/modules/shuttle/shuttle.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm (rejected hunks) -@@ -316,7 +316,7 @@ - if(!check_dock(S)) - testing("check_dock failed on request for [src]") - return -- -+ - if(mode == SHUTTLE_IGNITING && destination == S) - return - diff --git a/code/modules/station_goals/bsa.dm.rej b/code/modules/station_goals/bsa.dm.rej deleted file mode 100644 index d252acd18d..0000000000 --- a/code/modules/station_goals/bsa.dm.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm (rejected hunks) -@@ -161,8 +161,8 @@ - return locate(world.maxx,y,z) - return get_turf(src) - --/obj/machinery/bsa/full/New(loc,cannon_direction = WEST) -- ..() -+/obj/machinery/bsa/full/Initialize(mapload,cannon_direction = WEST) -+ . = ..() - switch(cannon_direction) - if(WEST) - dir = WEST diff --git a/code/modules/surgery/organs/organ_internal.dm.rej b/code/modules/surgery/organs/organ_internal.dm.rej deleted file mode 100644 index 51db3e41ea..0000000000 --- a/code/modules/surgery/organs/organ_internal.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm (rejected hunks) -@@ -655,7 +655,7 @@ - var/phomeme_type = "sans" - var/list/phomeme_types = list("sans", "papyrus") - --/obj/item/organ/tongue/bone/New() -+/obj/item/organ/tongue/bone/Initialize() - . = ..() - phomeme_type = pick(phomeme_types) - diff --git a/code/modules/surgery/surgery.dm.rej b/code/modules/surgery/surgery.dm.rej deleted file mode 100644 index 04205e9e66..0000000000 --- a/code/modules/surgery/surgery.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm (rejected hunks) -@@ -54,7 +54,7 @@ - return new step_type - - /datum/surgery/proc/complete() -- feedback_add_details("surgeries_completed", type) -+ feedback_add_details("surgeries_completed", "[type]") - qdel(src) - - diff --git a/code/modules/vehicles/atv.dm.rej b/code/modules/vehicles/atv.dm.rej deleted file mode 100644 index 4595beddc4..0000000000 --- a/code/modules/vehicles/atv.dm.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm (rejected hunks) -@@ -9,8 +9,8 @@ - . = ..() - riding_datum = new/datum/riding/atv - --/obj/vehicle/atv/New() -- ..() -+/obj/vehicle/atv/Initialize() -+ . = ..() - if(!atvcover) - atvcover = image("icons/obj/vehicles.dmi", "atvcover") - atvcover.layer = ABOVE_MOB_LAYER diff --git a/code/modules/vehicles/speedbike.dm.rej b/code/modules/vehicles/speedbike.dm.rej deleted file mode 100644 index 26fe1428c9..0000000000 --- a/code/modules/vehicles/speedbike.dm.rej +++ /dev/null @@ -1,23 +0,0 @@ -diff a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm (rejected hunks) -@@ -16,20 +16,9 @@ - overlay.layer = ABOVE_MOB_LAYER - add_overlay(overlay) - --/obj/effect/overlay/temp/speedbike_trail -- name = "speedbike trails" -- icon_state = "ion_fade" -- layer = BELOW_MOB_LAYER -- duration = 10 -- randomdir = 0 -- --/obj/effect/overlay/temp/speedbike_trail/New(loc,move_dir) -- ..() -- setDir(move_dir) -- - /obj/vehicle/space/speedbike/Move(newloc,move_dir) - if(has_buckled_mobs()) -- new /obj/effect/overlay/temp/speedbike_trail(loc,move_dir) -+ new /obj/effect/overlay/temp/dir_setting/speedbike_trail(loc,move_dir) - . = ..() - - /obj/vehicle/space/speedbike/red From aa45f555e348415c6725f6cfc72ebe32cfd39a19 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 04:57:29 -0500 Subject: [PATCH 098/131] Makes the cult Talisman of Horrors ranged --- code/game/gamemodes/cult/ritual.dm | 2 +- code/game/gamemodes/cult/talisman.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 2ed6840c91..cc8c97fb9b 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -133,7 +133,7 @@ This file contains the arcane tome files. text += "Talisman of Armaments
The Talisman of Arming will equip the user with armored robes, a backpack, an eldritch longsword, an empowered bola, and a pair of boots. Any items that cannot \ be equipped will not be summoned. Attacking a fellow cultist with it will instead equip them.

" - text += "Talisman of Horrors
The Talisman of Horror must be applied directly to the victim, it will shatter your victim's mind with visions of the endtimes that may incapitate them.

" + text += "Talisman of Horrors
The Talisman of Horror, unlike other talismans, can be applied at range, without the victim noticing. It will cause the victim to have severe hallucinations after a short while.

" text += "Talisman of Shackling
The Talisman of Shackling must be applied directly to the victim, it has 4 uses and cuffs victims with magic shackles that disappear when removed.

" diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 2876e80373..d2e1fcaf10 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -309,12 +309,12 @@ invocation = "Lo'Nab Na'Dm!" creation_time = 80 -/obj/item/weapon/paper/talisman/horror/attack(mob/living/target, mob/living/user) - if(iscultist(user)) - to_chat(user, "You disturb [target] with visons of the end!") +/obj/item/weapon/paper/talisman/horror/afterattack(mob/living/target, mob/living/user) + if(iscultist(user) && (get_dist(user, target) < 7)) + to_chat(user, "You disturb [target] with visions of madness!") if(iscarbon(target)) var/mob/living/carbon/H = target - H.reagents.add_reagent("mindbreaker", 25) + H.reagents.add_reagent("mindbreaker", 12) if(is_servant_of_ratvar(target)) to_chat(target, "You see a brief but horrible vision of Ratvar, rusted and scrapped, being torn apart.") target.emote("scream") From a8e6de5795f70c8c41fbaf285c97b2a56601779f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 05:06:13 -0500 Subject: [PATCH 099/131] manual merge --- code/datums/datumvars.dm | 28 ++++++++++++------------- code/modules/admin/verbs/randomverbs.dm | 23 ++++++++++++-------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 7de57e4bb9..fbbf97a6ca 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -27,7 +27,7 @@ . += "---" .["Call Proc"] = "?_src_=vars;proc_call=\ref[src]" .["Mark Object"] = "?_src_=vars;mark_object=\ref[src]" - .["Delete"] = "?_src_=vars;delete=\ref[src]" + .["Delete"] = "?_src_=vars;delete=\ref[src]" /datum/proc/on_reagent_change() @@ -94,7 +94,6 @@ CLONE:[M.getCloneLoss()] BRAIN:[M.getBrainLoss()] STAMINA:[M.getStaminaLoss()] - AROUSAL:[M.getArousalLoss()] "} else @@ -447,7 +446,7 @@ var/list/L = value var/list/items = list() - if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150))) + if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150))) for (var/i in 1 to L.len) var/key = L[i] var/val @@ -527,16 +526,16 @@ if(T) callproc_datum(T) - else if(href_list["delete"]) - if(!check_rights(R_DEBUG, 0)) - return - - var/datum/D = locate(href_list["delete"]) - if(!D) - to_chat(usr, "Unable to locate item!") - admin_delete(D) - href_list["datumrefresh"] = href_list["delete"] - + else if(href_list["delete"]) + if(!check_rights(R_DEBUG, 0)) + return + + var/datum/D = locate(href_list["delete"]) + if(!D) + to_chat(usr, "Unable to locate item!") + admin_delete(D) + href_list["datumrefresh"] = href_list["delete"] + else if(href_list["regenerateicons"]) if(!check_rights(0)) return @@ -1166,8 +1165,6 @@ L.adjustCloneLoss(amount) if("stamina") L.adjustStaminaLoss(amount) - if("arousal") - L.adjustArousalLoss(amount) else to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]") return @@ -1178,3 +1175,4 @@ message_admins(msg) admin_ticket_log(L, msg) href_list["datumrefresh"] = href_list["mobToDamage"] + diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 8d21a8c531..1ae2095323 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -108,8 +108,8 @@ for(var/mob/M in view(range,A)) to_chat(M, msg) - log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]") - message_admins(" LocalNarrate: [key_name_admin(usr)] at ([get_area(A)]): [msg]
") + log_admin("LocalNarrate: [key_name(usr)] at [get_area(A)][COORD(A)]: [msg]") + message_admins(" LocalNarrate: [key_name_admin(usr)] at [get_area(A)][ADMIN_JMP(A)]: [msg]
") SSblackbox.add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list) @@ -513,16 +513,21 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(src, "Only administrators may use this command.") return - if (alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No") == "Yes") - log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])") - message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])") + admin_delete(A) + +/client/proc/admin_delete(datum/D) + var/atom/A = D + var/coords = istype(A) ? " at ([A.x], [A.y], [A.z])" : "" + if (alert(src, "Are you sure you want to delete:\n[D]\nat[coords]?", "Confirmation", "Yes", "No") == "Yes") + log_admin("[key_name(usr)] deleted [D][coords]") + message_admins("[key_name_admin(usr)] deleted [D][coords]") SSblackbox.add_details("admin_verb","Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - if(isturf(O)) - var/turf/T = O + if(isturf(D)) + var/turf/T = D T.ChangeTurf(T.baseturf) else - qdel(O) - + qdel(D) + /client/proc/cmd_admin_list_open_jobs() set category = "Admin" set name = "Manage Job Slots" From f7fe20887acdf1335dcfd816d7dd2a256d7d9c0c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 08:40:10 -0500 Subject: [PATCH 100/131] manual merge --- code/controllers/subsystem/ticker.dm | 6 ++++++ code/modules/power/singularity/emitter.dm | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 305dbc0678..5a180527bb 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -672,6 +672,12 @@ SUBSYSTEM_DEF(ticker) return INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) +/datum/controller/subsystem/ticker/proc/HasRoundStarted() + return current_state >= GAME_STATE_PLAYING + +/datum/controller/subsystem/ticker/proc/IsRoundInProgress() + return current_state == GAME_STATE_PLAYING + /proc/send_gamemode_vote() SSticker.modevoted = TRUE SSvote.initiate_vote("roundtype","server") diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 39085ab8e3..4316d852d8 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -7,7 +7,7 @@ anchored = 0 density = 1 req_access = list(GLOB.access_engine_equip) - + // The following 3 vars are mostly for the prototype var/manual = FALSE var/charge = 0 @@ -88,7 +88,7 @@ rotate() /obj/machinery/power/emitter/Initialize() - . = ..() + . = ..() if(state == 2 && anchored) connect_to_network() @@ -96,7 +96,7 @@ sparks.set_up(5, TRUE, src) /obj/machinery/power/emitter/Destroy() - if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) + if(SSticker && SSticker.IsRoundInProgress()) message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) log_game("Emitter deleted at ([x],[y],[z])") investigate_log("deleted at ([x],[y],[z]) at [get_area(src)]","singulo") @@ -199,8 +199,8 @@ /obj/machinery/power/emitter/proc/fire_beam(atom/targeted_atom, mob/user) var/turf/targets_from = get_turf(src) - if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src)) - return + if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src)) + return var/obj/item/projectile/P = new projectile_type(targets_from) playsound(src.loc, projectile_sound, 50, 1) if(prob(35)) From fd251eb56ac9227394389f1e1f6724105898225f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 08:43:10 -0500 Subject: [PATCH 101/131] oops --- code/controllers/subsystem/ticker.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 5a180527bb..f3ac66e001 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -682,11 +682,6 @@ SUBSYSTEM_DEF(ticker) SSticker.modevoted = TRUE SSvote.initiate_vote("roundtype","server") -/world/proc/has_round_started() - if (SSticker && SSticker.current_state >= GAME_STATE_PLAYING) - return TRUE - return FALSE - /datum/controller/subsystem/ticker/Recover() current_state = SSticker.current_state force_ending = SSticker.force_ending From c6e0c95f4205054b446d2016c3d2e78fb5b095fd Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 09:17:52 -0500 Subject: [PATCH 102/131] heh. --- code/controllers/subsystem/server_maint.dm | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index 3ef088b328..08f60d23e6 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -1,17 +1,28 @@ +#define PING_BUFFER_TIME 25 + SUBSYSTEM_DEF(server_maint) name = "Server Tasks" - wait = 6000 - flags = SS_NO_TICK_CHECK + wait = 6 + flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY + priority = 10 + var/list/currentrun /datum/controller/subsystem/server_maint/Initialize(timeofday) if (config.hub) world.visibility = 1 ..() -/datum/controller/subsystem/server_maint/fire() - //handle kicking inactive players - if(config.kick_inactive) - for(var/client/C in GLOB.clients) +/datum/controller/subsystem/server_maint/fire(resumed = FALSE) + if(!resumed) + src.currentrun = GLOB.clients.Copy() + + var/list/currentrun = src.currentrun + var/round_started = SSticker.HasRoundStarted() + + for(var/I in currentrun) + var/client/C = I + //handle kicking inactive players + if(round_started && config.kick_inactive) if(C.is_afk(config.afk_period)) var/cmob = C.mob if(!(istype(cmob, /mob/dead/observer) || (istype(cmob, /mob/dead) && C.holder))) @@ -19,5 +30,10 @@ SUBSYSTEM_DEF(server_maint) to_chat(C, "You have been inactive for more than [config.afk_period / 600] minutes and have been disconnected.") qdel(C) - if(config.sql_enabled) - sql_poll_population() + if (!(!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1))) + winset(C, null, "command=.update_ping+[world.time+world.tick_lag*world.tick_usage/100]") + + if (MC_TICK_CHECK) //one day, when ss13 has 1000 people per server, you guys are gonna be glad I added this tick check + return + +#undef PING_BUFFER_TIME From 587043f1e8232f363bb33fe9a34d0651ea09fcb8 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 09:44:19 -0500 Subject: [PATCH 103/131] pls --- code/modules/clothing/clothing.dm | 92 +++++++++++++++++-------------- 1 file changed, 51 insertions(+), 41 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index de76034e48..20f59d0435 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -83,7 +83,7 @@ C.use(1) update_clothes_damaged_state(FALSE) obj_integrity = max_integrity - to_chat(user, "You fix the damage on [src] with [C].") + to_chat(user, "You fix the damage on [src] with [C].") return 1 if(pockets) var/i = pockets.attackby(W, user, params) @@ -161,7 +161,7 @@ /obj/item/clothing/obj_break(damage_flag) if(!damaged_clothes) update_clothes_damaged_state(TRUE) - to_chat(usr, "Your [src] starts to fall apart!") + to_chat(usr, "Your [src] starts to fall apart!") /obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE) var/index = "\ref[initial(icon)]-[initial(icon_state)]" @@ -201,7 +201,7 @@ /obj/item/clothing/ears/earmuffs/Initialize(mapload) ..() SET_SECONDARY_FLAG(src, BANG_PROTECT) - SET_SECONDARY_FLAG(src, HEALS_EARS) + SET_SECONDARY_FLAG(src, HEALS_EARS) //Glasses /obj/item/clothing/glasses @@ -251,9 +251,9 @@ BLIND // can't see anything . = list() if(!isinhands) if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves") + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves") if(blood_DNA) - . += mutable_appearance('icons/effects/blood.dmi', "bloodyhands") + . += mutable_appearance('icons/effects/blood.dmi', "bloodyhands") /obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE) ..() @@ -279,9 +279,9 @@ BLIND // can't see anything . = list() if(!isinhands) if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet") + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet") if(blood_DNA) - . += mutable_appearance('icons/effects/blood.dmi', "helmetblood") + . += mutable_appearance('icons/effects/blood.dmi', "helmetblood") /obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE) ..() @@ -304,9 +304,9 @@ BLIND // can't see anything if(!isinhands) if(body_parts_covered & HEAD) if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") if(blood_DNA) - . += mutable_appearance('icons/effects/blood.dmi', "maskblood") + . += mutable_appearance('icons/effects/blood.dmi', "maskblood") //Mask @@ -326,9 +326,9 @@ BLIND // can't see anything if(!isinhands) if(body_parts_covered & HEAD) if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") if(blood_DNA) - . += mutable_appearance('icons/effects/blood.dmi', "maskblood") + . += mutable_appearance('icons/effects/blood.dmi', "maskblood") /obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE) ..() @@ -400,9 +400,9 @@ BLIND // can't see anything bloody = bloody_shoes[BLOOD_STATE_HUMAN] if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe") + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe") if(bloody) - . += mutable_appearance('icons/effects/blood.dmi', "shoeblood") + . += mutable_appearance('icons/effects/blood.dmi', "shoeblood") /obj/item/clothing/shoes/equipped(mob/user, slot) . = ..() @@ -455,9 +455,9 @@ BLIND // can't see anything . = list() if(!isinhands) if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") + . += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") if(blood_DNA) - . += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood") + . += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood") /obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE) ..() @@ -519,9 +519,9 @@ BLIND // can't see anything slot_flags = SLOT_ICLOTHING armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women - var/has_sensor = HAS_SENSORS // For the crew computer + var/has_sensor = HAS_SENSORS // For the crew computer var/random_sensor = 1 - var/sensor_mode = NO_SENSORS + var/sensor_mode = NO_SENSORS var/can_adjust = 1 var/adjusted = NORMAL_STYLE var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only @@ -534,28 +534,38 @@ BLIND // can't see anything if(!isinhands) if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") + . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") if(blood_DNA) - . += mutable_appearance('icons/effects/blood.dmi', "uniformblood") + . += mutable_appearance('icons/effects/blood.dmi', "uniformblood") if(hastie) var/tie_color = hastie.item_color if(!tie_color) tie_color = hastie.icon_state - var/mutable_appearance/tie = mutable_appearance('icons/mob/ties.dmi', "[tie_color]") - tie.alpha = hastie.alpha - tie.color = hastie.color - . += tie + var/mutable_appearance/tie = mutable_appearance('icons/mob/ties.dmi', "[tie_color]") + tie.alpha = hastie.alpha + tie.color = hastie.color + . += tie + +/obj/item/clothing/under/attackby(obj/item/W, mob/user, params) + if((has_sensor == BROKEN_SENSORS) && istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = W + C.use(1) + has_sensor = HAS_SENSORS + to_chat(user,"You repair the suit sensors on [src] with [C].") + return 1 /obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE) ..() if(ismob(loc)) var/mob/M = loc M.update_inv_w_uniform() + if(has_sensor > NO_SENSORS) + has_sensor = BROKEN_SENSORS /obj/item/clothing/under/New() if(random_sensor) //make the sensor mode favor higher levels, except coords. - sensor_mode = pick(0, 1, 1, 2, 2, 2, 3, 3) + sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS) adjusted = NORMAL_STYLE ..() @@ -633,18 +643,18 @@ BLIND // can't see anything to_chat(user, "Alt-click on [src] to wear it normally.") else to_chat(user, "Alt-click on [src] to wear it casually.") - if (has_sensor == BROKEN_SENSORS) - to_chat(user, "Its sensors appear to be shorted out.") - else if(has_sensor > NO_SENSORS) - switch(sensor_mode) - if(SENSOR_OFF) - to_chat(user, "Its sensors appear to be disabled.") - if(SENSOR_LIVING) - to_chat(user, "Its binary life sensors appear to be enabled.") - if(SENSOR_VITALS) - to_chat(user, "Its vital tracker appears to be enabled.") - if(SENSOR_COORDS) - to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.") + if (has_sensor == BROKEN_SENSORS) + to_chat(user, "Its sensors appear to be shorted out.") + else if(has_sensor > NO_SENSORS) + switch(sensor_mode) + if(SENSOR_OFF) + to_chat(user, "Its sensors appear to be disabled.") + if(SENSOR_LIVING) + to_chat(user, "Its binary life sensors appear to be enabled.") + if(SENSOR_VITALS) + to_chat(user, "Its vital tracker appears to be enabled.") + if(SENSOR_COORDS) + to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.") if(hastie) to_chat(user, "\A [hastie] is attached to it.") @@ -664,13 +674,13 @@ BLIND // can't see anything return if (!can_use(M)) return - if(src.has_sensor == LOCKED_SENSORS) + if(src.has_sensor == LOCKED_SENSORS) to_chat(usr, "The controls are locked.") return 0 - if(src.has_sensor == BROKEN_SENSORS) - to_chat(usr, "The sensors have shorted out!") - return 0 - if(src.has_sensor <= NO_SENSORS) + if(src.has_sensor == BROKEN_SENSORS) + to_chat(usr, "The sensors have shorted out!") + return 0 + if(src.has_sensor <= NO_SENSORS) to_chat(usr, "This suit does not have any sensors.") return 0 From 913a0c7c7f91a694d2f94ab85aef5f7a5179c53a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 09:55:15 -0500 Subject: [PATCH 104/131] Fixes proximity sensors not tracking correctly --- code/game/objects/effects/proximity.dm | 50 +++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm index 8a6893c887..bfa6cd8fa9 100644 --- a/code/game/objects/effects/proximity.dm +++ b/code/game/objects/effects/proximity.dm @@ -9,10 +9,12 @@ host = _host last_host_loc = _host.loc ignore_if_not_on_turf = _ignore_if_not_on_turf + checkers = list() SetRange(range) /datum/proximity_monitor/Destroy() host = null + last_host_loc = null QDEL_LIST(checkers) return ..() @@ -34,46 +36,47 @@ current_range = range - var/list/old_checkers = checkers - var/old_checkers_len = LAZYLEN(old_checkers) + var/list/checkers_local = checkers + var/old_checkers_len = checkers_local.len - var/atom/host_loc = host.loc + var/atom/_host = host - var/atom/loc_to_use = ignore_if_not_on_turf ? host_loc : get_turf(host) + var/atom/loc_to_use = ignore_if_not_on_turf ? _host.loc : get_turf(_host) if(!isturf(loc_to_use)) //only check the host's loc if(range) var/obj/effect/abstract/proximity_checker/pc if(old_checkers_len) - pc = old_checkers[old_checkers_len] - --old_checkers.len + pc = checkers_local[old_checkers_len] + --checkers_local.len + QDEL_LIST(checkers_local) else - pc = new(host_loc, src) + pc = new(loc_to_use, src) - checkers = list(pc) //only check the host's loc + checkers_local += pc //only check the host's loc return var/list/turfs = RANGE_TURFS(range, loc_to_use) - var/old_checkers_used = min(turfs.len, old_checkers_len) + var/turfs_len = turfs.len + var/old_checkers_used = min(turfs_len, old_checkers_len) //reuse what we can for(var/I in 1 to old_checkers_len) if(I <= old_checkers_used) - var/obj/effect/abstract/proximity_checker/pc = old_checkers[I] + var/obj/effect/abstract/proximity_checker/pc = checkers_local[I] pc.loc = turfs[I] else - qdel(old_checkers[I]) //delete the leftovers + qdel(checkers_local[I]) //delete the leftovers - LAZYCLEARLIST(old_checkers) - - //create what we lack - var/list/checkers_local = list() - for(var/I in (old_checkers_used + 1) to turfs.len) - checkers_local += new /obj/effect/abstract/proximity_checker(turfs[I], src) - - checkers = checkers_local + if(old_checkers_len < turfs_len) + //create what we lack + for(var/I in (old_checkers_used + 1) to turfs_len) + checkers_local += new /obj/effect/abstract/proximity_checker(turfs[I], src) + else + checkers_local.Cut(old_checkers_used + 1, old_checkers_len) /obj/effect/abstract/proximity_checker invisibility = INVISIBILITY_ABSTRACT + anchored = TRUE var/datum/proximity_monitor/monitor /obj/effect/abstract/proximity_checker/Initialize(mapload, datum/proximity_monitor/_monitor) @@ -81,8 +84,8 @@ if(_monitor) monitor = _monitor else - stack_trace("proximity_checker created without proximity_monitor") - qdel(src) + stack_trace("proximity_checker created without host") + return INITIALIZE_HINT_QDEL /obj/effect/abstract/proximity_checker/Destroy() monitor = null @@ -90,9 +93,6 @@ /obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM) set waitfor = FALSE - var/datum/proximity_monitor/M = monitor - if(!M.current_range) - return - var/atom/H = M.host + var/atom/H = monitor.host testing("HasProx: [H] -> [AM]") H.HasProximity(AM) From d422b9bb39b441b5a8d6bbcdd78d19bff417f299 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 09:57:25 -0500 Subject: [PATCH 105/131] The alien hivemind uses a mob's real_name --- code/modules/mob/living/carbon/alien/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index 72162387ee..12c131b3cc 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -1,4 +1,4 @@ -/mob/living/proc/alien_talk(message, shown_name = name) +/mob/living/proc/alien_talk(message, shown_name = real_name) log_say("[key_name(src)] : [message]") message = trim(message) if(!message) return From 25f1b24f62d41c9be47e5568cf7ecb2693088dfe Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 10:00:33 -0500 Subject: [PATCH 106/131] Makes golems able to transfer into empty shells --- .../objects/structures/ghost_role_spawners.dm | 22 +++++++++++++++++-- code/modules/awaymissions/corpse.dm | 7 +++--- .../carbon/human/species_types/golems.dm | 13 +++++++---- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index f1a808938e..d087b14390 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -101,6 +101,7 @@ death = FALSE anchored = 0 density = 0 + var/can_transfer = TRUE //if golems can switch bodies to this new shell var/mob/living/owner = null //golem's owner if it has one flavour_text = "You are a Free Golem. Your family worships The Liberator. In his infinite and divine wisdom, he set your clan free to \ travel the stars with a single declaration: \"Yeah go do whatever.\" Though you are bound to the one who created you, it is customary in your society to repeat those same words to newborn \ @@ -119,7 +120,7 @@ Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost." owner = creator -/obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn) +/obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn, name) var/datum/species/golem/X = mob_species to_chat(new_spawn, "[initial(X.info_text)]") if(!owner) @@ -132,7 +133,23 @@ if(ishuman(new_spawn)) var/mob/living/carbon/human/H = new_spawn H.set_cloned_appearance() - H.real_name = H.dna.species.random_name() + if(!name) + H.real_name = H.dna.species.random_name() + else + H.real_name = name + +/obj/effect/mob_spawn/human/golem/attack_hand(mob/user) + if(isgolem(user) && can_transfer) + var/transfer = alert("Transfer your soul to [src]? (Warning, your old body will die!)",,"Yes","No") + if(!transfer) + return + log_game("[user.ckey] golem-swapped into [src]") + user.visible_message("A faint light leaves [user], moving to [src] and animating it!","You leave your old body behind, and transfer into [src]!") + create(ckey = user.ckey, flavour = FALSE, name = user.real_name) + user.death() + return + ..() + /obj/effect/mob_spawn/human/golem/adamantine name = "dust-caked golem shell" @@ -140,6 +157,7 @@ mob_name = "a free golem" anchored = 1 density = 1 + can_transfer = FALSE mob_species = /datum/species/golem/adamantine //Malfunctioning cryostasis sleepers: Spawns in makeshift shelters in lavaland. Ghosts become hermits with knowledge of how they got to where they are now. diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 96c0bc35de..9fa0fbf5a5 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -53,7 +53,7 @@ /obj/effect/mob_spawn/proc/equip(mob/M) return -/obj/effect/mob_spawn/proc/create(ckey) +/obj/effect/mob_spawn/proc/create(ckey, flavour = TRUE, name) var/mob/living/M = new mob_type(get_turf(src)) //living mobs only if(!random) M.real_name = mob_name ? mob_name : M.name @@ -71,12 +71,13 @@ if(ckey) M.ckey = ckey - to_chat(M, "[flavour_text]") + if(flavour) + to_chat(M, "[flavour_text]") var/datum/mind/MM = M.mind if(objectives) for(var/objective in objectives) MM.objectives += new/datum/objective(objective) - special(M) + special(M, name) MM.name = M.real_name if(uses > 0) uses-- diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 8eb5343a30..0390661c78 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -71,10 +71,14 @@ prefix = "Plasma" special_names = list("Flood","Fire","Bar","Man") -/datum/species/golem/plasma/spec_death(gibbed, mob/living/carbon/human/H) - explosion(get_turf(H),0,1,2,flame_range = 5) - if(H) - H.gib() +/datum/species/golem/plasma/spec_life(mob/living/carbon/human/H) + if(H.bodytemperature > 900 && H.on_fire) + explosion(get_turf(H),1,2,4,flame_range = 5) + if(H) + H.gib() + if(H.fire_stacks < 2) //flammable + H.adjust_fire_stacks(1) + ..() //Harder to hurt /datum/species/golem/diamond @@ -501,6 +505,7 @@ sexes = FALSE info_text = "As a Runic Golem, you possess eldritch powers granted by the Elder God Nar'Sie." species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOFIRE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER) //no mutcolors + prefix = "Runic" var/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem/phase_shift var/obj/effect/proc_holder/spell/targeted/abyssal_gaze/abyssal_gaze From e4c417687462f1c733aa2f0b06864e4f1e469b76 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 11:10:15 -0500 Subject: [PATCH 107/131] Automatic changelog generation for PR #591 [ci skip] --- html/changelogs/AutoChangeLog-pr-591.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-591.yml diff --git a/html/changelogs/AutoChangeLog-pr-591.yml b/html/changelogs/AutoChangeLog-pr-591.yml new file mode 100644 index 0000000000..a41e268954 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-591.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - tweak: "When jumpsuits take severe damage, their suit sensors break. They can be fixed by applying a cable coil." From 284fc2f43aac601a3f929b1b93e9e0bf8510ca85 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 11:14:15 -0500 Subject: [PATCH 108/131] Automatic changelog generation for PR #602 [ci skip] --- html/changelogs/AutoChangeLog-pr-602.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-602.yml diff --git a/html/changelogs/AutoChangeLog-pr-602.yml b/html/changelogs/AutoChangeLog-pr-602.yml new file mode 100644 index 0000000000..77630400ef --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-602.yml @@ -0,0 +1,4 @@ +author: "QualityVan" +delete-after: True +changes: + - bugfix: "You can hit emagged cloning pods with a medical ID to empty them" From 85c9b40ede159554379316b8f0aa963073777de1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 11:15:55 -0500 Subject: [PATCH 109/131] Automatic changelog generation for PR #641 [ci skip] --- html/changelogs/AutoChangeLog-pr-641.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-641.yml diff --git a/html/changelogs/AutoChangeLog-pr-641.yml b/html/changelogs/AutoChangeLog-pr-641.yml new file mode 100644 index 0000000000..d2781f8377 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-641.yml @@ -0,0 +1,5 @@ +author: "BeeSting12" +delete-after: True +changes: + - bugfix: "The emergency backup shuttle has lighting now." + - bugfix: "Plating in deltastation's aux tool storage is no longer checkered." From 63102925318e2184c210b0077ebba99024901c53 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 11:19:14 -0500 Subject: [PATCH 110/131] woo --- .../OmegaStation/OmegaStation.dmm.rej | 60 -- code/_onclick/hud/constructs.dm.rej | 25 - code/controllers/subsystem/blackbox.dm.rej | 512 ------------------ .../controllers/subsystem/server_maint.dm.rej | 7 - code/controllers/subsystem/ticker.dm.rej | 17 - code/game/gamemodes/cult/runes.dm.rej | 10 - code/game/gamemodes/game_mode.dm.rej | 18 - code/game/machinery/cloning.dm.rej | 28 - .../machinery/telecomms/broadcasting.dm.rej | 33 -- code/game/machinery/vending.dm.rej | 10 - .../objects/items/weapons/handcuffs.dm.rej | 31 -- code/game/turfs/simulated/minerals.dm.rej | 19 - code/modules/admin/admin.dm.rej | 10 - code/modules/admin/secrets.dm.rej | 291 ---------- code/modules/admin/topic.dm.rej | 10 - code/modules/admin/verbs/adminhelp.dm.rej | 10 - code/modules/admin/verbs/adminjump.dm.rej | 16 - code/modules/admin/verbs/debug.dm.rej | 28 - code/modules/admin/verbs/panicbunker.dm.rej | 8 - code/modules/admin/verbs/randomverbs.dm.rej | 46 -- .../verbs/reestablish_db_connection.dm.rej | 15 - code/modules/clothing/clothing.dm.rej | 29 - code/modules/clothing/suits/armor.dm.rej | 10 - code/modules/events/_event.dm.rej | 17 - code/modules/mining/equipment.dm.rej | 26 - .../mining/lavaland/necropolis_chests.dm.rej | 28 - .../living/simple_animal/constructs.dm.rej | 9 - code/modules/mob/logout.dm.rej | 10 - code/modules/power/singularity/emitter.dm.rej | 10 - .../chemistry/recipes/slime_extracts.dm.rej | 442 --------------- code/modules/uplink/uplink_item.dm.rej | 17 - code/world.dm.rej | 19 - tgstation.dme.rej | 17 - 33 files changed, 1838 deletions(-) delete mode 100644 _maps/map_files/OmegaStation/OmegaStation.dmm.rej delete mode 100644 code/_onclick/hud/constructs.dm.rej delete mode 100644 code/controllers/subsystem/blackbox.dm.rej delete mode 100644 code/controllers/subsystem/server_maint.dm.rej delete mode 100644 code/controllers/subsystem/ticker.dm.rej delete mode 100644 code/game/gamemodes/cult/runes.dm.rej delete mode 100644 code/game/gamemodes/game_mode.dm.rej delete mode 100644 code/game/machinery/cloning.dm.rej delete mode 100644 code/game/machinery/telecomms/broadcasting.dm.rej delete mode 100644 code/game/machinery/vending.dm.rej delete mode 100644 code/game/objects/items/weapons/handcuffs.dm.rej delete mode 100644 code/game/turfs/simulated/minerals.dm.rej delete mode 100644 code/modules/admin/admin.dm.rej delete mode 100644 code/modules/admin/secrets.dm.rej delete mode 100644 code/modules/admin/topic.dm.rej delete mode 100644 code/modules/admin/verbs/adminhelp.dm.rej delete mode 100644 code/modules/admin/verbs/adminjump.dm.rej delete mode 100644 code/modules/admin/verbs/debug.dm.rej delete mode 100644 code/modules/admin/verbs/panicbunker.dm.rej delete mode 100644 code/modules/admin/verbs/randomverbs.dm.rej delete mode 100644 code/modules/admin/verbs/reestablish_db_connection.dm.rej delete mode 100644 code/modules/clothing/clothing.dm.rej delete mode 100644 code/modules/clothing/suits/armor.dm.rej delete mode 100644 code/modules/events/_event.dm.rej delete mode 100644 code/modules/mining/equipment.dm.rej delete mode 100644 code/modules/mining/lavaland/necropolis_chests.dm.rej delete mode 100644 code/modules/mob/living/simple_animal/constructs.dm.rej delete mode 100644 code/modules/mob/logout.dm.rej delete mode 100644 code/modules/power/singularity/emitter.dm.rej delete mode 100644 code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej delete mode 100644 code/modules/uplink/uplink_item.dm.rej delete mode 100644 code/world.dm.rej delete mode 100644 tgstation.dme.rej diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm.rej b/_maps/map_files/OmegaStation/OmegaStation.dmm.rej deleted file mode 100644 index c23bd7e4c5..0000000000 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm.rej +++ /dev/null @@ -1,60 +0,0 @@ -diff a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm (rejected hunks) -@@ -41755,58 +41743,6 @@ - "bvf" = ( - /turf/closed/wall/r_wall, - /area/engine/supermatter) --"bvg" = ( --/obj/machinery/light{ -- dir = 1 -- }, --/turf/open/floor/plasteel/neutral/side{ -- dir = 1 -- }, --/area/shuttle/escape) --"bvh" = ( --/obj/structure/chair{ -- dir = 8 -- }, --/obj/effect/turf_decal/bot, --/obj/machinery/light/small{ -- dir = 4 -- }, --/turf/open/floor/plasteel, --/area/shuttle/escape) --"bvi" = ( --/obj/structure/chair{ -- dir = 4 -- }, --/obj/effect/turf_decal/bot, --/obj/machinery/light/small{ -- dir = 8 -- }, --/turf/open/floor/plasteel, --/area/shuttle/escape) --"bvj" = ( --/obj/structure/chair{ -- dir = 8 -- }, --/obj/effect/turf_decal/bot, --/obj/machinery/light/small{ -- dir = 4 -- }, --/turf/open/floor/plasteel, --/area/shuttle/escape) --"bvk" = ( --/obj/structure/chair{ -- dir = 4 -- }, --/obj/effect/turf_decal/bot, --/obj/machinery/light/small{ -- dir = 8 -- }, --/turf/open/floor/plasteel, --/area/shuttle/escape) --"bvl" = ( --/obj/machinery/light, --/turf/open/floor/plasteel/neutral/side, --/area/shuttle/escape) - - (1,1,1) = {" - aaa diff --git a/code/_onclick/hud/constructs.dm.rej b/code/_onclick/hud/constructs.dm.rej deleted file mode 100644 index 1ea29cde32..0000000000 --- a/code/_onclick/hud/constructs.dm.rej +++ /dev/null @@ -1,25 +0,0 @@ -diff a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm (rejected hunks) -@@ -1,18 +1,18 @@ - - /datum/hud/constructs - ui_style_icon = 'icons/mob/screen_construct.dmi' -- -+ - /datum/hud/constructs/New(mob/owner) - ..() - pull_icon = new /obj/screen/pull() -- pull_icon.icon = ui_style_icon -+ pull_icon.icon = 'icons/mob/screen_construct.dmi' - pull_icon.update_icon(mymob) -- pull_icon.screen_loc = ui_pull_resist -+ pull_icon.screen_loc = ui_construct_pull - static_inventory += pull_icon -- -+ - healths = new /obj/screen/healths/construct() - infodisplay += healths -- -+ - /mob/living/simple_animal/hostile/construct/create_mob_hud() - if(client && !hud_used) - hud_used = new /datum/hud/constructs(src) diff --git a/code/controllers/subsystem/blackbox.dm.rej b/code/controllers/subsystem/blackbox.dm.rej deleted file mode 100644 index 79c407851f..0000000000 --- a/code/controllers/subsystem/blackbox.dm.rej +++ /dev/null @@ -1,512 +0,0 @@ -diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm (rejected hunks) -@@ -1,253 +1,257 @@ --GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new) -- --//the feedback datum; stores all feedback --/datum/feedback -- var/list/messages = list() -- var/list/messages_admin = list() -- -- var/list/msg_common = list() -- var/list/msg_science = list() -- var/list/msg_command = list() -- var/list/msg_medical = list() -- var/list/msg_engineering = list() -- var/list/msg_security = list() -- var/list/msg_deathsquad = list() -- var/list/msg_syndicate = list() -- var/list/msg_service = list() -- var/list/msg_cargo = list() -- -- var/list/datum/feedback_variable/feedback = new() -- --/datum/feedback/proc/find_feedback_datum(variable) -- for (var/datum/feedback_variable/FV in feedback) -- if (FV.get_variable() == variable) -- return FV -- var/datum/feedback_variable/FV = new(variable) -- feedback += FV -- return FV -- --/datum/feedback/proc/get_round_feedback() -- return feedback -- --/datum/feedback/proc/round_end_data_gathering() -- var/pda_msg_amt = 0 -- var/rc_msg_amt = 0 -- -- for (var/obj/machinery/message_server/MS in GLOB.message_servers) -- if (MS.pda_msgs.len > pda_msg_amt) -- pda_msg_amt = MS.pda_msgs.len -- if (MS.rc_msgs.len > rc_msg_amt) -- rc_msg_amt = MS.rc_msgs.len -- -- feedback_set_details("radio_usage","") -- -- feedback_add_details("radio_usage","COM-[msg_common.len]") -- feedback_add_details("radio_usage","SCI-[msg_science.len]") -- feedback_add_details("radio_usage","HEA-[msg_command.len]") -- feedback_add_details("radio_usage","MED-[msg_medical.len]") -- feedback_add_details("radio_usage","ENG-[msg_engineering.len]") -- feedback_add_details("radio_usage","SEC-[msg_security.len]") -- feedback_add_details("radio_usage","DTH-[msg_deathsquad.len]") -- feedback_add_details("radio_usage","SYN-[msg_syndicate.len]") -- feedback_add_details("radio_usage","SRV-[msg_service.len]") -- feedback_add_details("radio_usage","CAR-[msg_cargo.len]") -- feedback_add_details("radio_usage","OTH-[messages.len]") -- feedback_add_details("radio_usage","PDA-[pda_msg_amt]") -- feedback_add_details("radio_usage","RC-[rc_msg_amt]") -- -- feedback_set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set. -- --//This proc is only to be called at round end. --/datum/feedback/proc/save_all_data_to_sql() -- if (!feedback) return -- -- round_end_data_gathering() //round_end time logging and some other data processing -- if (!GLOB.dbcon.Connect()) return -- var/round_id -- -- var/DBQuery/query_feedback_max_id = GLOB.dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]") -- if(!query_feedback_max_id.Execute()) -- return -- while (query_feedback_max_id.NextRow()) -- round_id = query_feedback_max_id.item[1] -- -- if (!isnum(round_id)) -- round_id = text2num(round_id) -- round_id++ -- -- var/sqlrowlist = "" -- -- for (var/datum/feedback_variable/FV in feedback) -- if (sqlrowlist != "") -- sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error -- -- sqlrowlist += "(null, Now(), [round_id], \"[sanitizeSQL(FV.get_variable())]\", [FV.get_value()], \"[sanitizeSQL(FV.get_details())]\")" -- -- if (sqlrowlist == "") -- return -- -- var/DBQuery/query_feedback_save = GLOB.dbcon.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist) -- query_feedback_save.Execute() -- -- --/proc/feedback_set(variable,value) -- if(!GLOB.blackbox) -- return -- -- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) -- -- if(!FV) -- return -- -- FV.set_value(value) -- --/proc/feedback_inc(variable,value) -- if(!GLOB.blackbox) -- return -- -- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) -- -- if(!FV) -- return -- -- FV.inc(value) -- --/proc/feedback_dec(variable,value) -- if(!GLOB.blackbox) -- return -- -- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) -- -- if(!FV) -- return -- -- FV.dec(value) -- --/proc/feedback_set_details(variable,details) -- if(!GLOB.blackbox) -- return -- -- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) -- -- if(!FV) -- return -- -- FV.set_details(details) -- --/proc/feedback_add_details(variable,details) -- if(!GLOB.blackbox) -- return -- -- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable) -- -- if(!FV) -- return -- -- FV.add_details(details) -- --//feedback variable datum, for storing all kinds of data --/datum/feedback_variable -- var/variable -- var/value -- var/details -- --/datum/feedback_variable/New(var/param_variable,var/param_value = 0) -- variable = param_variable -- value = param_value -- --/datum/feedback_variable/proc/inc(num = 1) -- if (isnum(value)) -- value += num -- else -- value = text2num(value) -- if (isnum(value)) -- value += num -- else -- value = num -- --/datum/feedback_variable/proc/dec(num = 1) -- if (isnum(value)) -- value -= num -- else -- value = text2num(value) -- if (isnum(value)) -- value -= num -- else -- value = -num -- --/datum/feedback_variable/proc/set_value(num) -- if (isnum(num)) -- value = num -- --/datum/feedback_variable/proc/get_value() -- if (!isnum(value)) -- return 0 -- return value -- --/datum/feedback_variable/proc/get_variable() -- return variable -- --/datum/feedback_variable/proc/set_details(text) -- if (istext(text)) -- details = text -- --/datum/feedback_variable/proc/add_details(text) -- if (istext(text)) -- text = replacetext(text, " ", "_") -- if (!details) -- details = text -- else -- details += " [text]" -- --/datum/feedback_variable/proc/get_details() -- return details -- --/datum/feedback_variable/proc/get_parsed() -- return list(variable,value,details) -- --//sql reporting procs --/proc/sql_poll_population() -- if(!config.sql_enabled) -- return -- if(!GLOB.dbcon.Connect()) -- return -- var/playercount = 0 -- for(var/mob/M in GLOB.player_list) -- if(M.client) -- playercount += 1 -- var/admincount = GLOB.admins.len -- var/DBQuery/query_record_playercount = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')") -- query_record_playercount.Execute() -- --/proc/sql_report_death(mob/living/L) -- if(!config.sql_enabled) -- return -- if(!GLOB.dbcon.Connect()) -- return -- if(!L || !L.key || !L.mind) -- return -- var/turf/T = get_turf(L) -- var/area/placeofdeath = get_area(T.loc) -- var/sqlname = sanitizeSQL(L.real_name) -- var/sqlkey = sanitizeSQL(L.ckey) -- var/sqljob = sanitizeSQL(L.mind.assigned_role) -- var/sqlspecial = sanitizeSQL(L.mind.special_role) -- var/sqlpod = sanitizeSQL(placeofdeath.name) -- var/laname -- var/lakey -- if(L.lastattacker && ismob(L.lastattacker)) -- var/mob/LA = L.lastattacker -- laname = sanitizeSQL(LA.real_name) -- lakey = sanitizeSQL(LA.key) -- var/sqlgender = sanitizeSQL(L.gender) -- var/sqlbrute = sanitizeSQL(L.getBruteLoss()) -- var/sqlfire = sanitizeSQL(L.getFireLoss()) -- var/sqlbrain = sanitizeSQL(L.getBrainLoss()) -- var/sqloxy = sanitizeSQL(L.getOxyLoss()) -- var/sqltox = sanitizeSQL(L.getStaminaLoss()) -- var/sqlclone = sanitizeSQL(L.getStaminaLoss()) -- var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) -- var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") -- var/map = sanitizeSQL(SSmapping.config.map_name) -- var/DBQuery/query_report_death = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')") -- query_report_death.Execute() -+SUBSYSTEM_DEF(blackbox) -+ name = "Blackbox" -+ wait = 6000 -+ flags = SS_NO_TICK_CHECK -+ -+ var/list/msg_common = list() -+ var/list/msg_science = list() -+ var/list/msg_command = list() -+ var/list/msg_medical = list() -+ var/list/msg_engineering = list() -+ var/list/msg_security = list() -+ var/list/msg_deathsquad = list() -+ var/list/msg_syndicate = list() -+ var/list/msg_service = list() -+ var/list/msg_cargo = list() -+ var/list/msg_other = list() -+ -+ var/list/feedback = list() //list of datum/feedback_variable -+ -+//poll population -+/datum/controller/subsystem/blackbox/fire() -+ if(!GLOB.dbcon.Connect()) -+ return -+ var/playercount = 0 -+ for(var/mob/M in GLOB.player_list) -+ if(M.client) -+ playercount += 1 -+ var/admincount = GLOB.admins.len -+ var/DBQuery/query_record_playercount = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')") -+ query_record_playercount.Execute() -+ -+/datum/controller/subsystem/blackbox/Recover() -+ msg_common = SSblackbox.msg_common -+ msg_science = SSblackbox.msg_science -+ msg_command = SSblackbox.msg_command -+ msg_medical = SSblackbox.msg_medical -+ msg_engineering = SSblackbox.msg_engineering -+ msg_security = SSblackbox.msg_security -+ msg_deathsquad = SSblackbox.msg_deathsquad -+ msg_syndicate = SSblackbox.msg_syndicate -+ msg_service = SSblackbox.msg_service -+ msg_cargo = SSblackbox.msg_cargo -+ msg_other = SSblackbox.msg_other -+ -+ feedback = SSblackbox.feedback -+ -+//no touchie -+/datum/controller/subsystem/blackbox/can_vv_get(var_name) -+ if(var_name == "feedback") -+ return FALSE -+ return ..() -+ -+/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value) -+ return FALSE -+ -+/datum/controller/subsystem/blackbox/Shutdown() -+ var/pda_msg_amt = 0 -+ var/rc_msg_amt = 0 -+ -+ for (var/obj/machinery/message_server/MS in GLOB.message_servers) -+ if (MS.pda_msgs.len > pda_msg_amt) -+ pda_msg_amt = MS.pda_msgs.len -+ if (MS.rc_msgs.len > rc_msg_amt) -+ rc_msg_amt = MS.rc_msgs.len -+ -+ set_details("radio_usage","") -+ -+ add_details("radio_usage","COM-[msg_common.len]") -+ add_details("radio_usage","SCI-[msg_science.len]") -+ add_details("radio_usage","HEA-[msg_command.len]") -+ add_details("radio_usage","MED-[msg_medical.len]") -+ add_details("radio_usage","ENG-[msg_engineering.len]") -+ add_details("radio_usage","SEC-[msg_security.len]") -+ add_details("radio_usage","DTH-[msg_deathsquad.len]") -+ add_details("radio_usage","SYN-[msg_syndicate.len]") -+ add_details("radio_usage","SRV-[msg_service.len]") -+ add_details("radio_usage","CAR-[msg_cargo.len]") -+ add_details("radio_usage","OTH-[msg_other.len]") -+ add_details("radio_usage","PDA-[pda_msg_amt]") -+ add_details("radio_usage","RC-[rc_msg_amt]") -+ -+ set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set. -+ -+ if (!GLOB.dbcon.Connect()) -+ return -+ -+ var/round_id -+ -+ var/DBQuery/query_feedback_max_id = GLOB.dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]") -+ if(!query_feedback_max_id.Execute()) -+ return -+ while (query_feedback_max_id.NextRow()) -+ round_id = query_feedback_max_id.item[1] -+ -+ if (!isnum(round_id)) -+ round_id = text2num(round_id) -+ round_id++ -+ -+ var/sqlrowlist = "" -+ -+ for (var/datum/feedback_variable/FV in feedback) -+ if (sqlrowlist != "") -+ sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error -+ -+ sqlrowlist += "(null, Now(), [round_id], \"[sanitizeSQL(FV.get_variable())]\", [FV.get_value()], \"[sanitizeSQL(FV.get_details())]\")" -+ -+ if (sqlrowlist == "") -+ return -+ -+ var/DBQuery/query_feedback_save = GLOB.dbcon.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist) -+ query_feedback_save.Execute() -+ -+/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq) -+ switch(freq) -+ if(1459) -+ msg_common += blackbox_msg -+ if(1351) -+ msg_science += blackbox_msg -+ if(1353) -+ msg_command += blackbox_msg -+ if(1355) -+ msg_medical += blackbox_msg -+ if(1357) -+ msg_engineering += blackbox_msg -+ if(1359) -+ msg_security += blackbox_msg -+ if(1441) -+ msg_deathsquad += blackbox_msg -+ if(1213) -+ msg_syndicate += blackbox_msg -+ if(1349) -+ msg_service += blackbox_msg -+ if(1347) -+ msg_cargo += blackbox_msg -+ else -+ msg_other += blackbox_msg -+ -+/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable) -+ for(var/datum/feedback_variable/FV in feedback) -+ if(FV.get_variable() == variable) -+ return FV -+ -+ var/datum/feedback_variable/FV = new(variable) -+ feedback += FV -+ return FV -+ -+/datum/controller/subsystem/blackbox/proc/set_val(variable, value) -+ var/datum/feedback_variable/FV = find_feedback_datum(variable) -+ FV.set_value(value) -+ -+/datum/controller/subsystem/blackbox/proc/inc(variable, value) -+ var/datum/feedback_variable/FV = find_feedback_datum(variable) -+ FV.inc(value) -+ -+/datum/controller/subsystem/blackbox/proc/dec(variable,value) -+ var/datum/feedback_variable/FV = find_feedback_datum(variable) -+ FV.dec(value) -+ -+/datum/controller/subsystem/blackbox/proc/set_details(variable,details) -+ var/datum/feedback_variable/FV = find_feedback_datum(variable) -+ FV.set_details(details) -+ -+/datum/controller/subsystem/blackbox/proc/add_details(variable,details) -+ var/datum/feedback_variable/FV = find_feedback_datum(variable) -+ FV.add_details(details) -+ -+/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L) -+ if(!GLOB.dbcon.Connect()) -+ return -+ if(!L || !L.key || !L.mind) -+ return -+ var/turf/T = get_turf(L) -+ var/area/placeofdeath = get_area(T.loc) -+ var/sqlname = sanitizeSQL(L.real_name) -+ var/sqlkey = sanitizeSQL(L.ckey) -+ var/sqljob = sanitizeSQL(L.mind.assigned_role) -+ var/sqlspecial = sanitizeSQL(L.mind.special_role) -+ var/sqlpod = sanitizeSQL(placeofdeath.name) -+ var/laname -+ var/lakey -+ if(L.lastattacker && ismob(L.lastattacker)) -+ var/mob/LA = L.lastattacker -+ laname = sanitizeSQL(LA.real_name) -+ lakey = sanitizeSQL(LA.key) -+ var/sqlgender = sanitizeSQL(L.gender) -+ var/sqlbrute = sanitizeSQL(L.getBruteLoss()) -+ var/sqlfire = sanitizeSQL(L.getFireLoss()) -+ var/sqlbrain = sanitizeSQL(L.getBrainLoss()) -+ var/sqloxy = sanitizeSQL(L.getOxyLoss()) -+ var/sqltox = sanitizeSQL(L.getStaminaLoss()) -+ var/sqlclone = sanitizeSQL(L.getStaminaLoss()) -+ var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) -+ var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") -+ var/map = sanitizeSQL(SSmapping.config.map_name) -+ var/DBQuery/query_report_death = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')") -+ query_report_death.Execute() -+ -+ -+//feedback variable datum, for storing all kinds of data -+/datum/feedback_variable -+ var/variable -+ var/value -+ var/details -+ -+/datum/feedback_variable/New(param_variable, param_value = 0) -+ variable = param_variable -+ value = param_value -+ -+/datum/feedback_variable/proc/inc(num = 1) -+ if (isnum(value)) -+ value += num -+ else -+ value = text2num(value) -+ if (isnum(value)) -+ value += num -+ else -+ value = num -+ -+/datum/feedback_variable/proc/dec(num = 1) -+ if (isnum(value)) -+ value -= num -+ else -+ value = text2num(value) -+ if (isnum(value)) -+ value -= num -+ else -+ value = -num -+ -+/datum/feedback_variable/proc/set_value(num) -+ if (isnum(num)) -+ value = num -+ -+/datum/feedback_variable/proc/get_value() -+ if (!isnum(value)) -+ return 0 -+ return value -+ -+/datum/feedback_variable/proc/get_variable() -+ return variable -+ -+/datum/feedback_variable/proc/set_details(text) -+ if (istext(text)) -+ details = text -+ -+/datum/feedback_variable/proc/add_details(text) -+ if (istext(text)) -+ text = replacetext(text, " ", "_") -+ if (!details) -+ details = text -+ else -+ details += " [text]" -+ -+/datum/feedback_variable/proc/get_details() -+ return details -+ -+/datum/feedback_variable/proc/get_parsed() -+ return list(variable,value,details) diff --git a/code/controllers/subsystem/server_maint.dm.rej b/code/controllers/subsystem/server_maint.dm.rej deleted file mode 100644 index f759db5330..0000000000 --- a/code/controllers/subsystem/server_maint.dm.rej +++ /dev/null @@ -1,7 +0,0 @@ -diff a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm (rejected hunks) -@@ -18,5 +18,3 @@ SUBSYSTEM_DEF(server_maint) - to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.") - qdel(C) - -- if(config.sql_enabled) -- sql_poll_population() diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej deleted file mode 100644 index 1dbd2f038a..0000000000 --- a/code/controllers/subsystem/ticker.dm.rej +++ /dev/null @@ -1,17 +0,0 @@ -diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) -@@ -667,11 +667,11 @@ SUBSYSTEM_DEF(ticker) - return - INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) - -+/datum/controller/subsystem/ticker/proc/HasRoundStarted() -+ return current_state >= GAME_STATE_PLAYING - --/world/proc/has_round_started() -- if (SSticker && SSticker.current_state >= GAME_STATE_PLAYING) -- return TRUE -- return FALSE -+/datum/controller/subsystem/ticker/proc/IsRoundInProgress() -+ return current_state == GAME_STATE_PLAYING - - /datum/controller/subsystem/ticker/Recover() - current_state = SSticker.current_state diff --git a/code/game/gamemodes/cult/runes.dm.rej b/code/game/gamemodes/cult/runes.dm.rej deleted file mode 100644 index 696dbe5ddd..0000000000 --- a/code/game/gamemodes/cult/runes.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm (rejected hunks) -@@ -520,7 +520,7 @@ var/list/teleport_runes = list() - - //Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people sacrificed - /obj/effect/rune/raise_dead -- cultist_name = "Raise Dead" -+ cultist_name = "Resurrect Cultist" - cultist_desc = "requires the corpse of a cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be revived." - invocation = null //Depends on the name of the user - see below - icon_state = "1" diff --git a/code/game/gamemodes/game_mode.dm.rej b/code/game/gamemodes/game_mode.dm.rej deleted file mode 100644 index 2ee380eecf..0000000000 --- a/code/game/gamemodes/game_mode.dm.rej +++ /dev/null @@ -1,18 +0,0 @@ -diff a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm (rejected hunks) -@@ -81,12 +81,12 @@ - spawn (ROUNDSTART_LOGOUT_REPORT_TIME) - display_roundstart_logout_report() - -- feedback_set_details("round_start","[time2text(world.realtime)]") -+ SSblackbox.set_details("round_start","[time2text(world.realtime)]") - if(SSticker && SSticker.mode) -- feedback_set_details("game_mode","[SSticker.mode]") -+ SSblackbox.set_details("game_mode","[SSticker.mode]") - if(GLOB.revdata.commit) -- feedback_set_details("revision","[GLOB.revdata.commit]") -- feedback_set_details("server_ip","[world.internet_address]:[world.port]") -+ SSblackbox.set_details("revision","[GLOB.revdata.commit]") -+ SSblackbox.set_details("server_ip","[world.internet_address]:[world.port]") - if(report) - spawn (rand(waittime_l, waittime_h)) - send_intercept(0) diff --git a/code/game/machinery/cloning.dm.rej b/code/game/machinery/cloning.dm.rej deleted file mode 100644 index bd2462c1de..0000000000 --- a/code/game/machinery/cloning.dm.rej +++ /dev/null @@ -1,28 +0,0 @@ -diff a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm (rejected hunks) -@@ -343,7 +343,7 @@ - if(mess) //Clean that mess and dump those gibs! - mess = FALSE - for(var/obj/A in contents) -- if(istype(A, /obj/item/organ) || istype(A, /obj/effect/decal/cleanable/blood/gibs)) -+ if(istype(A, /obj/effect/decal/cleanable/blood/gibs)) - A.forceMove(T) - audible_message("You hear a splat.") - icon_state = "pod_0" -@@ -378,10 +378,13 @@ - to_chat(occupant, "Agony blazes across your consciousness as your body is torn apart.
Is this what dying is like? Yes it is.") - playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 50, 0) - occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50) -- var/obj/item/organ/brain/B = occupant.getorganslot("brain") -- B.Remove(occupant) -- B.forceMove(src) -- occupant.gib(TRUE, TRUE, TRUE) -+ addtimer(CALLBACK(src, .proc/end_malfunction, occupant), 40) -+ -+/obj/machinery/clonepod/proc/end_malfunction(mob/victim) -+ if(!istype(victim)) //Where the hell did they go? -+ return -+ victim.ghostize(FALSE) -+ victim.gib(TRUE, TRUE, TRUE) - - /obj/machinery/clonepod/relaymove(mob/user) - if(user.stat == CONSCIOUS) diff --git a/code/game/machinery/telecomms/broadcasting.dm.rej b/code/game/machinery/telecomms/broadcasting.dm.rej deleted file mode 100644 index 7033970bd3..0000000000 --- a/code/game/machinery/telecomms/broadcasting.dm.rej +++ /dev/null @@ -1,33 +0,0 @@ -diff a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm (rejected hunks) -@@ -142,30 +142,7 @@ - // --- This following recording is intended for research and feedback in the use of department radio channels --- - - var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]" -- if(istype(GLOB.blackbox)) -- switch(freq) -- if(1459) -- GLOB.blackbox.msg_common += blackbox_msg -- if(1351) -- GLOB.blackbox.msg_science += blackbox_msg -- if(1353) -- GLOB.blackbox.msg_command += blackbox_msg -- if(1355) -- GLOB.blackbox.msg_medical += blackbox_msg -- if(1357) -- GLOB.blackbox.msg_engineering += blackbox_msg -- if(1359) -- GLOB.blackbox.msg_security += blackbox_msg -- if(1441) -- GLOB.blackbox.msg_deathsquad += blackbox_msg -- if(1213) -- GLOB.blackbox.msg_syndicate += blackbox_msg -- if(1349) -- GLOB.blackbox.msg_service += blackbox_msg -- if(1347) -- GLOB.blackbox.msg_cargo += blackbox_msg -- else -- GLOB.blackbox.messages += blackbox_msg -+ SSblackbox.LogBroadcast(blackbox_msg, freq) - - spawn(50) - qdel(virt) diff --git a/code/game/machinery/vending.dm.rej b/code/game/machinery/vending.dm.rej deleted file mode 100644 index a487eb51a1..0000000000 --- a/code/game/machinery/vending.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm (rejected hunks) -@@ -528,7 +528,7 @@ - if(icon_vend) //Show the vending animation if needed - flick(icon_vend,src) - new R.product_path(get_turf(src)) -- feedback_add_details("vending_machine_usage","[R.product_path]|[src.type]") -+ SSblackbox.add_details("vending_machine_usage","[R.product_path]|[src.type]") - vend_ready = 1 - return - diff --git a/code/game/objects/items/weapons/handcuffs.dm.rej b/code/game/objects/items/weapons/handcuffs.dm.rej deleted file mode 100644 index cfc1658267..0000000000 --- a/code/game/objects/items/weapons/handcuffs.dm.rej +++ /dev/null @@ -1,31 +0,0 @@ -diff a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm (rejected hunks) -@@ -46,9 +46,9 @@ - apply_cuffs(C,user) - to_chat(user, "You handcuff [C].") - if(istype(src, /obj/item/weapon/restraints/handcuffs/cable)) -- feedback_add_details("handcuffs","C") -+ SSblackbox.add_details("handcuffs","C") - else -- feedback_add_details("handcuffs","H") -+ SSblackbox.add_details("handcuffs","H") - - add_logs(user, C, "handcuffed") - else -@@ -278,7 +278,7 @@ - C.legcuffed = src - src.loc = C - C.update_inv_legcuffed() -- feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart. -+ SSblackbox.add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart. - else if(isanimal(L)) - var/mob/living/simple_animal/SA = L - if(SA.mob_size > MOB_SIZE_TINY) -@@ -341,7 +341,7 @@ - C.legcuffed = src - src.loc = C - C.update_inv_legcuffed() -- feedback_add_details("handcuffs","B") -+ SSblackbox.add_details("handcuffs","B") - to_chat(C, "\The [src] ensnares you!") - C.Weaken(weaken) - diff --git a/code/game/turfs/simulated/minerals.dm.rej b/code/game/turfs/simulated/minerals.dm.rej deleted file mode 100644 index 2ac5181cc8..0000000000 --- a/code/game/turfs/simulated/minerals.dm.rej +++ /dev/null @@ -1,19 +0,0 @@ -diff a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm (rejected hunks) -@@ -64,7 +64,7 @@ - if(ismineralturf(src)) - to_chat(user, "You finish cutting into the rock.") - gets_drilled(user) -- feedback_add_details("pick_used_mining","[P.type]") -+ SSblackbox.add_details("pick_used_mining","[P.type]") - else - return attack_hand(user) - return -@@ -74,7 +74,7 @@ - var/i - for (i=0;i[key_name_admin(usr)] made all areas powered") - power_restore() -@@ -326,8 +326,8 @@ - if("unpower") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","UP") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","UP") - log_admin("[key_name(usr)] made all areas unpowered", 1) - message_admins("[key_name_admin(usr)] made all areas unpowered") - power_failure() -@@ -335,8 +335,8 @@ - if("quickpower") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","QP") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","QP") - log_admin("[key_name(usr)] made all SMESs powered", 1) - message_admins("[key_name_admin(usr)] made all SMESs powered") - power_restore_quick() -@@ -350,8 +350,8 @@ - var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN) - if(!objective) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","TA([objective])") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","TA([objective])") - for(var/mob/living/carbon/human/H in GLOB.player_list) - if(H.stat == 2 || !H.client || !H.mind) continue - if(is_special_character(H)) continue -@@ -383,8 +383,8 @@ - if("changebombcap") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","BC") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","BC") - - var/newBombCap = input(usr,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) as num|null - if (newBombCap < 4) -@@ -404,16 +404,16 @@ - if("lightsout") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","LO") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","LO") - message_admins("[key_name_admin(usr)] has broke a lot of lights") - E = new /datum/round_event/electrical_storm{lightsoutAmount = 2}() - - if("blackout") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","BO") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","BO") - message_admins("[key_name_admin(usr)] broke all lights") - for(var/obj/machinery/light/L in GLOB.machines) - L.break_light_tube() -@@ -429,8 +429,8 @@ - - if(animetype == "Cancel" || droptype == "Cancel") - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","CC") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","CC") - message_admins("[key_name_admin(usr)] made everything kawaii.") - for(var/mob/living/carbon/human/H in GLOB.mob_list) - H << sound('sound/AI/animes.ogg') -@@ -460,8 +460,8 @@ - if("whiteout") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","WO") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","WO") - message_admins("[key_name_admin(usr)] fixed all lights") - for(var/obj/machinery/light/L in GLOB.machines) - L.fix() -@@ -472,8 +472,8 @@ - if("virus") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","V") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","V") - switch(alert("Do you want this to be a random disease or do you have something in mind?",,"Make Your Own","Random","Choose")) - if("Make Your Own") - AdminCreateVirus(usr.client) -@@ -488,8 +488,8 @@ - if("retardify") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","RET") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","RET") - for(var/mob/living/carbon/human/H in GLOB.player_list) - to_chat(H, "You suddenly feel stupid.") - H.setBrainLoss(60) -@@ -498,8 +498,8 @@ - if("eagles")//SCRAW - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","EgL") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","EgL") - for(var/obj/machinery/door/airlock/W in GLOB.machines) - if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison)) - W.req_access = list() -@@ -509,8 +509,8 @@ - if("guns") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","SG") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","SG") - var/survivor_probability = 0 - switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!")) - if("Some Antags") -@@ -523,8 +523,8 @@ - if("magic") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","SM") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","SM") - var/survivor_probability = 0 - switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!")) - if("Some Antags") -@@ -540,15 +540,15 @@ - if(!SSevents.wizardmode) - if(alert("Do you want to toggle summon events on?",,"Yes","No") == "Yes") - summonevents() -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","SE") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","SE") - - else - switch(alert("What would you like to do?",,"Intensify Summon Events","Turn Off Summon Events","Nothing")) - if("Intensify Summon Events") - summonevents() -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","SE") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","SE") - if("Turn Off Summon Events") - SSevents.toggleWizardmode() - SSevents.resetFrequency() -@@ -556,8 +556,8 @@ - if("dorf") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","DF") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","DF") - for(var/mob/living/carbon/human/B in GLOB.mob_list) - B.facial_hair_style = "Dward Beard" - B.update_hair() -@@ -566,8 +566,8 @@ - if("onlyone") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","OO") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","OO") - usr.client.only_one() - send_to_playing_players('sound/misc/highlander.ogg') - // message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)") -@@ -575,16 +575,16 @@ - if("delayed_onlyone") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","OO") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","OO") - usr.client.only_one_delayed() - send_to_playing_players('sound/misc/highlander_delayed.ogg') - - if("onlyme") - if(!check_rights(R_FUN)) - return -- feedback_inc("admin_secrets_fun_used",1) -- feedback_add_details("admin_secrets_fun_used","OM") -+ SSblackbox.inc("admin_secrets_fun_used",1) -+ SSblackbox.add_details("admin_secrets_fun_used","OM") - only_me() - - if("maint_access_brig") diff --git a/code/modules/admin/topic.dm.rej b/code/modules/admin/topic.dm.rej deleted file mode 100644 index 5cbae46c98..0000000000 --- a/code/modules/admin/topic.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm (rejected hunks) -@@ -1175,7 +1175,7 @@ - ban_unban_log_save("[key_name(usr)] has permabanned [key_name(M)]. - Reason: [reason] - This is a permanent ban.") - log_admin_private("[key_name(usr)] has banned [key_name_admin(M)].\nReason: [reason]\nThis is a permanent ban.") - message_admins("[key_name_admin(usr)] has banned [key_name_admin(M)].\nReason: [reason]\nThis is a permanent ban.") -- feedback_inc("ban_perma",1) -+ SSblackbox.inc("ban_perma",1) - qdel(M.client) - if("Cancel") - return diff --git a/code/modules/admin/verbs/adminhelp.dm.rej b/code/modules/admin/verbs/adminhelp.dm.rej deleted file mode 100644 index 047041a5fc..0000000000 --- a/code/modules/admin/verbs/adminhelp.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm (rejected hunks) -@@ -127,7 +127,7 @@ - log_admin_private("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins who have +BAN.") - if(admin_number_present <= 0) - to_chat(src, "No active admins are online, your adminhelp was sent to the admin irc.") -- feedback_add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - - /proc/get_admin_counts(requiredflags = R_BAN) diff --git a/code/modules/admin/verbs/adminjump.dm.rej b/code/modules/admin/verbs/adminjump.dm.rej deleted file mode 100644 index d5eeea0944..0000000000 --- a/code/modules/admin/verbs/adminjump.dm.rej +++ /dev/null @@ -1,16 +0,0 @@ -diff a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm (rejected hunks) -@@ -107,7 +107,7 @@ - log_admin("[key_name(usr)] teleported [key_name(M)]") - message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]") - M.forceMove(get_turf(usr)) -- feedback_add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - /client/proc/Getkey() - set category = "Admin" -@@ -149,4 +149,4 @@ - message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]") - else - to_chat(src, "Failed to move mob to a valid location.") -- feedback_add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/debug.dm.rej b/code/modules/admin/verbs/debug.dm.rej deleted file mode 100644 index 5849ad1f2c..0000000000 --- a/code/modules/admin/verbs/debug.dm.rej +++ /dev/null @@ -1,28 +0,0 @@ -diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm (rejected hunks) -@@ -79,7 +79,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that - . = get_callproc_returnval(returnval, procname) - if(.) - to_chat(usr, .) -- feedback_add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - /client/proc/callproc_datum(datum/A as null|area|mob|obj|turf) - set category = "Debug" -@@ -104,7 +104,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that - return - log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") - message_admins("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") -- feedback_add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - var/returnval = call(A,procname)(arglist(lst)) // Pass the lst as an argument list to the proc - . = get_callproc_returnval(returnval,procname) -@@ -758,7 +758,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that - GLOB.medals_enabled = !GLOB.medals_enabled - - message_admins("[key_name_admin(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") -- feedback_add_details("admin_verb","Toggle Medal Disable") // If... -+ SSblackbox.add_details("admin_verb","Toggle Medal Disable") // If... - log_admin("[key_name(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.") - - /client/proc/view_runtimes() diff --git a/code/modules/admin/verbs/panicbunker.dm.rej b/code/modules/admin/verbs/panicbunker.dm.rej deleted file mode 100644 index 5a4748cc3a..0000000000 --- a/code/modules/admin/verbs/panicbunker.dm.rej +++ /dev/null @@ -1,8 +0,0 @@ -diff a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm (rejected hunks) -@@ -11,5 +11,5 @@ - message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"enabled":"disabled")].") - if (config.panic_bunker && (!GLOB.dbcon || !GLOB.dbcon.IsConnected())) - message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.") -- feedback_add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - diff --git a/code/modules/admin/verbs/randomverbs.dm.rej b/code/modules/admin/verbs/randomverbs.dm.rej deleted file mode 100644 index 5622cb5975..0000000000 --- a/code/modules/admin/verbs/randomverbs.dm.rej +++ /dev/null @@ -1,46 +0,0 @@ -diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm (rejected hunks) -@@ -16,7 +16,7 @@ - - log_admin("[key_name(usr)] made [key_name(M)] drop everything!") - message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!") -- feedback_add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - - /client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list) -@@ -42,7 +42,7 @@ - - log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") - message_admins(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]") -- feedback_add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - /client/proc/cmd_admin_world_narrate() - set category = "Special Verbs" -@@ -83,7 +83,7 @@ - to_chat(M, msg) - log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]") - message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
") -- feedback_add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - /client/proc/cmd_admin_local_narrate(atom/A) - set category = "Special Verbs" -@@ -118,7 +118,7 @@ - - log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") - message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") -- feedback_add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - - /proc/cmd_admin_mute(whom, mute_type, automute = 0) -@@ -448,7 +448,7 @@ Traitors and the like can also be revived with the previous role mostly intact. - - log_admin("[key_name(usr)] healed / revived [key_name(M)]") - message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!") -- feedback_add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - /client/proc/cmd_admin_create_centcom_report() - set category = "Special Verbs" diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm.rej b/code/modules/admin/verbs/reestablish_db_connection.dm.rej deleted file mode 100644 index b0aca5351d..0000000000 --- a/code/modules/admin/verbs/reestablish_db_connection.dm.rej +++ /dev/null @@ -1,15 +0,0 @@ -diff a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm (rejected hunks) -@@ -17,11 +17,11 @@ - GLOB.dbcon.Disconnect() - log_admin("[key_name(usr)] has forced the database to disconnect") - message_admins("[key_name_admin(usr)] has forced the database to disconnect!") -- feedback_add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - log_admin("[key_name(usr)] is attempting to re-established the DB Connection") - message_admins("[key_name_admin(usr)] is attempting to re-established the DB Connection") -- feedback_add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -+ SSblackbox.add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - GLOB.dbcon.failed_connections = 0 - if(!GLOB.dbcon.Connect()) diff --git a/code/modules/clothing/clothing.dm.rej b/code/modules/clothing/clothing.dm.rej deleted file mode 100644 index 3deb315f37..0000000000 --- a/code/modules/clothing/clothing.dm.rej +++ /dev/null @@ -1,29 +0,0 @@ -diff a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm (rejected hunks) -@@ -545,16 +545,26 @@ BLIND // can't see anything - tI.color = hastie.color - . += tI - -+/obj/item/clothing/under/attackby(obj/item/W, mob/user, params) -+ if((has_sensor == BROKEN_SENSORS) && istype(W, /obj/item/stack/cable_coil)) -+ var/obj/item/stack/cable_coil/C = W -+ C.use(1) -+ has_sensor = HAS_SENSORS -+ to_chat(user,"You repair the suit sensors on [src] with [C].") -+ return 1 -+ - /obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE) - ..() - if(ismob(loc)) - var/mob/M = loc - M.update_inv_w_uniform() -+ if(has_sensor > NO_SENSORS) -+ has_sensor = BROKEN_SENSORS - - /obj/item/clothing/under/New() - if(random_sensor) - //make the sensor mode favor higher levels, except coords. -- sensor_mode = pick(0, 1, 1, 2, 2, 2, 3, 3) -+ sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS) - adjusted = NORMAL_STYLE - ..() - diff --git a/code/modules/clothing/suits/armor.dm.rej b/code/modules/clothing/suits/armor.dm.rej deleted file mode 100644 index 5996d94b57..0000000000 --- a/code/modules/clothing/suits/armor.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm (rejected hunks) -@@ -140,7 +140,7 @@ - return 1 - - /obj/item/clothing/suit/armor/vest/det_suit -- name = "armor" -+ name = "detective's armor vest" - desc = "An armored vest with a detective's badge on it." - icon_state = "detective-armor" - allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/ballistic,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/weapon/melee/classic_baton/telescopic) diff --git a/code/modules/events/_event.dm.rej b/code/modules/events/_event.dm.rej deleted file mode 100644 index fefa119632..0000000000 --- a/code/modules/events/_event.dm.rej +++ /dev/null @@ -1,17 +0,0 @@ -diff a/code/modules/events/_event.dm b/code/modules/events/_event.dm (rejected hunks) -@@ -78,13 +78,13 @@ - triggering = FALSE - message_admins("[key_name_admin(usr)] cancelled event [name].") - log_admin_private("[key_name(usr)] cancelled event [name].") -- feedback_add_details("admin_verb","Cancel Event: [typepath]") -+ SSblackbox.add_details("admin_verb","Cancel Event: [typepath]") - - /datum/round_event_control/proc/runEvent(random) - var/datum/round_event/E = new typepath() - E.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) - E.control = src -- feedback_add_details("event_ran","[E]") -+ SSblackbox.add_details("event_ran","[E]") - occurrences++ - - testing("[time2text(world.time, "hh:mm:ss")] [E.type]") diff --git a/code/modules/mining/equipment.dm.rej b/code/modules/mining/equipment.dm.rej deleted file mode 100644 index b8c7edb1c9..0000000000 --- a/code/modules/mining/equipment.dm.rej +++ /dev/null @@ -1,26 +0,0 @@ -diff a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm (rejected hunks) -@@ -68,7 +68,7 @@ - - /obj/item/device/wormhole_jaunter/attack_self(mob/user) - user.visible_message("[user.name] activates the [src.name]!") -- feedback_add_details("jaunter", "U") // user activated -+ SSblackbox.add_details("jaunter", "U") // user activated - activate(user) - - /obj/item/device/wormhole_jaunter/proc/turf_check(mob/user) -@@ -124,13 +124,13 @@ - - if(triggered) - usr.visible_message("The [src] overloads and activates!") -- feedback_add_details("jaunter","E") // EMP accidental activation -+ SSblackbox.add_details("jaunter","E") // EMP accidental activation - activate(usr) - - /obj/item/device/wormhole_jaunter/proc/chasm_react(mob/user) - if(user.get_item_by_slot(slot_belt) == src) - to_chat(user, "Your [src] activates, saving you from the chasm!") -- feedback_add_details("jaunter","C") // chasm automatic activation -+ SSblackbox.add_details("jaunter","C") // chasm automatic activation - activate(user) - else - to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.") diff --git a/code/modules/mining/lavaland/necropolis_chests.dm.rej b/code/modules/mining/lavaland/necropolis_chests.dm.rej deleted file mode 100644 index 60981a7456..0000000000 --- a/code/modules/mining/lavaland/necropolis_chests.dm.rej +++ /dev/null @@ -1,28 +0,0 @@ -diff a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm (rejected hunks) -@@ -87,7 +87,7 @@ - user.sight |= SEE_MOBS - icon_state = "lantern" - wisp.orbit(user, 20) -- feedback_add_details("wisp_lantern","F") // freed -+ SSblackbox.add_details("wisp_lantern","F") // freed - - else - to_chat(user, "You return the wisp to the lantern.") -@@ -102,7 +102,7 @@ - wisp.stop_orbit() - wisp.loc = src - icon_state = "lantern-blue" -- feedback_add_details("wisp_lantern","R") // returned -+ SSblackbox.add_details("wisp_lantern","R") // returned - - /obj/item/device/wisp_lantern/Initialize() - ..() -@@ -229,7 +229,7 @@ - - /obj/item/device/immortality_talisman/attack_self(mob/user) - if(cooldown < world.time) -- feedback_add_details("immortality_talisman","U") // usage -+ SSblackbox.add_details("immortality_talisman","U") // usage - cooldown = world.time + 600 - user.visible_message("[user] vanishes from reality, leaving a a hole in [user.p_their()] place!") - var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc)) diff --git a/code/modules/mob/living/simple_animal/constructs.dm.rej b/code/modules/mob/living/simple_animal/constructs.dm.rej deleted file mode 100644 index d200533753..0000000000 --- a/code/modules/mob/living/simple_animal/constructs.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm (rejected hunks) -@@ -35,7 +35,6 @@ - - /mob/living/simple_animal/hostile/construct/Initialize() - . = ..() -- updateglow() - update_health_hud() - for(var/spell in construct_spells) - AddSpell(new spell(null)) diff --git a/code/modules/mob/logout.dm.rej b/code/modules/mob/logout.dm.rej deleted file mode 100644 index 809131d9f4..0000000000 --- a/code/modules/mob/logout.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm (rejected hunks) -@@ -3,7 +3,7 @@ - unset_machine() - GLOB.player_list -= src - if(GLOB.admin_datums[src.ckey]) -- if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing. -+ if (SSticker && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing. - var/admins_number = GLOB.admins.len - if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell. - var/cheesy_message = pick( list( \ diff --git a/code/modules/power/singularity/emitter.dm.rej b/code/modules/power/singularity/emitter.dm.rej deleted file mode 100644 index ea82e4cb0c..0000000000 --- a/code/modules/power/singularity/emitter.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm (rejected hunks) -@@ -88,7 +88,7 @@ - connect_to_network() - - /obj/machinery/power/emitter/Destroy() -- if(SSticker && SSticker.current_state == GAME_STATE_PLAYING) -+ if(SSticker && SSticker.IsRoundInProgress()) - message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) - log_game("Emitter deleted at ([x],[y],[z])") - investigate_log("deleted at ([x],[y],[z]) at [get_area(src)]","singulo") diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej b/code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej deleted file mode 100644 index 7a34c24c52..0000000000 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej +++ /dev/null @@ -1,442 +0,0 @@ -diff a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm (rejected hunks) -@@ -19,7 +19,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimespawn/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/mob/living/simple_animal/slime/S - S = new(get_turf(holder.my_atom), "grey") - S.visible_message("Infused with plasma, the \ -@@ -36,7 +36,7 @@ - required_container = /obj/item/slime_extract/grey - - /datum/chemical_reaction/slime/slimeinaprov/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - /datum/chemical_reaction/slime/slimemonkey -@@ -47,7 +47,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimemonkey/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - for(var/i = 1, i <= 3, i++) - var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube - M.loc = get_turf(holder.my_atom) -@@ -63,7 +63,7 @@ - required_container = /obj/item/slime_extract/green - - /datum/chemical_reaction/slime/slimemutate/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - //Mutated Green -@@ -77,7 +77,7 @@ - mix_message = "The mixture rapidly expands and contracts, its appearance shifting into a sickening green." - - /datum/chemical_reaction/slime/slimemutate_unstable/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - //Metal -@@ -89,7 +89,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimemetal/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/location = get_turf(holder.my_atom) - new /obj/item/stack/sheet/plasteel (location, 5) - new /obj/item/stack/sheet/metal (location, 15) -@@ -103,7 +103,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimeglass/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/location = get_turf(holder.my_atom) - new /obj/item/stack/sheet/rglass (location, 5) - new /obj/item/stack/sheet/glass (location, 15) -@@ -118,7 +118,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecrit/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime extract begins to vibrate violently !") - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 5, "Gold Slime"), 50) -@@ -134,7 +134,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecritlesser/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime extract begins to vibrate violently !") - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Lesser Gold Slime", "neutral"), 50) -@@ -150,7 +150,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecritfriendly/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime extract begins to vibrate adorably !") - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 1, "Friendly Gold Slime", "neutral"), 50) -@@ -168,7 +168,7 @@ - - /datum/chemical_reaction/slime/slimebork/on_reaction(datum/reagents/holder) - -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks, - /obj/item/weapon/reagent_containers/food/snacks/store/bread, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, -@@ -216,7 +216,7 @@ - - /datum/chemical_reaction/slime/slimebork2/on_reaction(datum/reagents/holder) - -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/drinks) - // BORK BORK BORK - -@@ -246,7 +246,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimefrost/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - -@@ -258,7 +258,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimestabilizer/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/stabilizer/P = new /obj/item/slimepotion/stabilizer - P.loc = get_turf(holder.my_atom) - ..() -@@ -273,7 +273,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimefoam/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - -@@ -286,7 +286,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime extract begins to vibrate adorably!") - addtimer(CALLBACK(src, .proc/freeze, holder), 50) -@@ -310,7 +310,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimefireproof/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/fireproof/P = new /obj/item/slimepotion/fireproof - P.loc = get_turf(holder.my_atom) - ..() -@@ -325,7 +325,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecasp/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - /datum/chemical_reaction/slime/slimefire -@@ -336,7 +336,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/TU = get_turf(holder.my_atom) - TU.visible_message("The slime extract begins to vibrate adorably!") - addtimer(CALLBACK(src, .proc/slime_burn, holder), 50) -@@ -360,7 +360,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimesmoke/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - //Yellow -@@ -373,7 +373,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, created_volume) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - empulse(get_turf(holder.my_atom), 3, 7) - ..() - -@@ -386,7 +386,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecell/on_reaction(datum/reagents/holder, created_volume) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime - P.loc = get_turf(holder.my_atom) - ..() -@@ -399,7 +399,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimeglow/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.") - var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime -@@ -416,7 +416,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimepsteroid/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/steroid/P = new /obj/item/slimepotion/steroid - P.loc = get_turf(holder.my_atom) - ..() -@@ -430,7 +430,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimejam/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - -@@ -443,7 +443,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimeplasma/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/location = get_turf(holder.my_atom) - new /obj/item/stack/sheet/mineral/plasma (location, 3) - ..() -@@ -458,7 +458,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimemutator/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/mutator/P = new /obj/item/slimepotion/mutator - P.loc = get_turf(holder.my_atom) - ..() -@@ -471,7 +471,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimebloodlust/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null)) - slime.rabid = 1 - slime.visible_message("The [slime] is driven into a frenzy!") -@@ -486,7 +486,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimespeed/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/speed/P = new /obj/item/slimepotion/speed - P.loc = get_turf(holder.my_atom) - ..() -@@ -501,7 +501,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/docility/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/docility/P = new /obj/item/slimepotion/docility - P.loc = get_turf(holder.my_atom) - ..() -@@ -514,7 +514,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/gender/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/genderchange/G = new /obj/item/slimepotion/genderchange - G.loc = get_turf(holder.my_atom) - ..() -@@ -529,7 +529,7 @@ - required_container = /obj/item/slime_extract/black - - /datum/chemical_reaction/slime/slimemutate2/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - //Oil -@@ -541,7 +541,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimeexplosion/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/turf/T = get_turf(holder.my_atom) - var/lastkey = holder.my_atom.fingerprintslast - var/touch_msg = "N/A" -@@ -570,7 +570,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecornoil/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - ..() - - //Light Pink -@@ -582,7 +582,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimepotion2/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/sentience/P = new /obj/item/slimepotion/sentience - P.loc = get_turf(holder.my_atom) - ..() -@@ -596,7 +596,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimegolem/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/effect/golemrune/Z = new /obj/effect/golemrune - Z.loc = get_turf(holder.my_atom) - notify_ghosts("Golem rune created in [get_area(Z)].", 'sound/effects/ghost2.ogg', source = Z) -@@ -610,7 +610,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimegolem2/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/golem_shell/artificial/Z = new /obj/item/golem_shell/artificial - Z.loc = get_turf(holder.my_atom) - ..() -@@ -624,7 +624,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimefloor2/on_reaction(datum/reagents/holder, created_volume) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace - P.amount = 25 - P.loc = get_turf(holder.my_atom) -@@ -639,7 +639,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecrystal/on_reaction(datum/reagents/holder, created_volume) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - if(holder.my_atom) - var/obj/item/weapon/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom)) - BC.visible_message("The [BC.name] appears out of thin air!") -@@ -654,7 +654,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimepsteroid2/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/enhancer/P = new /obj/item/slimepotion/enhancer - P.loc = get_turf(holder.my_atom) - ..() -@@ -668,7 +668,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slime_territory/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/areaeditor/blueprints/slime/P = new /obj/item/areaeditor/blueprints/slime - P.loc = get_turf(holder.my_atom) - ..() -@@ -682,7 +682,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast) - var/obj/effect/timestop/T = new /obj/effect/timestop - T.loc = get_turf(holder.my_atom) -@@ -699,7 +699,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecamera/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/device/camera/P = new /obj/item/device/camera - P.loc = get_turf(holder.my_atom) - var/obj/item/device/camera_film/Z = new /obj/item/device/camera_film -@@ -714,7 +714,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimefloor/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia - P.amount = 25 - P.loc = get_turf(holder.my_atom) -@@ -732,7 +732,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimepaint/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/list/paints = subtypesof(/obj/item/weapon/paint) - var/chosen = pick(paints) - var/obj/P = new chosen -@@ -749,7 +749,7 @@ - required_other = 1 - - /datum/chemical_reaction/slime/slimecrayon/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/list/crayons = difflist(subtypesof(/obj/item/toy/crayon),typesof(/obj/item/toy/crayon/spraycan)) - var/chosen = pick(crayons) - var/obj/P = new chosen -@@ -766,7 +766,7 @@ - required_container = /obj/item/slime_extract/rainbow - - /datum/chemical_reaction/slime/slimeRNG/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/mob/living/simple_animal/slime/random/S - S = new(get_turf(holder.my_atom)) - S.visible_message("Infused with plasma, the \ -@@ -782,7 +782,7 @@ - required_container = /obj/item/slime_extract/rainbow - - /datum/chemical_reaction/slime/slime_transfer/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/transference/P = new /obj/item/slimepotion/transference - P.loc = get_turf(holder.my_atom) - ..() -@@ -795,7 +795,7 @@ - required_container = /obj/item/slime_extract/rainbow - - /datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder) -- feedback_add_details("slime_cores_used","[type]") -+ SSblackbox.add_details("slime_cores_used","[type]") - new/obj/item/weapon/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom)) - ..() - diff --git a/code/modules/uplink/uplink_item.dm.rej b/code/modules/uplink/uplink_item.dm.rej deleted file mode 100644 index 7709867051..0000000000 --- a/code/modules/uplink/uplink_item.dm.rej +++ /dev/null @@ -1,17 +0,0 @@ -diff a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm (rejected hunks) -@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. - - /datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U) - if(item) -- feedback_add_details("traitor_uplink_items_bought", "[item]") -+ SSblackbox.add_details("traitor_uplink_items_bought", "[item]") - return new item(loc) - - /datum/uplink_item/proc/buy(mob/user, obj/item/device/uplink/U) -@@ -1351,5 +1351,5 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. - var/datum/uplink_item/I = pick(possible_items) - U.telecrystals -= I.cost - U.spent_telecrystals += I.cost -- feedback_add_details("traitor_uplink_items_bought","RN") -+ SSblackbox.add_details("traitor_uplink_items_bought","RN") - return new I.item(loc) diff --git a/code/world.dm.rej b/code/world.dm.rej deleted file mode 100644 index 61fdf99e06..0000000000 --- a/code/world.dm.rej +++ /dev/null @@ -1,19 +0,0 @@ -diff a/code/world.dm b/code/world.dm (rejected hunks) -@@ -208,7 +208,7 @@ - #undef WORLD_REBOOT - - /world/proc/OnReboot(reason, feedback_c, feedback_r, round_end_sound_sent) -- feedback_set_details("[feedback_c]","[feedback_r]") -+ SSblackbox.set_details("[feedback_c]","[feedback_r]") - log_game("Rebooting World. [reason]") - #ifdef dellogging - var/log = file("data/logs/del.log") -@@ -218,8 +218,6 @@ - if(count > 10) - log << "#[count]\t[index]" - #endif -- if(GLOB.blackbox) -- GLOB.blackbox.save_all_data_to_sql() - Master.Shutdown() //run SS shutdowns - RoundEndAnimation(round_end_sound_sent) - kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index 02c9418835..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -1,17 +0,0 @@ -diff a/tgstation.dme b/tgstation.dme (rejected hunks) -@@ -158,6 +158,7 @@ - #include "code\controllers\subsystem\assets.dm" - #include "code\controllers\subsystem\atoms.dm" - #include "code\controllers\subsystem\augury.dm" -+#include "code\controllers\subsystem\blackbox.dm" - #include "code\controllers\subsystem\communications.dm" - #include "code\controllers\subsystem\disease.dm" - #include "code\controllers\subsystem\events.dm" -@@ -2078,7 +2079,6 @@ - #include "code\orphaned_procs\AStar.dm" - #include "code\orphaned_procs\dbcore.dm" - #include "code\orphaned_procs\priority_announce.dm" --#include "code\orphaned_procs\statistics.dm" - #include "interface\interface.dm" - #include "interface\stylesheet.dm" - #include "interface\skin.dmf" From 4e620e54e624abacdcec0b3097f2e6d97e3cc7c3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 11:38:06 -0500 Subject: [PATCH 111/131] fix --- Test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test.txt b/Test.txt index fc816240e4..f052ebb735 100644 --- a/Test.txt +++ b/Test.txt @@ -1 +1 @@ -Ignore this \ No newline at end of file +Ignore this again \ No newline at end of file From 4a914a5e670d6021ee38c6b1ffa95dca2ead245f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 12:24:26 -0500 Subject: [PATCH 112/131] Automatic changelog generation for PR #718 [ci skip] --- html/changelogs/AutoChangeLog-pr-718.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-718.yml diff --git a/html/changelogs/AutoChangeLog-pr-718.yml b/html/changelogs/AutoChangeLog-pr-718.yml new file mode 100644 index 0000000000..bf7c2e79f9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-718.yml @@ -0,0 +1,6 @@ +author: "XDTM" +delete-after: True +changes: + - rscadd: "Golems can now click on empty golem shells to transfer into them." + - tweak: "Plasma Golems now no longer explode on death. They instead explode if they're on fire and are hot enough. The explosion size has been increased." + - tweak: "Plasma Golems are now always flammable." From 7baccb8b85ffca86c37cb905fe5ca281a656d268 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 12:47:20 -0500 Subject: [PATCH 113/131] Removes vestigial list from minds. --- code/datums/mind.dm | 2 -- code/modules/admin/verbs/randomverbs.dm | 1 - code/modules/spells/spell_types/mind_transfer.dm | 15 --------------- 3 files changed, 18 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 0acd33ad69..9e764fb5e4 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -44,9 +44,7 @@ var/datum/job/assigned_job var/list/datum/objective/objectives = list() - var/list/datum/objective/special_verbs = list() - var/list/cult_words = list() var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button. var/datum/faction/faction //associated faction diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 547e8e1d03..f1bf4d6969 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -350,7 +350,6 @@ Traitors and the like can also be revived with the previous role mostly intact. if(G_found.mind && !G_found.mind.active) G_found.mind.transfer_to(new_character) //be careful when doing stuff like this! I've already checked the mind isn't in use - new_character.mind.special_verbs = list() else new_character.mind_initialize() if(!new_character.mind.assigned_role) diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm index 7ebafe6e24..052c1f1162 100644 --- a/code/modules/spells/spell_types/mind_transfer.dm +++ b/code/modules/spells/spell_types/mind_transfer.dm @@ -62,29 +62,14 @@ Also, you never added distance checking after target is selected. I've went ahea var/mob/caster = user//The wizard/whomever doing the body transferring. //MIND TRANSFER BEGIN - if(caster.mind.special_verbs.len)//If the caster had any special verbs, remove them from the mob verb list. - for(var/V in caster.mind.special_verbs)//Since the caster is using an object spell system, this is mostly moot. - caster.verbs -= V//But a safety nontheless. - - if(victim.mind.special_verbs.len)//Now remove all of the victim's verbs. - for(var/V in victim.mind.special_verbs) - victim.verbs -= V - var/mob/dead/observer/ghost = victim.ghostize(0) caster.mind.transfer_to(victim) - if(victim.mind.special_verbs.len)//To add all the special verbs for the original caster. - for(var/V in caster.mind.special_verbs)//Not too important but could come into play. - caster.verbs += V - ghost.mind.transfer_to(caster) if(ghost.key) caster.key = ghost.key //have to transfer the key since the mind was not active qdel(ghost) - if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here. - for(var/V in caster.mind.special_verbs) - caster.verbs += V //MIND TRANSFER END //Here we paralyze both mobs and knock them out for a time. From 8a5c180dd3b4ad022881615476c4134eac737dc4 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 13:41:10 -0500 Subject: [PATCH 114/131] Update recipes_misc.dm --- code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 708f49628a..fff76d630f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -325,3 +325,5 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/branrequests category = CAT_MISCFOOD + + From c6f4d299f295b18672cc7dd87a621cf1d560424f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 18:44:55 -0500 Subject: [PATCH 115/131] Automatic changelog generation for PR #699 [ci skip] --- html/changelogs/AutoChangeLog-pr-699.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-699.yml diff --git a/html/changelogs/AutoChangeLog-pr-699.yml b/html/changelogs/AutoChangeLog-pr-699.yml new file mode 100644 index 0000000000..68fca1b6ac --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-699.yml @@ -0,0 +1,4 @@ +author: "QualityVan" +delete-after: True +changes: + - tweak: "Saline glucose now acts as temporary blood instead of increasing blood regeneration" From 5edd88cd076886a3f37e8edb08527ee320888ac1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 18:47:24 -0500 Subject: [PATCH 116/131] Automatic changelog generation for PR #705 [ci skip] --- html/changelogs/AutoChangeLog-pr-705.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-705.yml diff --git a/html/changelogs/AutoChangeLog-pr-705.yml b/html/changelogs/AutoChangeLog-pr-705.yml new file mode 100644 index 0000000000..a4861ed8f6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-705.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - bugfix: "The biogenerator will now show its recipes again." From 8ab3f4fe39329f9a997802b6d2de15f61916aefb Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 18:51:06 -0500 Subject: [PATCH 117/131] Travis --- Test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test.txt b/Test.txt index f052ebb735..68db24f630 100644 --- a/Test.txt +++ b/Test.txt @@ -1 +1 @@ -Ignore this again \ No newline at end of file +~~ \ No newline at end of file From 007281a51c74ac8b35db3563501ed32404fbacba Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 May 2017 18:53:59 -0500 Subject: [PATCH 118/131] Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts" --- code/modules/admin/verbs/adminhelp.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index b8df3c147d..6b642d4fdd 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -485,10 +485,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.") current_ticket.Close() - if(!(/client/verb/adminhelp in verbs)) - to_chat(usr, "Nice try!") - return - new /datum/admin_help(msg, src, FALSE) //admin proc From 121df4527bb1626873843eaf4c767e63b19e0ae1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 19:04:29 -0500 Subject: [PATCH 119/131] Automatic changelog generation for PR #685 [ci skip] --- html/changelogs/AutoChangeLog-pr-685.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-685.yml diff --git a/html/changelogs/AutoChangeLog-pr-685.yml b/html/changelogs/AutoChangeLog-pr-685.yml new file mode 100644 index 0000000000..16311e93ff --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-685.yml @@ -0,0 +1,5 @@ +author: "Moonlighting Mac says" +delete-after: True +changes: + - bugfix: "Due to a clerical error in the chef's cookbooks now being resolved, you can now make the pristine cookery dish \"Stuffed Legion\" out of exotic ingredients from Lavaland." + - experiment: "After being found again you will now be able to enjoy its special blend of flavors with your tastebuds. Mmm." From 6a365857d1e5e16adea878688690d6417ebb521a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 2 May 2017 20:44:34 -0500 Subject: [PATCH 120/131] Should fix all of the cult/clockcult issues --- code/datums/antagonists/antag_datum.dm | 21 +++++-- code/datums/antagonists/datum_clockcult.dm | 69 ++++++++++++++++------ code/datums/antagonists/datum_cult.dm | 4 +- code/datums/antagonists/datum_cult.dm.rej | 22 ++++++- code/datums/mind.dm | 32 ++++------ 5 files changed, 103 insertions(+), 45 deletions(-) diff --git a/code/datums/antagonists/antag_datum.dm b/code/datums/antagonists/antag_datum.dm index deee1111c0..396c185961 100644 --- a/code/datums/antagonists/antag_datum.dm +++ b/code/datums/antagonists/antag_datum.dm @@ -8,13 +8,26 @@ var/can_coexist_with_others = TRUE //Whether or not the person will be able to have more than one datum var/list/typecache_datum_blacklist = list() //List of datums this type can't coexist with - /datum/antagonist/New(datum/mind/new_owner) - . = ..() typecache_datum_blacklist = typecacheof(typecache_datum_blacklist) if(new_owner) owner = new_owner +/datum/antagonist/Destroy() + if(owner) + LAZYREMOVE(owner.antag_datums, src) + owner = null + return ..() + +/datum/antagonist/proc/can_be_owned(datum/mind/new_owner) + . = TRUE + if(owner.has_antag_datum(type)) + return FALSE + for(var/i in owner.antag_datums) + var/datum/antagonist/A = i + if(is_type_in_typecache(src, A.typecache_datum_blacklist)) + return FALSE + /datum/antagonist/proc/on_body_transfer(mob/living/old_body, mob/living/new_body) remove_innate_effects(old_body) apply_innate_effects(new_body) @@ -37,7 +50,7 @@ /datum/antagonist/proc/on_removal() remove_innate_effects() if(owner) - owner.antag_datums -= src + LAZYREMOVE(owner.antag_datums, src) if(!silent && owner.current) farewell() qdel(src) @@ -46,4 +59,4 @@ return /datum/antagonist/proc/farewell() - return \ No newline at end of file + return diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index 3084b9ba82..b8dfa00f23 100644 --- a/code/datums/antagonists/datum_clockcult.dm +++ b/code/datums/antagonists/datum_clockcult.dm @@ -9,27 +9,52 @@ qdel(hierophant_network) return ..() +/datum/antagonist/clockcult/can_be_owned(datum/mind/new_owner) + . = ..() + if(.) + if(iscyborg(new_owner.current)) + var/mob/living/silicon/robot/R = new_owner.current + if(R.deployed) + var/mob/living/silicon/ai/AI = R.mainframe + R.undeploy() + to_chat(AI, "Anomaly Detected. Returned to core!") //The AI needs to be in its core to properly be converted + . = is_eligible_servant(new_owner.current) + if(!silent && new_owner.current) + if(issilicon(new_owner.current)) + to_chat(new_owner.current, "You are unable to compute this truth. Your vision glows a brilliant yellow, and all at once it comes to you. Ratvar, the \ + Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm.") + else + to_chat(new_owner.current, "[iscarbon(new_owner.current) ? "Your mind is racing! Your body feels incredibly light! ":""]Your world glows a brilliant \ + yellow! All at once it comes to you. Ratvar, the Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm.") + if(!.) + new_owner.current.visible_message("[new_owner.current] seems to resist an unseen force!") + to_chat(new_owner.current, "And yet, you somehow push it all away.") + +/datum/antagonist/clockcult/greet() + if(!owner.current || silent) + return + owner.current.visible_message("[owner.current]'s eyes glow a blazing yellow!") + to_chat(owner.current, "Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork \ + Justiciar above all else. Perform his every whim without hesitation.") + /datum/antagonist/clockcult/on_gain() - if(!owner) - return var/mob/living/current = owner.current - if(!istype(current)) - return + SSticker.mode.servants_of_ratvar += owner + SSticker.mode.update_servant_icons_added(owner) if(jobban_isbanned(current, ROLE_SERVANT_OF_RATVAR)) addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0) + owner.special_role = "Servant of Ratvar" owner.current.log_message("Has been converted to the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) if(issilicon(current)) - var/mob/living/silicon/S = owner - if(iscyborg(S) && !silent) - to_chat(S, "You have been desynced from your master AI.") - to_chat(S, "In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.") - if(isAI(S)) - to_chat(S, "You are able to use your cameras to listen in on conversations.") - to_chat(S, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") + if(iscyborg(current) && !silent) + to_chat(current, "You have been desynced from your master AI.") + to_chat(current, "In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.") + if(isAI(current)) + to_chat(current, "You are able to use your cameras to listen in on conversations.") + to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") else if(isbrain(current) || isclockmob(current)) to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") ..() - SSticker.mode.update_servant_icons_added(owner) if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) var/datum/game_mode/clockwork_cult/C = SSticker.mode C.present_tasks(owner) //Memorize the objectives @@ -47,11 +72,17 @@ var/mob/living/silicon/S = current if(iscyborg(S)) var/mob/living/silicon/robot/R = S - R.UnlinkSelf() + if(!R.shell) + R.UnlinkSelf() R.module.rebuild_modules() else if(isAI(S)) var/mob/living/silicon/ai/A = S + A.can_be_carded = FALSE A.requires_power = POWER_REQ_CLOCKCULT + var/list/AI_frame = list(mutable_appearance('icons/mob/clockwork_mobs.dmi', "aiframe")) //make the AI's cool frame + for(var/d in GLOB.cardinal) + AI_frame += image('icons/mob/clockwork_mobs.dmi', A, "eye[rand(1, 10)]", dir = d) //the eyes are randomly fast or slow + A.add_overlay(AI_frame) if(!A.lacks_power()) A.ai_restore_power() if(A.eyeobj) @@ -84,8 +115,6 @@ current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump) if(!GLOB.clockwork_gateway_activated) current.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs) - update_slab_info() - /datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override) var/mob/living/current = owner.current @@ -102,7 +131,9 @@ var/mob/living/silicon/S = current if(isAI(S)) var/mob/living/silicon/ai/A = S + A.can_be_carded = initial(A.can_be_carded) A.requires_power = initial(A.requires_power) + A.cut_overlays() S.make_laws() S.update_icons() S.show_laws() @@ -113,14 +144,16 @@ R.module.rebuild_modules() if(temp_owner) temp_owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them, we need to update buttons - update_slab_info() /datum/antagonist/clockcult/on_removal() - . = ..() + SSticker.mode.servants_of_ratvar -= owner SSticker.mode.update_servant_icons_removed(owner) if(!silent) owner.current.visible_message("[owner] seems to have remembered their true allegiance!", \ "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") owner.current.log_message("Has renounced the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) + owner.wipe_memory() + owner.special_role = null if(iscyborg(owner.current)) - to_chat(owner.current, "Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.") \ No newline at end of file + to_chat(owner.current, "Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.") + . = ..() diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index 719f0efec0..1fe344aedd 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -32,9 +32,11 @@ communion.Remove(current) /datum/antagonist/cult/on_removal() - . = ..() + owner.wipe_memory() + SSticker.mode.cult -= owner SSticker.mode.update_cult_icons_removed(owner) to_chat(owner, "An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.") owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) if(!silent) owner.current.visible_message("[owner] looks like [owner.current.p_they()] just reverted to their old faith!") + . = ..() diff --git a/code/datums/antagonists/datum_cult.dm.rej b/code/datums/antagonists/datum_cult.dm.rej index 991ad512c9..0fc846a73c 100644 --- a/code/datums/antagonists/datum_cult.dm.rej +++ b/code/datums/antagonists/datum_cult.dm.rej @@ -1,9 +1,25 @@ diff a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm (rejected hunks) -@@ -11,6 +11,7 @@ - return +@@ -5,13 +5,20 @@ + qdel(communion) + return ..() + ++/datum/antagonist/cult/can_be_owned(datum/mind/new_owner) ++ . = ..() ++ if(.) ++ . = is_convertable_to_cult(new_owner.current) ++ + /datum/antagonist/cult/on_gain() + . = ..() +- if(!owner) +- return ++ SSticker.mode.cult += owner ++ SSticker.mode.update_cult_icons_added(owner) ++ if(istype(SSticker.mode, /datum/game_mode/cult)) ++ var/datum/game_mode/cult/C = SSticker.mode ++ C.memorize_cult_objectives(owner) if(jobban_isbanned(owner.current, ROLE_CULTIST)) addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner.current, ROLE_CULTIST, ROLE_CULTIST), 0) -+ SSticker.mode.update_cult_icons_added(owner) +- SSticker.mode.update_cult_icons_added(owner) owner.current.log_message("Has been converted to the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) /datum/antagonist/cult/apply_innate_effects(mob/living/mob_override) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 0acd33ad69..421cecc95b 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -54,7 +54,7 @@ var/linglink var/miming = 0 // Mime's vow of silence - var/list/antag_datums = list() + var/list/antag_datums var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD var/datum/gang/gang_datum //Which gang this mind belongs to, if any @@ -71,6 +71,10 @@ /datum/mind/Destroy() SSticker.minds -= src + if(islist(antag_datums)) + for(var/i in antag_datums) + qdel(i) + antag_datums = null return ..() /datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0) @@ -110,15 +114,16 @@ memory = null // Datum antag mind procs -/datum/mind/proc/add_antag_datum(datum_type, on_gain = TRUE) +/datum/mind/proc/add_antag_datum(datum_type) if(!datum_type) return - if(!can_hold_antag_datum(datum_type)) - return var/datum/antagonist/A = new datum_type(src) - antag_datums += A - if(on_gain) - A.on_gain() + if(!A.can_be_owned(src)) + qdel(A) + return + LAZYADD(antag_datums, A) + A.on_gain() + return A /datum/mind/proc/remove_antag_datum(datum_type) if(!datum_type) @@ -126,6 +131,7 @@ var/datum/antagonist/A = has_antag_datum(datum_type) if(A) A.on_removal() + return TRUE /datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us. for(var/a in antag_datums) @@ -143,18 +149,6 @@ else if(A.type == datum_type) return A -/datum/mind/proc/can_hold_antag_datum(datum_type) - if(!datum_type) - return - . = TRUE - if(has_antag_datum(datum_type)) - return FALSE - for(var/i in antag_datums) - var/datum/antagonist/A = i - if(is_type_in_typecache(A, A.typecache_datum_blacklist)) - return FALSE - - /* Removes antag type's references from a mind. objectives, uplinks, powers etc are all handled. From 4141b6549f4b5bb44bba2e4d305713ce30c2ca17 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 3 May 2017 01:42:35 -0500 Subject: [PATCH 121/131] Adds eyeball soup and spaghetti to the game: it's now been 8 days edition --- .../food_and_drinks/food/snacks_soup.dm | 9 +++++++-- .../food_and_drinks/food/snacks_spaghetti.dm | 2 +- .../recipes/tablecraft/recipes_soup.dm | 12 ++++++++++++ icons/obj/food/soupsalad.dmi | Bin 18041 -> 18570 bytes 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index 79df428ebb..e11231fdfc 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -128,6 +128,13 @@ list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3) tastes = list("tomato" = 1) +/obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball + name = "eyeball soup" + desc = "It looks back at you..." + icon_state = "eyeballsoup" + bonus_reagents = list("nutriment" = 1, "liquidgibs" = 3) + tastes = list("tomato" = 1, "squirming" = 1) + /obj/item/weapon/reagent_containers/food/snacks/soup/milo name = "milosoup" desc = "The universes best soup! Yum!!!" @@ -196,5 +203,3 @@ icon_state = "redbeetsoup" bonus_reagents = list("nutriment" = 4, "vitamin" = 6) tastes = list("beet" = 1) - - diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm index fd17c0ebd5..dc3aa60115 100644 --- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm +++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm @@ -83,5 +83,5 @@ icon = 'icons/obj/food/pizzaspaghetti.dmi' icon_state = "beefnoodle" trash = /obj/item/weapon/reagent_containers/glass/bowl - bonus_reagents = list("nutriment" = 5, "vitamin" = 6) + bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3) tastes = list("noodle" = 1, "meat" = 1) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 050beb8478..8ab865f65d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -91,6 +91,18 @@ result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato category = CAT_SOUP +/datum/crafting_recipe/food/eyeballsoup + name = "Eyeball soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/weapon/reagent_containers/glass/bowl = 1, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2, + /obj/item/organ/eyes = 1 + ) + result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball + category = CAT_SOUP + + /datum/crafting_recipe/food/milosoup name = "Milo soup" reqs = list( diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi index fe4c07362af1de60863c06136e4b6b5edf9d54bc..c6df0a26039a75e9e460ba81307807b3e8d3ddf2 100644 GIT binary patch literal 18570 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 UZxbhPqyPW_07*qoM6N<$f_^i8$^ZZW literal 18041 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 Date: Wed, 3 May 2017 04:07:38 -0500 Subject: [PATCH 122/131] Fixes the Slimecore HUD's neck slot --- icons/mob/screen_slimecore.dmi | Bin 28022 -> 28030 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/screen_slimecore.dmi b/icons/mob/screen_slimecore.dmi index bc33ad6e376e1d811c7745c3acd61a9cd3d136b5..63d67e6fbac8156d15f9ce1e1b0c58cc9b668314 100644 GIT binary patch delta 11296 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 From 3f77a1026689c725bd32db9509fd02169a08477e Mon Sep 17 00:00:00 2001 From: TalkingCactus Date: Wed, 3 May 2017 07:16:20 -0400 Subject: [PATCH 123/131] Update ISSUE_TEMPLATE.md makes issues less intimidating by removing unnecessary information. --- .github/ISSUE_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index f5fa86a76d..5ea13b991f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,3 +1,3 @@ -[Note]: # (Please enter the commit hash and active testmerge numbers from the "Show Server Revision" verb if you can. If you believe the issue to be caused by a testmerge, please report it in its relative PR thread. State what the issue is from a "whats wrong" prospective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Start your issue report below both of these lines (or remove them)) +[Note]: # (State what the issue is from a "whats wrong" prospective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Please enter the commit hash from the "Show Server Revision" verb if you can. Remove these notes before submitting your report.) -[Admins]: # (If you are reporting a bug that occured AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.) +[GameAdmins]: # (If you are reporting a bug that occured AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.) From f5fce8eeee0da35f346683aa5a9e95e1bdaeb3b2 Mon Sep 17 00:00:00 2001 From: TalkingCactus Date: Wed, 3 May 2017 07:22:08 -0400 Subject: [PATCH 124/131] typo fix --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 5ea13b991f..fce6ab5acf 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,3 +1,3 @@ [Note]: # (State what the issue is from a "whats wrong" prospective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Please enter the commit hash from the "Show Server Revision" verb if you can. Remove these notes before submitting your report.) -[GameAdmins]: # (If you are reporting a bug that occured AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.) +[GameAdmins]: # (If you are reporting a bug that occurred AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.) From 4c92b2c6cec8ad72cb1435cf6c2e62b051df623e Mon Sep 17 00:00:00 2001 From: TalkingCactus Date: Wed, 3 May 2017 07:46:23 -0400 Subject: [PATCH 125/131] another typo caught --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index fce6ab5acf..a1c37bc290 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,3 +1,3 @@ -[Note]: # (State what the issue is from a "whats wrong" prospective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Please enter the commit hash from the "Show Server Revision" verb if you can. Remove these notes before submitting your report.) +[Note]: # (State what the issue is from a "whats wrong" perspective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Please enter the commit hash from the "Show Server Revision" verb if you can. Remove these notes before submitting your report.) [GameAdmins]: # (If you are reporting a bug that occurred AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.) From f333944be010f5c02a2b36a619705c34bc60c0fe Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 3 May 2017 09:02:19 -0500 Subject: [PATCH 126/131] le fix --- code/datums/antagonists/datum_cult.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index 1fe344aedd..30c0aa8450 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -5,10 +5,18 @@ qdel(communion) return ..() +/datum/antagonist/cult/can_be_owned(datum/mind/new_owner) + . = ..() + if(.) + . = is_convertable_to_cult(new_owner.current) + /datum/antagonist/cult/on_gain() . = ..() - if(!owner) - return + SSticker.mode.cult += owner + SSticker.mode.update_cult_icons_added(owner) + if(istype(SSticker.mode, /datum/game_mode/cult)) + var/datum/game_mode/cult/C = SSticker.mode + C.memorize_cult_objectives(owner) if(jobban_isbanned(owner.current, ROLE_CULTIST)) addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner.current, ROLE_CULTIST, ROLE_CULTIST), 0) owner.current.log_message("Has been converted to the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) From a2dacb5893bffd1605575a201fc41632a3487bfa Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 3 May 2017 22:45:59 -0500 Subject: [PATCH 127/131] Automatic changelog generation for PR #727 [ci skip] --- html/changelogs/AutoChangeLog-pr-727.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-727.yml diff --git a/html/changelogs/AutoChangeLog-pr-727.yml b/html/changelogs/AutoChangeLog-pr-727.yml new file mode 100644 index 0000000000..2eaec0638a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-727.yml @@ -0,0 +1,4 @@ +author: "deathride58" +delete-after: True +changes: + - tweak: "Fixed the slimecore HUD's neck slot sprite." From 4ef516ca2432ef7b19459a6ff7b9694ab4d0700c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 3 May 2017 22:49:51 -0500 Subject: [PATCH 128/131] Automatic changelog generation for PR #706 [ci skip] --- html/changelogs/AutoChangeLog-pr-706.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-706.yml diff --git a/html/changelogs/AutoChangeLog-pr-706.yml b/html/changelogs/AutoChangeLog-pr-706.yml new file mode 100644 index 0000000000..bef4ff2c24 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-706.yml @@ -0,0 +1,4 @@ +author: "Kor, Goof and Plizzard" +delete-after: True +changes: + - rscadd: "Adds persistent trophy cases. They are not on any map yet." From c3f2e0830480c15245d55b3c402a38329188bbbb Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 5 May 2017 09:39:20 -0500 Subject: [PATCH 129/131] Automatic changelog generation for PR #708 [ci skip] --- html/changelogs/AutoChangeLog-pr-708.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-708.yml diff --git a/html/changelogs/AutoChangeLog-pr-708.yml b/html/changelogs/AutoChangeLog-pr-708.yml new file mode 100644 index 0000000000..6cb7c07312 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-708.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - bugfix: "Squishy plants will now affect walls and other turfs they get squished on" From 5d82e4e729fe4ed9c42efca757547748fe55a54a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 5 May 2017 09:39:55 -0500 Subject: [PATCH 130/131] Automatic changelog generation for PR #714 [ci skip] --- html/changelogs/AutoChangeLog-pr-714.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-714.yml diff --git a/html/changelogs/AutoChangeLog-pr-714.yml b/html/changelogs/AutoChangeLog-pr-714.yml new file mode 100644 index 0000000000..d5e4582f40 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-714.yml @@ -0,0 +1,4 @@ +author: "XDTM" +delete-after: True +changes: + - tweak: "Blood Cult's talisman of Horrors now works at range. It will still give no warning to the victim." From f902c11f3be28daa0ee88f31dd6948d7214266fe Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 5 May 2017 09:40:09 -0500 Subject: [PATCH 131/131] Automatic changelog generation for PR #717 [ci skip] --- html/changelogs/AutoChangeLog-pr-717.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-717.yml diff --git a/html/changelogs/AutoChangeLog-pr-717.yml b/html/changelogs/AutoChangeLog-pr-717.yml new file mode 100644 index 0000000000..fbb98e0039 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-717.yml @@ -0,0 +1,5 @@ +author: "coiax" +delete-after: True +changes: + - rscadd: "When talking on the alien hivemind, a person will be identified by +their real name, rather than who they are disguised as."