Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-04 03:54:52 +01:00
parent 55fa48737e 0c57a78851
commit a726f09201
631 changed files with 38158 additions and 6475 deletions
@@ -156,7 +156,7 @@
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "tanks", name, 420, 200, master_ui, state)
+		ui = new(user, src, ui_key, "tanks", name, 400, 120, master_ui, state)
 		ui.open()

 /obj/item/tank/ui_data(mob/user)