From 4cf040a11aceb35d96807d3026fc9957b640e770 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 30 Aug 2020 06:25:00 -0700 Subject: [PATCH 1/2] 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("[user] gently taps [target] with [src].",null,null,COMBAT_MESSAGE_RANGE) + log_combat(user, src, "slept", I) var/mob/living/carbon/H = target H.Dizzy(10) H.adjustStaminaLoss(30) From 6028c66cebd8e7772cd902e3ebf33c370400d436 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 30 Aug 2020 08:26:29 -0700 Subject: [PATCH 2/2] Fixed the combat log issue --- code/game/objects/items/melee/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 1b26d29e1d..52ff0f740e 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -236,7 +236,7 @@ if(iscarbon(target)) if(HAS_TRAIT(user, TRAIT_PACIFISM)) visible_message("[user] gently taps [target] with [src].",null,null,COMBAT_MESSAGE_RANGE) - log_combat(user, src, "slept", I) + log_combat(user, target, "slept", src) var/mob/living/carbon/H = target H.Dizzy(10) H.adjustStaminaLoss(30)