Revert "Merge pull request #3965 from jack-fractal/dev"

This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>

code/modules/admin/admin.dm

@@ -108,7 +108,6 @@ var/global/floorIsLava = 0
 				body += "<B>Is an AI</B> "
 			else if(ishuman(M))
 				body += {"<A href='?src=\ref[src];makeai=\ref[M]'>Make AI</A> |
-					<A href='?src=\ref[src];makemask=\ref[M]'>Make Mask</A> |
 					<A href='?src=\ref[src];makerobot=\ref[M]'>Make Robot</A> |
 					<A href='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> |
 					<A href='?src=\ref[src];makeslime=\ref[M]'>Make slime</A>

code/modules/admin/admin_investigate.dm

@@ -22,29 +22,25 @@
 	F << "<small>[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
 
 //ADMINVERBS
-/client/proc/investigate_show( subject in list("hrefs","notes","singulo","cult") )
+/client/proc/investigate_show( subject in list("hrefs","notes","singulo") )
 	set name = "Investigate"
 	set category = "Admin"
 	if(!holder)	return
-	
-	var/list/basic_subjects = list("singulo","cult")
-	
-	if(subject in basic_subjects)
-		var/F = investigate_subject2file(subject)
-		if(!F)
-			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")
-		return 
-	
-	
-	if(subject=="hrefs")				//persistant logs and stuff
-		if(config && config.log_hrefs)
-			if(href_logfile)
-				src << browse(href_logfile,"window=investigate[subject];size=800x300")
-			else
-				src << "<font color='red'>Error: admin_investigate: No href logfile found.</font>"
+	switch(subject)
+		if("singulo")			//general one-round-only stuff
+			var/F = investigate_subject2file(subject)
+			if(!F)
+				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")				//persistant logs and stuff
+			if(config && config.log_hrefs)
+				if(href_logfile)
+					src << browse(href_logfile,"window=investigate[subject];size=800x300")
+				else
+					src << "<font color='red'>Error: admin_investigate: No href logfile found.</font>"
+					return
+			else
+				src << "<font color='red'>Error: admin_investigate: Href Logging is not on.</font>"
 				return
-		else
-			src << "<font color='red'>Error: admin_investigate: Href Logging is not on.</font>"
-			return

code/modules/admin/topic.dm

@@ -1192,15 +1192,6 @@
 		message_admins("\red Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1)
 		log_admin("[key_name(usr)] AIized [key_name(H)]")
 		H.AIize()
-		
-		
-	else if(href_list["makemask"])
-		if(!check_rights(R_SPAWN))	return
-		var/mob/currentMob = locate(href_list["makemask"])
-		message_admins("\red Admin [key_name_admin(usr)] made [key_name_admin(currentMob)] into a Mask of Nar'Sie!", 1)
-		log_admin("[key_name(usr)] made [key_name(currentMob)] into a Mask of Nar'Sie!")
-		currentMob.make_into_mask(0,0)
-		
 
 	else if(href_list["makealien"])
 		if(!check_rights(R_SPAWN))	return

code/modules/admin/verbs/mapping.dm

@@ -58,7 +58,7 @@ var/intercom_range_display_status = 0
 		del(C)
 
 	if(camera_range_display_status)
-		for(var/obj/machinery/camera/C in cameraNetwork.viewpoints)
+		for(var/obj/machinery/camera/C in cameranet.cameras)
 			new/obj/effect/debugging/camera_range(C.loc)
 	feedback_add_details("admin_verb","mCRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -74,7 +74,7 @@ var/intercom_range_display_status = 0
 
 	var/list/obj/machinery/camera/CL = list()
 
-	for(var/obj/machinery/camera/C in cameraNetwork.viewpoints)
+	for(var/obj/machinery/camera/C in cameranet.cameras)
 		CL += C
 
 	var/output = {"<B>CAMERA ANNOMALITIES REPORT</B><HR>