Merge branch 'master' into Dynamic2

code/game/gamemodes/clown_ops/clown_weapons.dm

@@ -145,9 +145,9 @@
 			C.throw_mode_on() //so they can catch it on the return.
 	return ..()
 
-/obj/item/shield/energy/bananium/throw_impact(atom/hit_atom)
+/obj/item/shield/energy/bananium/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	if(active)
-		var/caught = hit_atom.hitby(src, 0, 0)
+		var/caught = hit_atom.hitby(src, FALSE, FALSE, throwingdatum=throwingdatum)
 		if(iscarbon(hit_atom) && !caught)//if they are a carbon and they didn't catch it
 			GET_COMPONENT(slipper, /datum/component/slippery)
 			slipper.Slip(hit_atom)

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -17,6 +17,7 @@
 	var/list/living_antags = list()
 	var/list/dead_players = list()
 	var/list/list_observers = list()
+	var/list/ghost_eligible = list()
 
 /datum/dynamic_ruleset/midround/from_ghosts
 	weight = 0
@@ -32,10 +33,10 @@
 	// So for example you can get the list of all current dead players with var/list/dead_players = candidates[CURRENT_DEAD_PLAYERS]
 	// Make sure to properly typecheck the mobs in those lists, as the dead_players list could contain ghosts, or dead players still in their bodies.
 	// We're still gonna trim the obvious (mobs without clients, jobbanned players, etc)
-    living_players = trim_list(mode.current_players[CURRENT_LIVING_PLAYERS])
-    living_antags = trim_list(mode.current_players[CURRENT_LIVING_ANTAGS])
-    dead_players = trim_list(mode.current_players[CURRENT_DEAD_PLAYERS])
-    list_observers = trim_list(mode.current_players[CURRENT_OBSERVERS])
+	living_players = trim_list(mode.current_players[CURRENT_LIVING_PLAYERS])
+	living_antags = trim_list(mode.current_players[CURRENT_LIVING_ANTAGS])
+	list_observers = trim_list(mode.current_players[CURRENT_OBSERVERS])
+	ghost_eligible = trim_list(get_all_ghost_role_eligible())
 
 /datum/dynamic_ruleset/midround/proc/trim_list(list/L = list())
 	var/list/trimmed_list = L.Copy()
@@ -65,6 +66,25 @@
 				continue
 	return trimmed_list
 
+/datum/dynamic_ruleset/midround/from_ghosts/trim_list(list/L = list())
+	var/list/trimmed_list = L.Copy()
+	for(var/mob/M in trimmed_list)
+		if (!M.client) // Are they connected?
+			trimmed_list.Remove(M)
+			continue
+		if(!mode.check_age(M.client, minimum_required_age))
+			trimmed_list.Remove(M)
+			continue
+		if(antag_flag_override)
+			if(!(antag_flag_override in M.client.prefs.be_special) || jobban_isbanned(M.ckey, antag_flag_override))
+				trimmed_list.Remove(M)
+				continue
+		else
+			if(!(antag_flag in M.client.prefs.be_special) || jobban_isbanned(M.ckey, antag_flag))
+				trimmed_list.Remove(M)
+				continue
+	return trimmed_list
+
 // You can then for example prompt dead players in execute() to join as strike teams or whatever
 // Or autotator someone
 
@@ -85,15 +105,16 @@
 			return FALSE
 	return TRUE
 
-/datum/dynamic_ruleset/midround/from_ghosts/execute()
-	var/list/possible_candidates = list()
-	possible_candidates.Add(dead_players)
-	possible_candidates.Add(list_observers)
-	send_applications(possible_candidates)
-	if(assigned.len > 0)
-		return TRUE
-	else
+/datum/dynamic_ruleset/midround/from_ghosts/ready(forced = FALSE)
+	if (required_candidates > ghost_eligible.len)
+		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
 		return FALSE
+	return ..()
+
+
+/datum/dynamic_ruleset/midround/from_ghosts/execute()
+	var/application_successful = send_applications(ghost_eligible)
+	return assigned.len > 0 && application_successful
 
 /// This sends a poll to ghosts if they want to be a ghost spawn from a ruleset.
 /datum/dynamic_ruleset/midround/from_ghosts/proc/send_applications(list/possible_volunteers = list())
@@ -599,4 +620,4 @@
 
 
 #undef ABDUCTOR_MAX_TEAMS
-#undef REVENANT_SPAWN_THRESHOLD
+#undef REVENANT_SPAWN_THRESHOLD

code/game/gamemodes/meteor/meteors.dm

@@ -167,7 +167,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 /obj/effect/meteor/examine(mob/user)
 	if(!(flags_1 & ADMIN_SPAWNED_1) && isliving(user))
 		SSmedals.UnlockMedal(MEDAL_METEOR, user.client)
-	..()
+	return ..()
 
 /obj/effect/meteor/attackby(obj/item/I, mob/user, params)
 	if(I.tool_behaviour == TOOL_MINING)

code/game/gamemodes/objective.dm

@@ -416,9 +416,17 @@ GLOBAL_LIST_EMPTY(possible_items)
 			for(var/datum/mind/M in owners)
 				if(M.current.mind.assigned_role in possible_item.excludefromjob)
 					continue check_items
-			approved_targets += possible_item
+			if(extraSanityCheck(possible_item.targetitem))
+				approved_targets += possible_item
 	return set_target(safepick(approved_targets))
 
+/datum/objective/steal/proc/extraSanityCheck(objectiveitem)
+	if(objectiveitem == /obj/item/aicard) //Is the item an AI card? (Steal a functional AI)
+		var/list/ais = active_ais() //Check if we have active AIs.
+		if(!ais.len)
+			return FALSE //No AIs, returns false, disallowing the AI card objective from being added to the approved target list
+	return TRUE //All checks successful, add this item to the approved target list
+
 /datum/objective/steal/proc/set_target(datum/objective_item/item)
 	if(item)
 		targetinfo = item
@@ -875,6 +883,3 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 /datum/objective/changeling_team_objective/impersonate_department/impersonate_heads
 	explanation_text = "Have X or more heads of staff escape on the shuttle disguised as heads, while the real heads are dead"
 	command_staff_only = TRUE
-
-
-