From d440cfbdeb35f8eead1e67a38ed49bd4c1d3a3d8 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 13 Oct 2023 09:25:21 -0400 Subject: [PATCH] reduced to ashes (#22814) --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 028d010746b..7034c00db48 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -616,7 +616,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven /mob/living/carbon/hit_by_thrown_carbon(mob/living/carbon/human/C, datum/thrownthing/throwingdatum, damage, mob_hurt, self_hurt) for(var/obj/item/dualsaber/D in contents) - if(HAS_TRAIT(src, TRAIT_WIELDED) && D.force) + if(HAS_TRAIT(D, TRAIT_WIELDED) && D.force) visible_message("[src] impales [C] with [D], before dropping them on the ground!") C.apply_damage(100, BRUTE, "chest", sharp = TRUE, used_weapon = "Impaled on [D].") C.Stun(2 SECONDS) //Punishment. This could also be used by a traitor to throw someone into a dsword to kill them, but hey, teamwork!