diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index abee322546..c2b4160276 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1424,6 +1424,11 @@ proc/admin_notice(var/message, var/rights) 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")