mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Merge pull request #4855 from VOREStation/pol-robointentfix
Fix for borgs accidentally getting into useless grab/disarm intents
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user