Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners

code/modules/antagonists/eldritch_cult/eldritch_items.dm

@@ -260,7 +260,7 @@
 	if((IS_HERETIC(local_user) || IS_HERETIC_MONSTER(local_user)) && HAS_TRAIT(src,TRAIT_NODROP))
 		REMOVE_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT)
 
-	for(var/mob/living/carbon/human/human_in_range in spiral_range(9,local_user))
+	for(var/mob/living/carbon/human/human_in_range in viewers(9,local_user))
 		if(IS_HERETIC(human_in_range) || IS_HERETIC_MONSTER(human_in_range))
 			continue
 

code/modules/antagonists/slaughter/slaughter.dm

@@ -129,13 +129,12 @@
 /mob/living/simple_animal/slaughter/proc/release_victims()
 	if(!consumed_mobs)
 		return
-
+	var/turf/T = get_turf(src)
+	if(!T)
+		T = find_safe_turf()
 	for(var/mob/living/M in consumed_mobs)
 		if(!M)
 			continue
-		var/turf/T = find_safe_turf()
-		if(!T)
-			T = get_turf(src)
 		M.forceMove(T)
 
 /mob/living/simple_animal/slaughter/proc/refresh_consumed_buff()
@@ -263,12 +262,12 @@
 	if(!consumed_mobs)
 		return
 
+	var/turf/T = get_turf(src)
+	if(!T)
+		T = find_safe_turf()
 	for(var/mob/living/M in consumed_mobs)
 		if(!M)
-			continue
-		var/turf/T = find_safe_turf()
-		if(!T)
-			T = get_turf(src)
+			continue	
 		M.forceMove(T)
 		if(M.revive(full_heal = TRUE, admin_revive = TRUE))
 			M.grab_ghost(force = TRUE)

code/modules/antagonists/traitor/classes/traitor_class.dm

@@ -45,5 +45,5 @@ GLOBAL_LIST_EMPTY(traitor_classes)
 /datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T)
 	// Any effects that need to be cleaned up if traitor class is being swapped.
 
-/datum/traitor_class/proc/on_process(/datum/antagonist/traitor/T)
+/datum/traitor_class/proc/on_process(datum/antagonist/traitor/T)
 	// only for processing traitor classes; runs once an SSprocessing tick