Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876

2017-05-05 10:26:02 -05:00
parent f7d45f3010 1bb43eb7ae
commit acf8cb1597
45 changed files with 474 additions and 228 deletions
@@ -28,7 +28,7 @@
 		//Holopad
 		if(istype(ai.current, /obj/machinery/holopad))
 			var/obj/machinery/holopad/H = ai.current
-			H.move_hologram(ai)
+			H.move_hologram(ai, T)

 /mob/camera/aiEye/Move()
 	return 0