From da5ef366f1415d30ffca7f2d8d0708f57b56e567 Mon Sep 17 00:00:00 2001 From: Adrer Date: Sat, 30 Apr 2022 16:40:47 +0200 Subject: [PATCH] Thrown stunbaton can no longer stun silicons (#17703) * Add silicon check to stunbaton throw impact * Corrected parameter Co-authored-by: adrermail@gmail.com --- code/game/objects/items/weapons/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index e6b211bc47c..549236c936f 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -82,7 +82,7 @@ /obj/item/melee/baton/throw_impact(atom/hit_atom) ..() - if(prob(throw_hit_chance) && turned_on && isliving(hit_atom)) + if(prob(throw_hit_chance) && turned_on && isliving(hit_atom) && !issilicon(hit_atom)) baton_stun(hit_atom) /**