From f84f6aafcd8fb1b11f0b4e9fcf28971a80a719fa Mon Sep 17 00:00:00 2001
From: Miauw <gilles.coremans@gmail.com>
Date: Sun, 22 Feb 2015 12:35:10 +0100
Subject: [PATCH] Fixes adminjump being dumb.

---
 code/modules/admin/verbs/adminjump.dm         | 16 ++++++----------
 code/modules/mob/living/carbon/brain/brain.dm | 11 +++++------
 code/modules/mob/living/silicon/pai/pai.dm    |  5 ++---
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 41442e9cdd8..3c3407e8138 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -149,14 +149,10 @@
 		message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]")
 
 /proc/admin_forcemove(var/mob/mover, var/atom/newloc)
-	var/startdensity = mover.density
-	var/startflags = mover.pass_flags
-	var/startdestinationdensity = newloc.density
-	mover.density = 0
-	mover.pass_flags = ALL
-	newloc.density = 0
-	. = mover.Move(newloc)
-	mover.density = startdensity
-	mover.pass_flags = startflags
-	newloc.density = startdestinationdensity
+	mover.loc = newloc
+	mover.on_forcemove(newloc)
+
+/mob/proc/on_forcemove(var/atom/newloc)
+	return
+
 
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 212bfc12fac..3600cdc4de9 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -28,16 +28,15 @@
 
 /mob/living/carbon/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
 	return
-
+
 /mob/living/carbon/brain/blob_act()
 	return
-
-/mob/living/carbon/brain/Move(var/atom/newloc)
+
+/mob/living/carbon/brain/on_forcemove(var/atom/newloc)
 	if(container)
-		container.Move(newloc)
+		container.loc = newloc
 	else //something went very wrong.
-		CRASH("Brainmob without container")
-	. = ..()
+		CRASH("Brainmob without container.")
 	loc = container
 
 /mob/living/carbon/brain/UnarmedAttack(var/atom/A)//Stops runtimes due to attack_animal being the default
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 1f49f780084..8962f12e241 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -179,12 +179,11 @@
 /mob/living/silicon/pai/UnarmedAttack(var/atom/A)//Stops runtimes due to attack_animal being the default
 	return
 
-/mob/living/silicon/pai/Move(var/atom/newloc)
+/mob/living/silicon/pai/on_forcemove(var/atom/newloc)
 	if(card)
-		card.Move(newloc)
+		card.loc = newloc
 	else //something went very wrong.
 		CRASH("pAI without card")
-	. = ..()
 	loc = card
 
 //Addition by Mord_Sith to define AI's network change ability