From c2c69d359f1255e1869d9a9b69bc8633cee9dd38 Mon Sep 17 00:00:00 2001
From: AnturK <AnturK@users.noreply.github.com>
Date: Wed, 6 Sep 2017 10:44:38 +0200
Subject: [PATCH] Fixes shuttle name on ramming.

---
 code/modules/shuttle/on_move.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 59a0a46ae8..e80b690737 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -14,7 +14,12 @@ 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)
+<<<<<<< HEAD
 /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
+>>>>>>> 9ac60a8... Typo
 	for(var/i in contents)
 		var/atom/movable/thing = i
 		if(ismob(thing))