Skip to content

Commit

Permalink
Merge pull request tgstation#18037 from phil235/GrabFix1
Browse files Browse the repository at this point in the history
Fixes bug with blob-zombifying a dragged human.
  • Loading branch information
Razharas committed May 30, 2016
2 parents a06e283 + 0abf5ae commit 63849fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion code/game/gamemodes/blob/blobs/blob_mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
H.update_hair()
human_overlays = H.overlays
update_icons()
H.loc = src
H.forceMove(src)
visible_message("<span class='warning'>The corpse of [H.name] suddenly rises!</span>")

/mob/living/simple_animal/hostile/blob/blobspore/death(gibbed)
Expand Down
12 changes: 6 additions & 6 deletions code/modules/mob/mob_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@
Process_Incorpmove(direct)
return 0

if(Process_Grab()) //are we restrained by someone's grip?
return

if(mob.buckled) //if we're buckled to something, tell it we moved.
return mob.buckled.relaymove(mob, direct)

if(mob.remote_control) //we're controlling something, our movement is relayed to it
return mob.remote_control.relaymove(mob, direct)

if(isAI(mob))
return AIMove(n,direct,mob)

if(Process_Grab()) //are we restrained by someone's grip?
return

if(mob.buckled) //if we're buckled to something, tell it we moved.
return mob.buckled.relaymove(mob, direct)

if(!mob.canmove)
return 0

Expand Down

0 comments on commit 63849fa

Please sign in to comment.