Merge pull request #11340 from Baystation12/master

Dev-freeze.

code/modules/mob/living/carbon/human/unarmed_attack.dm

@@ -32,6 +32,9 @@
 
 /datum/unarmed_attack/proc/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
 
+	if(target.stat == DEAD)
+		return
+
 	var/stun_chance = rand(0, 100)
 
 	if(attack_damage >= 5 && armour < 2 && !(target == user) && stun_chance <= attack_damage * 5) // 25% standard chance
@@ -233,4 +236,4 @@
 
 	switch(attack_damage)
 		if(1 to 4)	user.visible_message("<span class='danger'>[pick("[user] stomped on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!</span>")
-		if(5)		user.visible_message("<span class='danger'>[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!</span>") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/
+		if(5)		user.visible_message("<span class='danger'>[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!</span>") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -25,7 +25,10 @@
 		if(standard_feed_mob(user, M))
 			return
 
-	afterattack(var/obj/target, var/mob/user, var/flag)
+	afterattack(var/obj/target, var/mob/user, var/proximity)
+		if(!proximity)
+			return
+	
 		if(standard_dispenser_refill(user, target))
 			return
 		if(standard_pour_into(user, target))

code/modules/spells/general/rune_write.dm

@@ -21,6 +21,10 @@
 		runerandom()
 	var/list/runes = list("Teleport", "Teleport Other", "Spawn a Tome", "Change Construct Type", "Convert", "EMP", "Drain Blood", "See Invisible", "Resurrect", "Hide Runes", "Reveal Runes", "Astral Journey", "Manifest a Ghost", "Imbue Talisman", "Sacrifice", "Wall", "Free Cultist", "Summon Cultist", "Deafen", "Blind", "BloodBoil", "Communicate", "Stun")
 	var/r = input(user, "Choose a rune to scribe", "Rune Scribing") in runes //not cancellable.
+	if(locate(/obj/effect/rune) in user.loc)
+		user << "<span class='warning'>There is already a rune in this location.</span>"
+		return
+
 	var/obj/effect/rune/R = new /obj/effect/rune(user.loc)
 	if(istype(user.loc,/turf))
 		var/area/A = get_area(user)