Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00
parent 991fb8335c fca3f200b3
commit 06bfa8770e
131 changed files with 1020 additions and 743 deletions
@@ -39,7 +39,7 @@
 	narsie_spawn_animation()

 	sleep(70)
-	SSshuttle.emergency.request(null, 0.1) // Cannot recall
+	SSshuttle.emergency.request(null, set_coefficient = 0.1) // Cannot recall


 /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)