Merge branch 'master' into BadWording

code/modules/antagonists/cult/runes.dm

@@ -250,14 +250,18 @@ structure_check() searches for nearby cultist structures required for the invoca
 	currentconversionman = convertee
 	conversiontimeout = world.time + (10 SECONDS)
 	convertee.Stun(100)
+	convertee.add_trait(TRAIT_MUTE, "conversionrune")
 	conversionresult = FALSE
 	while(world.time < conversiontimeout && convertee && !conversionresult)
 		stoplag(1)
 	currentconversionman = null
-	if(convertee && get_turf(convertee) != get_turf(src))
+	if(!convertee)
 		return FALSE
-	if(!conversionresult && convertee)
-		do_sacrifice(convertee, invokers)
+	convertee.remove_trait(TRAIT_MUTE, "conversionrune")
+	if(get_turf(convertee) != get_turf(src))
+		return FALSE
+	if(!conversionresult)
+		do_sacrifice(convertee, invokers, TRUE)
 		return FALSE
 	var/brutedamage = convertee.getBruteLoss()
 	var/burndamage = convertee.getFireLoss()
@@ -279,7 +283,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 		H.cultslurring = 0
 	return 1
 
-/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers)
+/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers, force_a_sac)
 	var/mob/living/first_invoker = invokers[1]
 	if(!first_invoker)
 		return FALSE
@@ -289,7 +293,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 
 
 	var/big_sac = FALSE
-	if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
+	if(!force_a_sac && (((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
 		for(var/M in invokers)
 			to_chat(M, "<span class='cult italic'>[sacrificial] is too greatly linked to the world! You need three acolytes!</span>")
 		log_game("Offer rune failed - not enough acolytes and target is living or sac target")

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

@@ -1653,13 +1653,19 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 	var/obj/item/bodypart/BP = null
 	if(isbodypart(def_zone))
-		BP = def_zone
+		if(damagetype == STAMINA && istype(def_zone, /obj/item/bodypart/head))
+			BP = H.get_bodypart(check_zone(BODY_ZONE_CHEST))
+		else
+			BP = def_zone
 	else
 		if(!def_zone)
 			def_zone = ran_zone(def_zone)
+		if(damagetype == STAMINA && def_zone == BODY_ZONE_HEAD)
+			def_zone = BODY_ZONE_CHEST
 		BP = H.get_bodypart(check_zone(def_zone))
-		if(!BP)
-			BP = H.bodyparts[1]
+
+	if(!BP)
+		BP = H.bodyparts[1]
 
 	switch(damagetype)
 		if(BRUTE)

code/modules/power/singularity/emitter.dm

@@ -66,7 +66,7 @@
 
 	sparks = new
 	sparks.attach(src)
-	sparks.set_up(5, TRUE, src)
+	sparks.set_up(1, TRUE, src)
 
 /obj/machinery/power/emitter/ComponentInitialize()
 	. = ..()

code/modules/research/xenobiology/crossbreeding/chilling.dm

@@ -7,11 +7,12 @@ Chilling extracts:
 	name = "chilling extract"
 	desc = "It's cold to the touch, as if frozen solid."
 	effect = "chilling"
+	container_type = INJECTABLE | DRAWABLE
 	icon_state = "chilling"
 
 /obj/item/slimecross/chilling/Initialize()
 	. = ..()
-	create_reagents(10, INJECTABLE | DRAWABLE)
+	create_reagents(10)
 
 /obj/item/slimecross/chilling/attack_self(mob/user)
 	if(!reagents.has_reagent("plasma",10))

code/modules/surgery/advanced/revival.dm

@@ -27,7 +27,7 @@
 
 /datum/surgery_step/revive
 	name = "electric stimulation"
-	implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/melee/baton = 75, /obj/item/gun/energy = 60)
+	implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/abductor/gizmo = 100, /obj/item/melee/baton = 75, /obj/item/organ/cyberimp/arm/baton = 75, /obj/item/organ/cyberimp/arm/gun/taser = 60, /obj/item/gun/energy/e_gun/advtaser = 60, /obj/item/gun/energy/taser = 60)
 	time = 120
 
 /datum/surgery_step/revive/tool_check(mob/user, obj/item/tool)