Update shuttle_rotate.dm

2017-12-29 18:38:05 -06:00
parent 9ece43116d
commit ac7750202b
1 changed files with 0 additions and 4 deletions
@@ -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)