mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 19:44:58 +01:00
Fixes adminjump being dumb.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user