From f4d0902f5ff183e1fd80874c91bce892731cc5c6 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Tue, 18 Oct 2022 06:57:11 +0000 Subject: [PATCH] You cannot plant c4 on observers (#70595) Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> --- code/game/objects/items/grenades/plastic.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index cb961b9a2b2..69604c85f32 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -85,6 +85,8 @@ /obj/item/grenade/c4/afterattack(atom/movable/bomb_target, mob/user, flag) . = ..() aim_dir = get_dir(user, bomb_target) + if(isdead(bomb_target)) + return if(!flag) return if(bomb_target != user && HAS_TRAIT(user, TRAIT_PACIFISM) && isliving(bomb_target))