Merge pull request #5081 from Citadel-Station-13/upstream-merge-34744

[MIRROR] shuttles will now throw you if you don't buckle in
This commit is contained in:
LetterJay
2018-01-24 20:48:15 -06:00
committed by GitHub
+2 -2
View File
@@ -248,7 +248,7 @@
var/launch_status = NOLAUNCH
var/list/movement_force = list("KNOCKDOWN" = 3, "THROW" = 0)
var/list/movement_force = list("KNOCKDOWN" = 3, "THROW" = 2)
// A timid shuttle will not register itself with the shuttle subsystem
// All shuttle templates are timid
@@ -745,4 +745,4 @@
mode = SHUTTLE_ENDGAME
/obj/docking_port/mobile/emergency/on_emergency_dock()
return
return