Merge branch 'master' into hijack

2020-02-19 22:25:31 -07:00
parent fb0f12520c 7151f3d2ea
commit 2dd5a0cfb8
1848 changed files with 67548 additions and 23134 deletions
@@ -46,7 +46,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "emergency_shuttle_console", name,
-			400, 400, master_ui, state)
+			400, 350, master_ui, state)
 		ui.open()

 /obj/machinery/computer/emergency_shuttle/ui_data()