From 4a2f01c93db9501f3c40fdbfa53a1e2ea7e42346 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 2 Feb 2023 17:13:43 +0100 Subject: [PATCH] [MIRROR] [no gbp] Dehydrated Carp will follow orders correctly [MDB IGNORE] (#19081) * [no gbp] Dehydrated Carp will follow orders correctly (#73079) ## About The Pull Request Fixes #72914 The order of operations here were wrong, such that it was calling a proc which sent signals to inform a component about a new "master" before actually adding the component. I switched the proc calls around so that now it adds the component before telling the component that there is someone to listen to. ## Why It's Good For The Game Item you spent a valuable single telecrystal on did not work as advertised, now does. ## Changelog :cl: fix: Rehydrated Carp should now properly recognise who is the boss and follow their instructions. /:cl: * [no gbp] Dehydrated Carp will follow orders correctly --------- Co-authored-by: Jacquerel --- code/modules/mob/living/basic/space_fauna/carp/carp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp.dm b/code/modules/mob/living/basic/space_fauna/carp/carp.dm index 24d75d0e23f..f506d77f7de 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/carp.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/carp.dm @@ -98,8 +98,8 @@ AddComponent(/datum/component/regenerator, outline_colour = regenerate_colour) if (tamer) + on_tamed(tamer, feedback = FALSE) befriend(tamer) - on_tamed(tamer, FALSE) else AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/meat), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, PROC_REF(on_tamed)))