From e5fc9b1e94126d35bcbfb9f5da7a957ce5aff7f6 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 6 Sep 2017 10:36:23 +0200 Subject: [PATCH] Fixes shuttle name on ramming. --- code/modules/shuttle/on_move.dm | 5 +++-- code/modules/shuttle/shuttle.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 59a0a46ae8e..d65e3eb481f 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -14,7 +14,8 @@ All ShuttleMove procs go here // Called from the new turf before anything has been moved // Only gets called if fromShuttleMove returns true first // returns the new move_mode (based on the old) -/turf/proc/toShuttleMove(turf/oldT, shuttle_dir, move_mode) +/turf/proc/toShuttleMove(turf/oldT, move_mode, obj/docking_port_mobile/shuttle) + var/shuttle_dir = shuttle.dir for(var/i in contents) var/atom/movable/thing = i if(ismob(thing)) @@ -25,7 +26,7 @@ All ShuttleMove procs go here if(M.pulledby) M.pulledby.stop_pulling() M.stop_pulling() - M.visible_message("[src] slams into [M]!") + M.visible_message("[shuttle] slams into [M]!") if(M.key || M.get_ghost(TRUE)) SSblackbox.add_details("shuttle_gib", "[type]") else diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index ce0d2c4d7c8..4cfd19bc4eb 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -570,7 +570,7 @@ move_mode = moving_atom.beforeShuttleMove(newT, rotation, move_mode) //atoms move_mode = oldT.fromShuttleMove(newT, underlying_turf_type, baseturf_cache, move_mode) //turfs - move_mode = newT.toShuttleMove(oldT, dir, move_mode) //turfs + move_mode = newT.toShuttleMove(oldT, move_mode , src) //turfs if(move_mode & MOVE_AREA) areas_to_move[old_area] = TRUE