Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix

Makes plastitanium rapier not silently poison for pacifists.
2020-08-31 21:19:09 -07:00
parent e652591639 6028c66ceb
commit 1670b6f2a6
1 changed files with 3 additions and 0 deletions
@@ -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, target, "slept", src)
 		var/mob/living/carbon/H = target
 		H.Dizzy(10)
 		H.adjustStaminaLoss(30)