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"