Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -78,22 +78,23 @@
 			if("where" in query_tree)
 				var/objs_temp = objs
 				objs = list()
-				for(var/datum/d in objs_temp)
+				for(var/d in objs_temp)
 					if(SDQL_expression(d, query_tree["where"]))
 						objs += d
 
 			switch(query_tree[1])
 				if("call")
-					for(var/datum/d in objs)
+					for(var/d in objs)
 						SDQL_var(d, query_tree["call"][1], source = d)
 
 				if("delete")
-					for(var/datum/d in objs)
+					for(var/d in objs)
 						qdel(d)
 
 				if("select")
 					var/text = ""
-					for(var/datum/t in objs)
+					for(var/o in objs)
+						var/datum/t = o
 						text += "<A HREF='?_src_=vars;Vars=[t.UID()]'>\ref[t]</A>"
 						if(istype(t, /atom))
 							var/atom/a = t
@@ -115,7 +116,7 @@
 				if("update")
 					if("set" in query_tree)
 						var/list/set_list = query_tree["set"]
-						for(var/datum/d in objs)
+						for(var/d in objs)
 							for(var/list/sets in set_list)
 								var/datum/temp = d
 								var/i = 0
@@ -252,6 +253,12 @@
 			if(istype(d, type))
 				out += d
 
+	else if(ispath(type, /client))
+		for(var/client/C)
+			if((location != world) && !(C.mob in location))
+				continue
+			out += C
+
 	else if(location == world)
 		for(var/datum/d)
 			if(istype(d, type))

code/modules/admin/verbs/one_click_antag.dm

@@ -164,7 +164,6 @@ client/proc/one_click_antag()
 			H = pick(candidates)
 			H.mind.make_Cultist()
 			candidates.Remove(H)
-			temp.grant_runeword(H)
 
 		return 1