From 7de2e4ed3aeaecfafc8bba41d2c2dfec9f565d42 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 9 Mar 2021 17:32:04 -0500
Subject: [PATCH] Merge pull request #9854 from Verkister/patch-38

Makes drag-drop bodyjacking not break aghost bonds
---
 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 1a9bb0cdc5..e0d5ad19a3 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1426,6 +1426,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("<span class='adminnotice'>[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].</span>")
 	log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].")
 	feedback_add_details("admin_verb","CGD")