Merge pull request #7607 from VOREStation/aro-slemfix

Fix Xenobio Slimes
This commit is contained in:
Novacat
2020-05-03 13:11:43 -04:00
committed by GitHub
4 changed files with 7 additions and 8 deletions
@@ -142,6 +142,7 @@
hostile = FALSE
retaliate = FALSE
cooperative = FALSE
holder.a_intent = I_HELP
// The holder's attack changes based on intent. This lets the AI choose what effect is desired.
/datum/ai_holder/simple_mob/xenobio_slime/pre_melee_attack(atom/A)
@@ -178,6 +179,7 @@
if(!(H in grudges)) // Unless they're an ass.
return FALSE
if(discipline && !rabid)
holder.a_intent = I_HELP
return FALSE // We're a good slime.
/datum/ai_holder/simple_mob/xenobio_slime/react_to_attack(atom/movable/attacker)
@@ -1,3 +0,0 @@
/datum/ai_holder/simple_mob/xenobio_slime/post_melee_attack(atom/A)
var/mob/living/simple_mob/slime/xenobio/my_slime = holder
my_slime.a_intent = I_HELP // Return back to help after attacking
+2 -1
View File
@@ -44,7 +44,8 @@
STANCE_REPOSITION,
STANCE_MOVE,
STANCE_FOLLOW,
STANCE_FLEE
STANCE_FLEE,
STANCE_DISABLED
)
var/list/static/noprocess_stances = list(
STANCE_SLEEP
+3 -4
View File
@@ -1628,10 +1628,9 @@
#include "code\modules\ai\ai_holder_targeting_vr.dm"
#include "code\modules\ai\interfaces.dm"
#include "code\modules\ai\say_list.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai_vr.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
#include "code\modules\alarm\alarm.dm"
#include "code\modules\alarm\alarm_handler.dm"
#include "code\modules\alarm\atmosphere_alarm.dm"