From 47b72055cde3a7213e2b2b0bf0a8695783da539c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 5 Oct 2017 05:19:49 -0500 Subject: [PATCH] Update shuttle.dm --- code/modules/shuttle/shuttle.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 88daa3a016..22368c92fb 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -625,8 +625,6 @@ internal_area.afterShuttleMove() //areas CHECK_TICK -<<<<<<< HEAD -======= // Parallax handling var/new_parallax_dir = FALSE if(istype(new_dock, /obj/docking_port/stationary/transit)) @@ -635,8 +633,6 @@ var/area/place = i place.parallax_movedir = new_parallax_dir CHECK_TICK - ->>>>>>> e16fd1b... Makes shuttle movement a bit smoother and faster (#31255) check_poddoors() new_dock.last_dock_time = world.time setDir(new_dock.dir)