Merge branch 'master' into cool-ipcs

2020-10-01 21:06:16 +01:00
parent 14e217082f 79b7ef0e62
commit 7726b0456c
522 changed files with 181605 additions and 92979 deletions
@@ -131,7 +131,7 @@
 	. = ..()
 	if(. & EMP_PROTECT_SELF)
 		return
-	damage += 40/severity
+	damage += 0.15 * severity

 /obj/item/organ/ears/ipc
 	name = "auditory sensors"
@@ -158,3 +158,4 @@
 			owner.Jitter(15)
 			owner.Dizzy(15)
 			owner.DefaultCombatKnockdown(40)
+	damage += 0.15 * severity