Stamina damtype weaponry fixes.

2019-07-09 08:33:43 +02:00
parent d61732472c
commit 3546ed9799
2 changed files with 7 additions and 2 deletions
@@ -48,7 +48,12 @@

 /obj/hitby(atom/movable/AM)
 	..()
-	take_damage(AM.throwforce, BRUTE, "melee", 1, get_dir(src, AM))
+	var/throwdamage = AM.throwforce
+	if(isobj(AM))
+		var/obj/O = AM
+		if(O.damtype == STAMINA)
+			throwdamage = 0
+	take_damage(throwdamage, BRUTE, "melee", 1, get_dir(src, AM))

 /obj/ex_act(severity, target)
 	if(resistance_flags & INDESTRUCTIBLE)