From e6dcc02ad4a47b94501061e566d03c9efe084930 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 29 Mar 2024 20:59:10 +0100 Subject: [PATCH] copy ai bellieso n first transfer and keep prefs synced (#15886) --- code/modules/mob/living/silicon/ai/ai_remote_control.dm | 6 ++++++ .../mob/living/silicon/robot/robot_remote_control.dm | 2 ++ 2 files changed, 8 insertions(+) diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index 80d02bb08ea..0655ed8123f 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -57,6 +57,12 @@ deployed_shell = target target.deploy_init(src) mind.transfer_to(target) + if(target.first_transfer) + target.first_transfer = FALSE + target.copy_from_prefs_vr() + if(LAZYLEN(target.vore_organs)) + target.vore_selected = target.vore_organs[1] + src.copy_vore_prefs_to_mob(target) teleop = target // So the AI 'hears' messages near its core. target.post_deploy() diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index fba59808b46..344ba448730 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -6,6 +6,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) var/shell = FALSE var/deployed = FALSE var/mob/living/silicon/ai/mainframe = null + var/first_transfer = TRUE // Premade AI shell, for roundstart shells. /mob/living/silicon/robot/ai_shell/Initialize() @@ -89,6 +90,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) if(message) to_chat(src, span("notice", message)) mind.transfer_to(mainframe) + src.copy_vore_prefs_to_mob(mainframe) deployed = FALSE update_icon() mainframe.teleop = null