From ffb5c96eda4607db74899808440277b8d75cbd98 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 3 May 2020 12:59:24 -0400 Subject: [PATCH 1/2] General fix for spawning KO'd mobs --- code/modules/ai/ai_holder.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm index dfd7bd87b0a..d4686e1537e 100644 --- a/code/modules/ai/ai_holder.dm +++ b/code/modules/ai/ai_holder.dm @@ -44,7 +44,8 @@ STANCE_REPOSITION, STANCE_MOVE, STANCE_FOLLOW, - STANCE_FLEE + STANCE_FLEE, + STANCE_DISABLED ) var/list/static/noprocess_stances = list( STANCE_SLEEP From dac560cdf459a9d727075c170c3f26e843327809 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 3 May 2020 13:00:30 -0400 Subject: [PATCH 2/2] Fixy fix slems --- code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm | 2 ++ code/modules/ai/aI_holder_subtypes/slime_xenobio_ai_vr.dm | 3 --- vorestation.dme | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 code/modules/ai/aI_holder_subtypes/slime_xenobio_ai_vr.dm diff --git a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm b/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm index 743e2b405c5..c2598f4a75a 100644 --- a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm +++ b/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm @@ -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) diff --git a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai_vr.dm b/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai_vr.dm deleted file mode 100644 index c4bb314359c..00000000000 --- a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai_vr.dm +++ /dev/null @@ -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 \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 5c3cfcf5b55..dddd261ddf0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1627,10 +1627,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"