From dec6941fea1ec8423fa3ae7385d975cfa838186f Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 16 Feb 2018 22:42:20 -0600 Subject: [PATCH] Fix for borgs accidentally getting into useless grab/disarm intents --- code/modules/mob/living/simple_animal/simple_animal.dm | 1 - code/modules/mob/mob_helpers.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d59bbc6d868..173c2c83872 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -566,7 +566,6 @@ //Projectiles with bonus SA damage if(!Proj.nodamage) - var/true_damage = Proj.damage if(!Proj.SA_vulnerability || Proj.SA_vulnerability == intelligence_level) Proj.damage += Proj.SA_bonus_damage diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 4b625e15f1a..a7b965d74f7 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -328,7 +328,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) set name = "a-intent" set hidden = 1 - if(isliving(src)) + if(isliving(src) && !isrobot(src)) switch(input) if(I_HELP,I_DISARM,I_GRAB,I_HURT) a_intent = input