From 4d8021e6132f38c8dbfd99c34712da117a09ef09 Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Thu, 21 Aug 2025 06:58:22 -0400 Subject: [PATCH] Makes loyalty potions work better on slimes (#18290) * Makes loyalty potions work better on slimes * Define --- .../mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm | 2 +- code/modules/xenobio/items/slimepotions.dm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm index 39c8771295f..ca381fd9231 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm @@ -160,7 +160,7 @@ pacified = FALSE //We are not obedient enough to be considered pacified. if(!client) //Only update if we don't have a client. - if(faction != initial(faction)) //We have had a loyalty potion used on us. + if(faction != FACTION_SLIME) //We have had a loyalty potion used on us. update_allowed_vore_types(TRUE) else if(old_mood == "angry") //We were recently angry, so we're still upset and won't let you eat us no matter what! (Unless we had a docility potion put on us, making us harmless) update_allowed_vore_types(FALSE, harmless) diff --git a/code/modules/xenobio/items/slimepotions.dm b/code/modules/xenobio/items/slimepotions.dm index c4bb8b3e4ab..14da6611614 100644 --- a/code/modules/xenobio/items/slimepotions.dm +++ b/code/modules/xenobio/items/slimepotions.dm @@ -206,8 +206,10 @@ to_chat(user, span_notice("You feed \the [M] the agent. It will now try to murder things that want to murder you instead.")) to_chat(M, span_notice("\The [user] feeds you \the [src], and feel that the others will regard you as an outsider now.")) - M.faction = user.faction AI.remove_target() // So hostile things stop attacking people even if not hostile anymore. + if(istype(M, /mob/living/simple_mob/slime)) + var/mob/living/simple_mob/slime/slime = M + slime.update_mood() //Makes them drop-nomable. playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src)