Merge branch 'master' into species-refactor

code/datums/components/killerqueen.dm

@@ -65,10 +65,14 @@
 	detonate(user)
 
 /datum/component/killerqueen/proc/bump_detonate(datum/source, atom/A)
+	var/atom/us = parent
+	if(!us.density)		// lazy anti-item-throw-OHKO, we need something better at some point
+		return
 	detonate(A)
 
 /datum/component/killerqueen/proc/touch_detonate(datum/source, mob/user)
 	detonate(user)
+	return COMPONENT_NO_ATTACK_HAND
 
 /datum/component/killerqueen/proc/on_examine(datum/source, mob/examiner, list/examine_return)
 	if(examine_message)

code/datums/diseases/advance/symptoms/shivering.dm

@@ -32,7 +32,7 @@ Bonus
 		"Stage Speed 10" = "Further increases cooling speed."
 	)
 
-/datum/symptom/fever/Start(datum/disease/advance/A)
+/datum/symptom/shivering/Start(datum/disease/advance/A)
 	if(!..())
 		return
 	if(A.properties["stage_rate"] >= 5) //dangerous cold
@@ -58,4 +58,4 @@ Bonus
 	if(unsafe)
 		limit = 0
 	M.adjust_bodytemperature(-get_cold * A.stage, limit)
-	return 1
+	return 1

code/datums/status_effects/debuffs.dm

@@ -128,6 +128,9 @@
 		duration = set_duration
 	. = ..()
 
+/datum/status_effect/no_combat_mode/robotic_emp
+	id = "emp_no_combat_mode"
+
 /datum/status_effect/mesmerize
 	id = "Mesmerize"
 	alert_type = /obj/screen/alert/status_effect/mesmerized

code/datums/wires/_wires.dm

@@ -204,12 +204,12 @@
 		return S
 
 /// Called from [/atom/proc/emp_act]
-/datum/wires/proc/emp_pulse()
+/datum/wires/proc/emp_pulse(severity)
 	var/list/possible_wires = shuffle(wires)
 	var/remaining_pulses = MAXIMUM_EMP_WIRES
 
 	for(var/wire in possible_wires)
-		if(prob(33))
+		if(prob(10 + severity/3.5))
 			pulse(wire)
 			remaining_pulses--
 			if(!remaining_pulses)