From 283343a465e2db740e6f6b86c02ba8e705732dc7 Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 5 Mar 2021 18:15:45 +0200 Subject: [PATCH] Makes drag-drop bodyjacking not break aghost bonds Possessing mobs by drag-dropping your admin ghost into the mob now transfers your original body's spirit link into the possessed mob and thus prevents your original body from getting knocked out when your ghost disappears into the new body. --- code/modules/admin/admin.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 49c14a35502..92fb6f8088e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1424,6 +1424,11 @@ var/datum/announcement/minor/admin_min_announcer = new return 1 if(tomob.client) //No need to ghostize if there is no client tomob.ghostize(0) + if(frommob.mind && frommob.mind.current) //Preserve teleop for original body when adminghosting. + var/mob/body = frommob.mind.current + if(body) + if(body.teleop) + body.teleop = tomob message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].") log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].") feedback_add_details("admin_verb","CGD")