Fix for buckled mobs being moved when bumped (where both parties are using help intent).

Incidentally this also fixes an oooooold pre-existing issue with a few other mobs like corgis. :3

resolves issue 604

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3945 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-06-29 12:49:00 +00:00
parent 9a7675ce5a
commit 85b67461a5

View File

@@ -667,7 +667,14 @@ note dizziness decrements automatically in the mob's Life() proc.
//Updates canmove, lying and icons. Could perhaps do with a rename but I can't think of anything to describe it.
/mob/proc/update_canmove()
if( stat || weakened || paralysis || resting || sleeping || (changeling && changeling.changeling_fakedeath) )
if(buckled)
anchored = 1
canmove = 0
if( istype(buckled,/obj/structure/stool/bed/chair) )
lying = 0
else
lying = 1
else if( stat || weakened || paralysis || resting || sleeping || (changeling && changeling.changeling_fakedeath) )
lying = 1
canmove = 0
else if( stunned )
@@ -677,13 +684,6 @@ note dizziness decrements automatically in the mob's Life() proc.
lying = 0
canmove = 1
if(buckled)
anchored = 1
if( istype(buckled,/obj/structure/stool/bed/chair) )
lying = 0
else
lying = 1
if(lying)
density = 0
drop_l_hand()