From 64588484bffdc351917f4bd6f5cb510edadb5ff7 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 10 Feb 2018 22:03:06 -0600 Subject: [PATCH] Mechs can now fall from non-shuttle heights without hurting the occupant (#4776) --- code/modules/multiz/movement.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 7f2cf27668..6372ff4113 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -476,14 +476,12 @@ "You hear something slam into \the [landing].") playsound(loc, "punch", 25, 1, -1) - // Now to hurt everything in the mech (if the fall is planetary, the mech blows up, so we do this first) - for(var/atom/movable/A in src.contents) - A.fall_impact(hit_atom, damage_min, damage_max, silent = TRUE) - // And now the Mech - + // And now to hurt the mech. if(!planetary) take_damage(rand(damage_min, damage_max)) else + for(var/atom/movable/A in src.contents) + A.fall_impact(hit_atom, damage_min, damage_max, silent = TRUE) qdel(src) // And hurt the floor.