rej cleanup

code/modules/admin/admin_investigate.dm.rej

@@ -1,62 +0,0 @@
-diff a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm	(rejected hunks)
-@@ -1,50 +1,20 @@
--//By Carnwennan
--
--//This system was made as an alternative to all the in-game lists and variables used to log stuff in-game.
--//lists and variables are great. However, they have several major flaws:
--//Firstly, they use memory. TGstation has one of the highest memory usage of all the ss13 branches.
--//Secondly, they are usually stored in an object. This means that they aren't centralised. It also means that
--//the data is lost when the object is deleted! This is especially annoying for things like the singulo engine!
--#define INVESTIGATE_DIR "data/investigate/"
--
--//SYSTEM
--/proc/investigate_subject2file(subject)
--	return file("[INVESTIGATE_DIR][subject].html")
--
--/proc/investigate_reset()
--	if(fdel(INVESTIGATE_DIR))
--		return 1
--	return 0
--
--/atom/proc/investigate_log(message, subject)
--	if(!message)
--		return
--	var/F = investigate_subject2file(subject)
--	if(!F)
-+atom/proc/investigate_log(message, subject)
-+	if(!message || !subject)
- 		return
-+	var/F = file("[GLOB.log_directory]/[subject].html")
- 	F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
- 
--//ADMINVERBS
- /client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "kudzu") )
- 	set name = "Investigate"
- 	set category = "Admin"
- 	if(!holder)
- 		return
- 	switch(subject)
--		if("singulo", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "botany")			//general one-round-only stuff
--			var/F = investigate_subject2file(subject)
--			if(!F)
--				to_chat(src, "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>")
--				return
--			src << browse(F,"window=investigate[subject];size=800x300")
--		if("hrefs")				//persistent logs and stuff
--			if(GLOB.href_logfile)
--				src << browse(GLOB.href_logfile,"window=investigate[subject];size=800x300")
--			else if(!config.log_hrefs)
--				to_chat(src, "<span class='danger'>Href logging is off and no logfile was found.</span>")
--				return
--			else
--				to_chat(src, "<span class='danger'>No href logfile was found.</span>")
--				return
- 		if("notes, memos, watchlist")
- 			browse_messages()
-+		else
-+			var/F = file("[GLOB.log_directory]/[subject].html")
-+			if(!fexists(F))
-+				to_chat(src, "<span class='danger'>No [subject] logfile was found.</span>")
-+				return
-+			src << browse(F,"window=investigate[subject];size=800x300")
-\ No newline at end of file

code/modules/admin/admin_verbs.dm.rej

@@ -1,20 +0,0 @@
-diff a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm	(rejected hunks)
-@@ -4,18 +4,12 @@ GLOBAL_PROTECT(admin_verbs_default)
- 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*/
- 	/client/proc/deadmin,				/*destroys our own admin datum so we can play as a regular player*/
- 	/client/proc/cmd_admin_say,			/*admin-only ooc chat*/
- 	/client/proc/hide_verbs,			/*hides all our adminverbs*/
- 	/client/proc/hide_most_verbs,		/*hides all our hideable adminverbs*/
- 	/client/proc/debug_variables,		/*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/
--	/client/proc/deadchat,				/*toggles deadchat on/off*/
- 	/client/proc/dsay,					/*talk in deadchat using our ckey/fakekey*/
--	/client/proc/toggleprayers,			/*toggles prayers on/off*/
--	/client/verb/toggleprayersounds,	/*Toggles prayer sounds (HALLELUJAH!)*/
--	/client/proc/toggle_hear_radio,		/*toggles whether we hear the radio*/
- 	/client/proc/investigate_show,		/*various admintools for investigation. Such as a singulo grief-log*/
- 	/client/proc/secrets,
- 	/client/proc/reload_admins,