From 31ab947bfe9155c077cc9fe1688872955b12d6e8 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 11 Nov 2021 17:33:13 -0500 Subject: [PATCH 1/2] Vore mobs can eat you while unconcious --- code/modules/ai/ai_holder_targeting.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/ai/ai_holder_targeting.dm b/code/modules/ai/ai_holder_targeting.dm index 371419c128..6e512dc88e 100644 --- a/code/modules/ai/ai_holder_targeting.dm +++ b/code/modules/ai/ai_holder_targeting.dm @@ -4,7 +4,11 @@ var/hostile = FALSE // Do we try to hurt others? var/retaliate = FALSE // Attacks whatever struck it first. Mobs will still attack back if this is false but hostile is true. var/mauling = FALSE // Attacks unconscious mobs +<<<<<<< HEAD var/unconscious_vore = TRUE //VOREStation Add - allows a mob to go for unconcious targets IF their vore prefs align +======= + var/unconscious_vore = FALSE //VOREStation Add - allows a mob to go for unconcious targets IF their vore prefs align +>>>>>>> 213da73af0... Merge pull request #11816 from Very-Soft/sleepyvore var/handle_corpse = FALSE // Allows AI to acknowledge corpses (e.g. nurse spiders) var/atom/movable/target = null // The thing (mob or object) we're trying to kill. From 3faebaf8f6b5f3479f2241d728ea953df422ef58 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Fri, 10 Dec 2021 00:50:18 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/ai/ai_holder_targeting.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/ai/ai_holder_targeting.dm b/code/modules/ai/ai_holder_targeting.dm index 6e512dc88e..bec114ff34 100644 --- a/code/modules/ai/ai_holder_targeting.dm +++ b/code/modules/ai/ai_holder_targeting.dm @@ -4,11 +4,7 @@ var/hostile = FALSE // Do we try to hurt others? var/retaliate = FALSE // Attacks whatever struck it first. Mobs will still attack back if this is false but hostile is true. var/mauling = FALSE // Attacks unconscious mobs -<<<<<<< HEAD - var/unconscious_vore = TRUE //VOREStation Add - allows a mob to go for unconcious targets IF their vore prefs align -======= var/unconscious_vore = FALSE //VOREStation Add - allows a mob to go for unconcious targets IF their vore prefs align ->>>>>>> 213da73af0... Merge pull request #11816 from Very-Soft/sleepyvore var/handle_corpse = FALSE // Allows AI to acknowledge corpses (e.g. nurse spiders) var/atom/movable/target = null // The thing (mob or object) we're trying to kill.