From 1ff72d21b4592fc86fe5ef94efea9608bcaf987f Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 18 Nov 2021 21:48:23 +0100 Subject: [PATCH] Pacifists can no longer attach c4 to other living creatures. (#62903) --- code/game/objects/items/grenades/plastic.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index f4aab6682fc..6eb1f3c4a82 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -84,6 +84,9 @@ aim_dir = get_dir(user,bomb_target) if(!flag) return + if(bomb_target != user && HAS_TRAIT(user, TRAIT_PACIFISM) && isliving(bomb_target)) + to_chat(user, span_warning("You don't want to harm other living beings!")) + return to_chat(user, span_notice("You start planting [src]. The timer is set to [det_time]..."))