Merge remote-tracking branch 'origin/master' into perlin-genny

code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_shield.dm

@@ -8,7 +8,7 @@
 	desc = "A resilient shield made out of brass.. It feels warm to the touch."
 	var/clockwork_desc = "A powerful shield of ratvarian making. It absorbs blocked attacks to charge devastating bashes."
 	armor = list("melee" = 80, "bullet" = 70, "laser" = -10, "energy" = -20, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	shield_flags = SHIELD_FLAGS_DEFAULT
+	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_KINETIC_STRONG | SHIELD_ENERGY_WEAK
 	max_integrity = 300 //High integrity, extremely strong against melee / bullets, but still quite easy to destroy with lasers and energy
 	repair_material = /obj/item/stack/tile/brass
 	var/dam_absorbed = 0

code/modules/antagonists/eldritch_cult/eldritch_items.dm

@@ -69,7 +69,7 @@
 /datum/action/innate/heretic_shatter/Activate()
 	if(do_after(holder,10, target = holder))
 		var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
-		do_teleport(holder,safe_turf,forceMove = TRUE)
+		do_teleport(holder,safe_turf,forceMove = TRUE,channel=TELEPORT_CHANNEL_MAGIC)
 		to_chat(holder,"<span class='warning'>You feel a gust of energy flow through your body... the Rusted Hills heard your call...</span>")
 		qdel(sword)
 

code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm

@@ -178,7 +178,7 @@
 /datum/eldritch_knowledge/summon/stalker
 	name = "Lonely Ritual"
 	gain_text = "I was able to combine my greed and desires to summon an eldritch beast I had never seen before. An ever shapeshifting mass of flesh, it knew well my goals."
-	desc = "You can now summon a Stalker by transmutating a pair of eyes, a candle, a pen and a piece of paper. Stalkers can shapeshift into harmless animals to get close to the victim."
+	desc = "You can now summon a Stalker by transmutating a kitchen knife, a candle, a pen and a piece of paper. Stalkers can shapeshift into harmless animals to get close to the victim."
 	cost = 1
 	required_atoms = list(/obj/item/kitchen/knife,/obj/item/candle,/obj/item/pen,/obj/item/paper)
 	mob_to_summon = /mob/living/simple_animal/hostile/eldritch/stalker

code/modules/antagonists/slaughter/slaughterevent.dm

@@ -7,7 +7,21 @@
 	earliest_start = 1 HOURS
 	min_players = 20
 
-
+/datum/round_event_control/slaughter/canSpawnEvent()
+	weight = initial(src.weight)
+	var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+	var/list/allowed_z_cache = list()
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+		allowed_z_cache[num2text(z)] = TRUE
+	for(var/obj/effect/decal/cleanable/C in world)
+		if(!C.loc || QDELETED(C))
+			continue
+		if(!C.can_bloodcrawl_in())
+			continue
+		if(!SSpersistence.IsValidDebrisLocation(C.loc, allowed_turf_typecache, allowed_z_cache, C.type, FALSE))
+			continue
+		weight += 0.05
+	return ..()
 
 /datum/round_event/ghost_role/slaughter
 	minimum_required = 1