From eb9fa0d8f5fe7af1b3bb7aff2a14e42bc45f5d91 Mon Sep 17 00:00:00 2001
From: Mickyan <38563876+Mickyan@users.noreply.github.com>
Date: Wed, 13 Jun 2018 09:22:26 +0200
Subject: [PATCH] Add pacifism check for screwdriver/bottle attacks (#38416)

---
 code/game/objects/items/tools/screwdriver.dm         | 3 +++
 code/modules/food_and_drinks/drinks/drinks/bottle.dm | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index 123ffaa76c3..658a95b016d 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -75,6 +75,9 @@
 		return ..()
 	if(user.zone_selected != BODY_ZONE_PRECISE_EYES && user.zone_selected != BODY_ZONE_HEAD)
 		return ..()
+	if(user.has_trait(TRAIT_PACIFISM))
+		to_chat(user, "<span class='warning'>You don't want to harm [M]!</span>")
+		return
 	if(user.has_trait(TRAIT_CLUMSY) && prob(50))
 		M = user
 	return eyestab(M,user)
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 7153587c79e..f35bd6f9379 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -51,6 +51,9 @@
 	if(user.a_intent != INTENT_HARM || !isGlass)
 		return ..()
 
+	if(user.has_trait(TRAIT_PACIFISM))
+		to_chat(user, "<span class='warning'>You don't want to harm [target]!</span>")
+		return
 
 	force = 15 //Smashing bottles over someoen's head hurts.