Fix merge conflicts

🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.

code/modules/admin/admin.dm

@@ -629,11 +629,7 @@ var/global/nologevent = 0
 	set category = "Server"
 	set desc="Globally Toggles OOC"
 	set name="Toggle OOC"
-	ooc_allowed = !( ooc_allowed )
-	if (ooc_allowed)
-		world << "<B>The OOC channel has been globally enabled!</B>"
-	else
-		world << "<B>The OOC channel has been globally disabled!</B>"
+	toggle_ooc()
 	log_admin("[key_name(usr)] toggled OOC.")
 	message_admins("[key_name_admin(usr)] toggled OOC.", 1)
 	feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/player_notes.dm

@@ -126,7 +126,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	message_admins("\blue [key_name_admin(usr)] has edited [key]'s notes.")
 	log_admin("[key_name(usr)] has edited [key]'s notes.")
 
-	del info
+	del(info)
 
 	//Updating list of keys with notes on them
 	var/savefile/note_list = new("data/player_notes.sav")
@@ -135,7 +135,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	if(!note_keys) note_keys = list()
 	if(!note_keys.Find(key)) note_keys += key
 	note_list << note_keys
-	del note_list
+	del(note_list)
 
 
 /proc/notes_del(var/key, var/index)
@@ -151,7 +151,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	message_admins("\blue [key_name_admin(usr)] deleted one of [key]'s notes.")
 	log_admin("[key_name(usr)] deleted one of [key]'s notes.")
 
-	del info
+	del(info)
 
 /proc/show_player_info_irc(var/key as text)
 	var/dat = "          Info on [key]%0D%0A"

code/modules/admin/verbs/getlogs.dm

@@ -52,7 +52,7 @@
 		return
 
 	message_admins("[key_name_admin(src)] accessed file: [path]")
-	src << run( file(path) )
+	src << ftp( file(path) )
 	src << "Attempting to send file, this may take a fair few minutes if the file is very large."
 	return
 
@@ -72,7 +72,7 @@
 		return
 
 	message_admins("[key_name_admin(src)] accessed file: [path]")
-	src << run( file(path) )
+	src << ftp( file(path) )
 	src << "Attempting to send file, this may take a fair few minutes if the file is very large."
 	return
 
@@ -87,7 +87,7 @@
 
 	var/path = "data/logs/[time2text(world.realtime,"YYYY/MM-Month/DD-Day")].log"
 	if( fexists(path) )
-		src << run( file(path) )
+		src << ftp( file(path) )
 	else
 		src << "<font color='red'>Error: view_txt_log(): File not found/Invalid path([path]).</font>"
 		return
@@ -102,7 +102,7 @@
 
 	var/path = "data/logs/[time2text(world.realtime,"YYYY/MM-Month/DD-Day")] Attack.log"
 	if( fexists(path) )
-		src << run( file(path) )
+		src << ftp( file(path) )
 	else
 		src << "<font color='red'>Error: view_atk_log(): File not found/Invalid path([path]).</font>"
 		return

code/modules/admin/verbs/one_click_antag.dm

@@ -367,7 +367,7 @@ client/proc/one_click_antag()
 					candidates.Remove(theghost)
 
 				if(!theghost)
-					del(new_syndicate_commando)
+					qdel(new_syndicate_commando)
 					break
 
 				new_syndicate_commando.key = theghost.key
@@ -487,7 +487,7 @@ client/proc/one_click_antag()
 					candidates.Remove(theghost)
 
 				if(!theghost)
-					del(new_vox)
+					qdel(new_vox)
 					break
 
 				new_vox.key = theghost.key