Merge branch 'master' into overhaul-event-mob-selection

code/modules/admin/IsBanned.dm

@@ -36,17 +36,6 @@ world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE)
 		// message_admins("<span class='notice'>Failed Login: [key] - Guests not allowed</span>")
 		return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a BYOND account.")
 
-	//check if the IP address is a known Tor node
-	if(config.ToRban && ToRban_isbanned(address))
-		log_adminwarn("Failed Login: [key] [computer_id] [address] - Banned: Tor")
-		message_admins("<span class='adminnotice'>Failed Login: [key] - Banned: Tor</span>")
-		//ban their computer_id and ckey for posterity
-		AddBan(ckey(key), computer_id, "Use of Tor", "Automated Ban", 0, 0)
-		var/mistakemessage = ""
-		if(config.banappeals)
-			mistakemessage = "\nIf you believe this is a mistake, please request help at [config.banappeals]."
-		return list("reason"="using Tor", "desc"="\nReason: The network you are using to connect has been banned.[mistakemessage]")
-
 	//check if the IP address is a known proxy/vpn, and the user is not whitelisted
 	if(check_ipintel && config.ipintel_email && config.ipintel_whitelist && ipintel_is_banned(key, address))
 		log_adminwarn("Failed Login: [key] [computer_id] [address] - Proxy/VPN")

code/modules/admin/NewBan.dm

@@ -103,7 +103,8 @@ GLOBAL_PROTECT(banlist_savefile) // Obvious reasons
 
 	GLOB.banlist_savefile.cd = "/base"
 	if( GLOB.banlist_savefile.dir.Find("[ckey][computerid]") )
-		to_chat(usr, "<span class='danger'>Ban already exists.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Ban already exists.</span>")
 		return 0
 	else
 		GLOB.banlist_savefile.dir.Add("[ckey][computerid]")

code/modules/admin/ToRban.dm

@@ -1,89 +0,0 @@
-//By Carnwennan
-//fetches an external list and processes it into a list of ip addresses.
-//It then stores the processed list into a savefile for later use
-#define TORFILE "data/ToR_ban.bdb"
-#define TOR_UPDATE_INTERVAL 216000	//~6 hours
-
-/proc/ToRban_isbanned(var/ip_address)
-	var/savefile/F = new(TORFILE)
-	if(F)
-		if( ip_address in F.dir )
-			return 1
-	return 0
-
-/proc/ToRban_autoupdate()
-	var/savefile/F = new(TORFILE)
-	if(F)
-		var/last_update
-		F["last_update"] >> last_update
-		if((last_update + TOR_UPDATE_INTERVAL) < world.realtime)	//we haven't updated for a while
-			ToRban_update()
-	return
-
-/proc/ToRban_update()
-	spawn(0)
-		log_world("Downloading updated ToR data...")
-		var/http[] = world.Export("http://exitlist.torproject.org/exit-addresses")
-
-		var/list/rawlist = file2list(http["CONTENT"])
-		if(rawlist.len)
-			fdel(TORFILE)
-			var/savefile/F = new(TORFILE)
-			for( var/line in rawlist )
-				if(!line)	continue
-				if( copytext(line,1,12) == "ExitAddress" )
-					var/cleaned = copytext(line,13,length(line)-19)
-					if(!cleaned)	continue
-					F[cleaned] << 1
-			to_chat(F["last_update"], world.realtime)
-			log_world("ToR data updated!")
-			if(usr)
-				to_chat(usr, "ToRban updated.")
-			return 1
-		log_world("ToR data update aborted: no data.")
-		return 0
-
-/client/proc/ToRban(task in list("update","toggle","show","remove","remove all","find"))
-	set name = "ToRban"
-	set category = "Server"
-	if(!holder)	return
-	switch(task)
-		if("update")
-			ToRban_update()
-		if("toggle")
-			if(config)
-				if(config.ToRban)
-					config.ToRban = 0
-					message_admins("<font color='red'>ToR banning disabled.</font>")
-				else
-					config.ToRban = 1
-					message_admins("<font colot='green'>ToR banning enabled.</font>")
-		if("show")
-			var/savefile/F = new(TORFILE)
-			var/dat
-			if( length(F.dir) )
-				for( var/i=1, i<=length(F.dir), i++ )
-					dat += "<tr><td>#[i]</td><td> [F.dir[i]]</td></tr>"
-				dat = "<table width='100%'>[dat]</table>"
-			else
-				dat = "No addresses in list."
-			src << browse(dat,"window=ToRban_show")
-		if("remove")
-			var/savefile/F = new(TORFILE)
-			var/choice = input(src,"Please select an IP address to remove from the ToR banlist:","Remove ToR ban",null) as null|anything in F.dir
-			if(choice)
-				F.dir.Remove(choice)
-				to_chat(src, "<b>Address removed</b>")
-		if("remove all")
-			to_chat(src, "<b>[TORFILE] was [fdel(TORFILE)?"":"not "]removed.</b>")
-		if("find")
-			var/input = input(src,"Please input an IP address to search for:","Find ToR ban",null) as null|text
-			if(input)
-				if(ToRban_isbanned(input))
-					to_chat(src, "<font color='green'><b>Address is a known ToR address</b></font>")
-				else
-					to_chat(src, "<font color='red'><b>Address is not a known ToR address</b></font>")
-	return
-
-#undef TORFILE
-#undef TOR_UPDATE_INTERVAL

code/modules/admin/admin.dm

@@ -78,6 +78,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 		body += " \[<A href='?_src_=holder;revive=[M.UID()]'>Heal</A>\] "
 
 	body += "<br><br>\[ "
+	body += "<a href='?_src_=holder;open_logging_view=[M.UID()];'>LOGS</a> - "
 	body += "<a href='?_src_=vars;Vars=[M.UID()]'>VV</a> - "
 	body += "[ADMIN_TP(M,"TP")] - "
 	if(M.client)

code/modules/admin/admin_verbs.dm

@@ -37,6 +37,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list(
 	/client/proc/jumptoturf,			/*allows us to jump to a specific turf*/
 	/client/proc/admin_call_shuttle,	/*allows us to call the emergency shuttle*/
 	/client/proc/admin_cancel_shuttle,	/*allows us to cancel the emergency shuttle, sending it back to centcomm*/
+	/client/proc/admin_deny_shuttle,	/*toggles availability of shuttle calling*/
 	/client/proc/check_ai_laws,			/*shows AI and borg laws*/
 	/client/proc/manage_silicon_laws,	/* Allows viewing and editing silicon laws. */
 	/client/proc/admin_memo,			/*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/
@@ -125,7 +126,6 @@ GLOBAL_LIST_INIT(admin_verbs_spawn, list(
 	/client/proc/admin_deserialize
 	))
 GLOBAL_LIST_INIT(admin_verbs_server, list(
-	/client/proc/ToRban,
 	/client/proc/Set_Holiday,
 	/datum/admins/proc/startnow,
 	/datum/admins/proc/restart,

code/modules/admin/sql_notes.dm

@@ -2,7 +2,8 @@
 	if(checkrights && !check_rights(R_ADMIN|R_MOD))
 		return
 	if(!GLOB.dbcon.IsConnected())
-		to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
 		return
 
 	if(!target_ckey)
@@ -19,7 +20,8 @@
 		log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n")
 		return
 	if(!query_find_ckey.NextRow())
-		to_chat(usr, "<span class='redtext'>[target_ckey] has not been seen before, you can only add notes to known players.</span>")
+		if(usr)
+			to_chat(usr, "<span class='redtext'>[target_ckey] has not been seen before, you can only add notes to known players.</span>")
 		return
 
 	var/exp_data = query_find_ckey.item[2]
@@ -52,8 +54,8 @@
 		log_game("SQL ERROR adding new note to table. Error : \[[err]\]\n")
 		return
 	if(logged)
-		log_admin("[key_name(usr)] has added a note to [target_ckey]: [notetext]")
-		message_admins("[key_name_admin(usr)] has added a note to [target_ckey]:<br>[notetext]")
+		log_admin("[usr ? key_name(usr) : adminckey] has added a note to [target_ckey]: [notetext]")
+		message_admins("[usr ? key_name_admin(usr) : adminckey] has added a note to [target_ckey]:<br>[notetext]")
 		show_note(target_ckey)
 
 /proc/remove_note(note_id)
@@ -63,7 +65,8 @@
 	var/notetext
 	var/adminckey
 	if(!GLOB.dbcon.IsConnected())
-		to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
 		return
 	if(!note_id)
 		return
@@ -82,15 +85,16 @@
 		var/err = query_del_note.ErrorMsg()
 		log_game("SQL ERROR removing note from table. Error : \[[err]\]\n")
 		return
-	log_admin("[key_name(usr)] has removed a note made by [adminckey] from [ckey]: [notetext]")
-	message_admins("[key_name_admin(usr)] has removed a note made by [adminckey] from [ckey]:<br>[notetext]")
+	log_admin("[usr ? key_name(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]: [notetext]")
+	message_admins("[usr ? key_name_admin(usr) : "Bot"] has removed a note made by [adminckey] from [ckey]:<br>[notetext]")
 	show_note(ckey)
 
 /proc/edit_note(note_id)
 	if(!check_rights(R_ADMIN|R_MOD))
 		return
 	if(!GLOB.dbcon.IsConnected())
-		to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
+		if(usr)
+			to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
 		return
 	if(!note_id)
 		return
@@ -117,8 +121,8 @@
 			var/err = query_update_note.ErrorMsg()
 			log_game("SQL ERROR editing note. Error : \[[err]\]\n")
 			return
-		log_admin("[key_name(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
-		message_admins("[key_name_admin(usr)] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
+		log_admin("[usr ? key_name(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
+		message_admins("[usr ? key_name_admin(usr) : "Bot"] has edited [target_ckey]'s note made by [adminckey] from \"[old_note]\" to \"[new_note]\"")
 		show_note(target_ckey)
 
 /proc/show_note(target_ckey, index, linkless = 0)

code/modules/admin/topic.dm

@@ -911,6 +911,11 @@
 			//M.client = null
 			qdel(M.client)
 
+	else if(href_list["open_logging_view"])
+		var/mob/M = locateUID(href_list["open_logging_view"])
+		if(ismob(M))
+			usr.client.open_logging_view(list(M), TRUE)
+
 	//Player Notes
 	else if(href_list["addnote"])
 		var/target_ckey = href_list["addnote"]
@@ -2583,14 +2588,16 @@
 			if("monkey")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","M")
-				for(var/mob/living/carbon/human/H in GLOB.mob_list)
+				for(var/thing in GLOB.human_list)
+					var/mob/living/carbon/human/H = thing
 					spawn(0)
 						H.monkeyize()
 				ok = 1
 			if("corgi")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","M")
-				for(var/mob/living/carbon/human/H in GLOB.mob_list)
+				for(var/thing in GLOB.human_list)
+					var/mob/living/carbon/human/H = thing
 					spawn(0)
 						H.corgize()
 				ok = 1
@@ -2661,7 +2668,8 @@
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","PW")
 				message_admins("<span class='notice'>[key_name_admin(usr)] teleported all players to the prison station.</span>", 1)
-				for(var/mob/living/carbon/human/H in GLOB.mob_list)
+				for(var/thing in GLOB.human_list)
+					var/mob/living/carbon/human/H = thing
 					var/turf/loc = find_loc(H)
 					var/security = 0
 					if(!is_station_level(loc.z) || GLOB.prisonwarped.Find(H))
@@ -2994,7 +3002,8 @@
 			if("manifest")
 				var/dat = "<B>Showing Crew Manifest.</B><HR>"
 				dat += "<table cellspacing=5><tr><th>Name</th><th>Position</th></tr>"
-				for(var/mob/living/carbon/human/H in GLOB.mob_list)
+				for(var/thing in GLOB.human_list)
+					var/mob/living/carbon/human/H = thing
 					if(H.ckey)
 						dat += text("<tr><td>[]</td><td>[]</td></tr>", H.name, H.get_assignment())
 				dat += "</table>"
@@ -3004,7 +3013,8 @@
 			if("DNA")
 				var/dat = "<B>Showing DNA from blood.</B><HR>"
 				dat += "<table cellspacing=5><tr><th>Name</th><th>DNA</th><th>Blood Type</th></tr>"
-				for(var/mob/living/carbon/human/H in GLOB.mob_list)
+				for(var/thing in GLOB.human_list)
+					var/mob/living/carbon/human/H = thing
 					if(H.dna && H.ckey)
 						dat += "<tr><td>[H]</td><td>[H.dna.unique_enzymes]</td><td>[H.dna.blood_type]</td></tr>"
 				dat += "</table>"
@@ -3012,7 +3022,8 @@
 			if("fingerprints")
 				var/dat = "<B>Showing Fingerprints.</B><HR>"
 				dat += "<table cellspacing=5><tr><th>Name</th><th>Fingerprints</th></tr>"
-				for(var/mob/living/carbon/human/H in GLOB.mob_list)
+				for(var/thing in GLOB.human_list)
+					var/mob/living/carbon/human/H = thing
 					if(H.ckey)
 						if(H.dna && H.dna.uni_identity)
 							dat += "<tr><td>[H]</td><td>[md5(H.dna.uni_identity)]</td></tr>"

code/modules/admin/verbs/debug.dm

@@ -643,7 +643,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 	for(var/areatype in areas_without_camera)
 		to_chat(world, "* [areatype]")
 
-/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in GLOB.mob_list)
+/client/proc/cmd_admin_dress(mob/living/carbon/human/M in GLOB.human_list)
 	set category = "Event"
 	set name = "Select equipment"
 

code/modules/admin/verbs/logging_view.dm

@@ -2,10 +2,20 @@ GLOBAL_LIST_INIT(open_logging_views, list())
 
 /client/proc/cmd_admin_open_logging_view()
 	set category = "Admin"
-	set name = "Open Logging View"
+	set name = "Logging View"
 	set desc = "Opens the detailed logging viewer"
+	open_logging_view()
 
-	if(!GLOB.open_logging_views[usr.client.ckey])
-		GLOB.open_logging_views[usr.client.ckey] = new /datum/log_viewer()
-	var/datum/log_viewer/LV = GLOB.open_logging_views[usr.client.ckey]
-	LV.show_ui(usr)
+/client/proc/open_logging_view(list/mob/mobs_to_add = null, clear_view = FALSE)
+	var/datum/log_viewer/cur_view = GLOB.open_logging_views[usr.client.ckey]
+	if(!cur_view)
+		cur_view = new /datum/log_viewer()
+		GLOB.open_logging_views[usr.client.ckey] = cur_view
+	else if(clear_view)
+		cur_view.clear_all()
+
+	if(mobs_to_add?.len)
+		cur_view.add_mobs(mobs_to_add)
+
+	cur_view.show_ui(usr)
+	

code/modules/admin/verbs/onlyone.dm

@@ -84,7 +84,7 @@
 		var/obj/item/slot_item_hand = H.get_item_by_slot(slot_r_hand)
 		H.unEquip(slot_item_hand)
 
-		var /obj/item/multisword/pure_evil/multi = new(H)
+		var/obj/item/multisword/pure_evil/multi = new(H)
 		H.equip_to_slot_or_del(multi, slot_r_hand)
 
 		var/obj/item/card/id/W = new(H)

code/modules/admin/verbs/randomverbs.dm

@@ -826,7 +826,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	else
 		SSshuttle.emergency.canRecall = FALSE
 
-	SSshuttle.emergency.request()
+	if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED)
+		SSshuttle.emergency.request(coefficient = 0.5, redAlert = TRUE)
+	else
+		SSshuttle.emergency.request()
 
 	feedback_add_details("admin_verb","CSHUT") //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.")
@@ -874,6 +877,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(SSshuttle)
 		SSshuttle.emergencyNoEscape = !SSshuttle.emergencyNoEscape
 
+	feedback_add_details("admin_verb", "DENYSHUT")
 	log_admin("[key_name(src)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
 	message_admins("[key_name_admin(usr)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
 
@@ -979,7 +983,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/role_string
 	var/obj_count = 0
 	var/obj_string = ""
-	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+	for(var/thing in GLOB.human_list)
+		var/mob/living/carbon/human/H = thing
 		if(!isLivingSSD(H))
 			continue
 		mins_ssd = round((world.time - H.last_logout) / 600)
@@ -1016,7 +1021,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	msg += "AFK Players:<BR><TABLE border='1'>"
 	msg += "<TR><TD><B>Key</B></TD><TD><B>Real Name</B></TD><TD><B>Job</B></TD><TD><B>Mins AFK</B></TD><TD><B>Special Role</B></TD><TD><B>Area</B></TD><TD><B>PPN</B></TD><TD><B>Cryo</B></TD></TR>"
 	var/mins_afk
-	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
+	for(var/thing in GLOB.human_list)
+		var/mob/living/carbon/human/H = thing
 		if(H.client == null || H.stat == DEAD) // No clientless or dead
 			continue
 		mins_afk = round(H.client.inactivity / 600)