From a3fcb03a7a783d97addeae38274a6ab7532ead7a Mon Sep 17 00:00:00 2001
From: Toastical <20125180+Toastical@users.noreply.github.com>
Date: Sat, 30 Aug 2025 22:48:36 +0300
Subject: [PATCH] fix tamed slimes being repeatedly tameable (#30332)
* fix tamed slimes being repeatedly tameable
* move if check
---
code/modules/mob/living/simple_animal/slime/slime_mob.dm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
index 249dc400e8b..eb76f36d791 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
@@ -410,8 +410,9 @@
visible_message("[user] feeds the slime some plasma. It chirps happily!", "[user] feeds you a few sheets of plasma! Yummy!!!")
S.use(5)
if(Discipline)
- trained = TRUE
- name = "tamed [name]"
+ if(!trained)
+ trained = TRUE
+ name = "tamed [name]"
else
discipline_slime(user, positive_reinforcement = TRUE)
return ITEM_INTERACT_COMPLETE