From 4cf040a11aceb35d96807d3026fc9957b640e770 Mon Sep 17 00:00:00 2001
From: Putnam <putnam3145@gmail.com>
Date: Sun, 30 Aug 2020 06:25:00 -0700
Subject: [PATCH] Makes plastitanium rapier not silently poison for pacifists.

---
 code/game/objects/items/melee/misc.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 01d2924a90..1b26d29e1d 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -234,6 +234,9 @@
 /obj/item/melee/rapier/attack(mob/living/target, mob/living/user)
 	. = ..()
 	if(iscarbon(target))
+		if(HAS_TRAIT(user, TRAIT_PACIFISM))
+			visible_message("<span class='warning'>[user] gently taps [target] with [src].</span>",null,null,COMBAT_MESSAGE_RANGE)
+		log_combat(user, src, "slept", I)
 		var/mob/living/carbon/H = target
 		H.Dizzy(10)
 		H.adjustStaminaLoss(30)