Merge branch 'master' into logging-improvements

code/modules/admin/verbs/adminpm.dm

@@ -261,7 +261,7 @@
 /datum/pm_tracker
 	var/current_title = ""
 	var/open = FALSE
-	var/list/pms = list()
+	var/list/datum/pm_convo/pms = list()
 	var/show_archived = FALSE
 	var/window_id = "pms_window"
 

code/modules/admin/verbs/debug.dm

@@ -832,7 +832,7 @@ GLOBAL_PROTECT(AdminProcCaller)
 	set name = "View Runtimes"
 	set desc = "Open the Runtime Viewer"
 
-	if(!check_rights(R_DEBUG))
+	if(!check_rights(R_DEBUG|R_VIEWRUNTIMES))
 		return
 
 	GLOB.error_cache.showTo(usr)

code/modules/admin/verbs/diagnostics.dm

@@ -85,7 +85,7 @@
 	var/output = "<b>Radio Report</b><hr>"
 	for(var/fq in SSradio.frequencies)
 		output += "<b>Freq: [fq]</b><br>"
-		var/list/datum/radio_frequency/fqs = SSradio.frequencies[fq]
+		var/datum/radio_frequency/fqs = SSradio.frequencies[fq]
 		if(!fqs)
 			output += "&nbsp;&nbsp;<b>ERROR</b><br>"
 			continue

code/modules/admin/verbs/gimmick_team.dm

@@ -27,7 +27,7 @@
 		if(!themission)
 			alert("No mission specified. Aborting.")
 			return
-	var/admin_outfits = subtypesof(/datum/outfit/admin)
+	var/admin_outfits = subtypesof(/datum/outfit/admin) + list(/datum/outfit/naked)
 	var/outfit_list = list()
 	for(var/type in admin_outfits)
 		var/datum/outfit/admin/O = type

code/modules/admin/verbs/logging_view.dm

@@ -17,4 +17,4 @@ GLOBAL_LIST_INIT(open_logging_views, list())
 	if(mobs_to_add?.len)
 		cur_view.add_mobs(mobs_to_add)
 
-	cur_view.show_ui(usr)
+	cur_view.show_ui(usr)

code/modules/admin/verbs/modifyvariables.dm

@@ -543,7 +543,7 @@ GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "step_size", "bound_h
 	var/var_value
 
 	if(param_var_name)
-		if(!param_var_name in O.vars)
+		if(!(param_var_name in O.vars))
 			to_chat(src, "A variable with this name ([param_var_name]) doesn't exist in this datum ([O])")
 			return
 		variable = param_var_name

code/modules/admin/verbs/onlyoneteam.dm

@@ -82,7 +82,7 @@
 		else if((H in GLOB.team_bravo) && (A in GLOB.team_bravo))
 			to_chat(A, "<span class='warning'>He's on your team!</span>")
 			return
-		else if(!A in GLOB.team_alpha && !A in GLOB.team_bravo)
+		else if(!(A in GLOB.team_alpha) && !(A in GLOB.team_bravo))
 			to_chat(A, "<span class='warning'>You're not part of the dodgeball game, sorry!</span>")
 			return
 		else

code/modules/admin/verbs/randomverbs.dm

@@ -533,7 +533,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/list/mobs = list()
 	var/list/ghosts = list()
 	var/list/sortmob = sortAtom(GLOB.mob_list)                           // get the mob list.
-	/var/any=0
+	var/any=0
 	for(var/mob/dead/observer/M in sortmob)
 		mobs.Add(M)                                             //filter it where it's only ghosts
 		any = 1                                                 //if no ghosts show up, any will just be 0