From 995571183ff9b201694b56a40a1fc61ab7ac59cf Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 11:04:00 -0400
Subject: [PATCH] Toy dualswords no longer fucking kill the crew when thrown
into, clowns no longer die to toy dsword. (#21620)
---
code/game/objects/items/weapons/twohanded.dm | 2 +-
code/modules/mob/living/carbon/carbon.dm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index cc999dde371..1e75a72ebd9 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -319,7 +319,7 @@
unwield()
return
..()
- if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40))
+ if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40) && force)
to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on [src].")
user.take_organ_damage(20, 25)
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 03333c3028e..465313ff493 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -626,7 +626,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/twohanded/dualsaber/D in contents)
- if(D.wielded)
+ if(D.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!