From ac7750202b6200c27f955791d4d1b5ded46cd666 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 29 Dec 2017 18:38:05 -0600 Subject: [PATCH] Update shuttle_rotate.dm --- code/modules/shuttle/shuttle_rotate.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm index bd86f84356..28cb089597 100644 --- a/code/modules/shuttle/shuttle_rotate.dm +++ b/code/modules/shuttle/shuttle_rotate.dm @@ -104,9 +104,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate //prevents shuttles attempting to rotate this since it messes up sprites /obj/machinery/gravity_generator/shuttleRotate(rotation, params) params = NONE -<<<<<<< HEAD - return ..() -======= return ..() /obj/machinery/door/airlock/shuttleRotate(rotation, params) @@ -114,4 +111,3 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate if(cyclelinkeddir) cyclelinkeddir = angle2dir(rotation+dir2angle(cyclelinkeddir)) cyclelinkairlock() ->>>>>>> 6da0107... Makes cyclelinkeddir rotate with shuttle (#33734)