Adds docking support to shuttles, NanoUI

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
This commit is contained in:
mwerezak
2014-06-14 04:10:39 -04:00
committed by ZomgPonies
parent 629c14a66c
commit e9171a9ae3
16 changed files with 682 additions and 359 deletions
+1 -1
View File
@@ -2052,7 +2052,7 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShA")
var/shuttle_tag = input("Which shuttle do you want to call?") as null|anything in shuttles.locations
var/shuttle_tag = input("Which shuttle do you want to call?") as null|anything in shuttles.location
if(shuttle_tag && !shuttles.moving[shuttle_tag])
shuttles.jump_shuttle(shuttle_tag)