Merge remote-tracking branch 'upstream/dev-freeze' into dev

2026-07-19 11:02:31 +01:00 · 2015-09-27 13:48:33 +02:00
parent d1e2257218 07f03ca978
commit 63de1764c3
9 changed files with 25 additions and 22 deletions
@@ -411,7 +411,7 @@ var/list/admin_verbs_mentor = list(
 		var/mob/dead/observer/ghost = body.ghostize(1)
 		ghost.admin_ghosted = 1
 		if(body)
-			body.aghosted = ghost
+			body.teleop = ghost
 			if(!body.key)
 				body.key = "@[key]"	//Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
 		feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!