Fixes mechs being moved two z-levels instead of one when walking up stairs (#7213)

Fixes #6036
Fixes #7212
Basically the stair's CollidedWith was called twice, once in the parent proc, once in the child. This prevents that.
This commit is contained in:
fernerr
2019-10-20 22:58:27 +02:00
committed by Erki
parent 32e3505bb8
commit 5ed643db3e
2 changed files with 43 additions and 0 deletions

View File

@@ -468,6 +468,8 @@
/obj/mecha/Collide(var/atom/obstacle)
. = ..()
// src.inertia_dir = null
if(istype(obstacle, /obj/structure/stairs))
return
if(istype(obstacle, /obj))
var/obj/O = obstacle
if(istype(O, /obj/effect/portal)) //derpfix