Merge pull request #4481 from Citadel-Station-13/upstream-merge-33706

[MIRROR] Fixes some mecha code.
2017-12-21 04:58:33 -06:00
parent 74232f6373 464e33ca2b
commit e4d2234537
1 changed files with 2 additions and 2 deletions
@@ -571,9 +571,9 @@
 		if(bumpsmash && occupant) //Need a pilot to push the PUNCH button.
 			if(nextsmash < world.time)
 				obstacle.mech_melee_attack(src)
-				if(!obstacle || !obstacle.density)
-					step(src,dir)
 				nextsmash = world.time + smashcooldown
+				if(!obstacle || obstacle.CanPass(src,get_step(src,dir)))
+					step(src,dir)
 		if(isobj(obstacle))
 			var/obj/O = obstacle
 			if(!O.anchored)