From 3546ed97994b8fb568f02396ba08b26eeb100184 Mon Sep 17 00:00:00 2001
From: Ghommie <Ghombeat@Gmail.com>
Date: Tue, 9 Jul 2019 08:33:43 +0200
Subject: [PATCH] Stamina damtype weaponry fixes.

---
 code/_onclick/item_attack.dm     | 2 +-
 code/game/objects/obj_defense.dm | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 2a14d232aa..3896c3eac3 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -64,7 +64,7 @@
 		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
 		return // CIT CHANGE - ditto
 
-	if(force && HAS_TRAIT(user, TRAIT_PACIFISM))
+	if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return
 
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 2db2cd08d8..70a05a8d40 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -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)