diff --git a/code/modules/mob/simple_animal/constructs.dm b/code/modules/mob/simple_animal/constructs.dm index 98d42a83718..2103e01b8f0 100644 --- a/code/modules/mob/simple_animal/constructs.dm +++ b/code/modules/mob/simple_animal/constructs.dm @@ -11,7 +11,8 @@ emote_hear = list("wails","screeches") response_help = "thinks better of touching" response_disarm = "flails at" - response_harm = "punches the" + response_harm = "harmlessly punches the" + harm_intent_damage = 0 melee_damage_lower = 15 melee_damage_upper = 30 attacktext = "smashes their armoured gauntlet into" diff --git a/code/modules/mob/simple_animal/life.dm b/code/modules/mob/simple_animal/life.dm index da91154a279..b98578a7628 100644 --- a/code/modules/mob/simple_animal/life.dm +++ b/code/modules/mob/simple_animal/life.dm @@ -234,6 +234,8 @@ if ("grab") if (M == src) return + if (nopush) + return var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M ) G.assailant = M if (M.hand)