Makes cyclelinkeddir rotate with shuttle

This commit is contained in:
Emmett Gaines
2017-12-25 20:15:54 -05:00
committed by CitadelStationBot
parent 6205268f7e
commit 9ece43116d
+11 -1
View File
@@ -104,4 +104,14 @@ 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 ..()
<<<<<<< HEAD
return ..()
=======
return ..()
/obj/machinery/door/airlock/shuttleRotate(rotation, params)
. = ..()
if(cyclelinkeddir)
cyclelinkeddir = angle2dir(rotation+dir2angle(cyclelinkeddir))
cyclelinkairlock()
>>>>>>> 6da0107... Makes cyclelinkeddir rotate with shuttle (#33734)