Merge pull request #7967 from Verkister/patch-66

Makes drag-drop bodyjacking not break aghost bonds
This commit is contained in:
Atermonera
2021-03-17 23:15:01 -09:00
committed by GitHub

View File

@@ -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("<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")