Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734

[MIRROR] Makes cyclelinkeddir rotate with shuttle
2017-12-30 05:06:32 -06:00
parent 0402595242 ac7750202b
commit 68b44e73f4
1 changed files with 7 additions and 1 deletions
@@ -104,4 +104,10 @@ 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
-	return ..()
+	return ..()
+
+/obj/machinery/door/airlock/shuttleRotate(rotation, params)
+	. = ..()
+	if(cyclelinkeddir)
+		cyclelinkeddir = angle2dir(rotation+dir2angle(cyclelinkeddir))
+		cyclelinkairlock()