cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for borgs accidentally getting into useless grab/disarm intents

Browse Source
This commit is contained in:
Arokha Sieyes
2018-02-16 22:42:20 -06:00
parent ae974977f1
commit dec6941fea
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -566,7 +566,6 @@
//Projectiles with bonus SA damage //Projectiles with bonus SA damage
if(!Proj.nodamage) if(!Proj.nodamage)
var/true_damage = Proj.damage
if(!Proj.SA_vulnerability || Proj.SA_vulnerability == intelligence_level) if(!Proj.SA_vulnerability || Proj.SA_vulnerability == intelligence_level)
Proj.damage += Proj.SA_bonus_damage Proj.damage += Proj.SA_bonus_damage

2
code/modules/mob/mob_helpers.dm
View File

@@ -328,7 +328,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
set name = "a-intent" set name = "a-intent"
set hidden = 1 set hidden = 1
if(isliving(src)) if(isliving(src) && !isrobot(src))
switch(input) switch(input)
if(I_HELP,I_DISARM,I_GRAB,I_HURT) if(I_HELP,I_DISARM,I_GRAB,I_HURT)
a_intent = input a_intent = input