Merge branch 'master' into upstream-merge-33621

2017-12-30 13:23:39 -06:00
parent 35574263b1 eda5869b4f
commit dae3c3efb5
798 changed files with 12704 additions and 27419 deletions
@@ -105,3 +105,9 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
 /obj/machinery/gravity_generator/shuttleRotate(rotation, params)
 	params = NONE
 	return ..()
+
+/obj/machinery/door/airlock/shuttleRotate(rotation, params)
+	. = ..()
+	if(cyclelinkeddir)
+		cyclelinkeddir = angle2dir(rotation+dir2angle(cyclelinkeddir))
+		cyclelinkairlock()