Updates to tgstation commit 78e471d

2018-07-05 01:22:27 -04:00
parent ac6fddcfb3
commit 3e18d8208e
107 changed files with 1054 additions and 1013 deletions
@@ -224,7 +224,11 @@
 	if(existing_shuttle)
 		existing_shuttle.jumpToNullSpace()

+	var/list/force_memory = preview_shuttle.movement_force
+	preview_shuttle.movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
 	preview_shuttle.initiate_docking(D)
+	preview_shuttle.movement_force = force_memory
+	
 	. = preview_shuttle

 	// Shuttle state involves a mode and a timer based on world.time, so