Merge pull request #4855 from VOREStation/pol-robointentfix

Fix for borgs accidentally getting into useless grab/disarm intents
This commit is contained in:
Anewbe
2018-02-17 08:38:57 -06:00
committed by GitHub
2 changed files with 1 additions and 2 deletions

View File

@@ -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

View File

@@ -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