Merge remote-tracking branch 'upstream/master' into rain

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -259,11 +259,13 @@
 		if(is_centcom_level(player.z))
 			living_players -= player // We don't autotator people in CentCom
 			continue
-		if(is_away_level(player.z))
-			living_players -= player //We also don't autotator people in exiled roles / VR
-			continue
 		if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
 			living_players -= player // We don't autotator people with roles already
+			continue
+		if(ishuman(player))
+			var/mob/living/carbon/human/H = player
+			if(HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS))
+				living_players -= player //We also don't fucking give ghost roles traitor. Yes I'm using the exempt health events trait given to ghost roles to do this, because piggyback ftw.
 
 /datum/dynamic_ruleset/midround/autotraitor/ready(forced = FALSE)
 	if (required_candidates > living_players.len)

code/game/gamemodes/objective.dm

@@ -894,7 +894,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 /datum/objective/hoard/proc/set_target(obj/item/I)
 	if(I)
 		hoarded_item = I
-		explanation_text = "Keep [I] on your person at all times."
+		explanation_text = "Steal and keep [I] heirloom on your person at all times."
 		return hoarded_item
 	else
 		explanation_text = "Free objective"