Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic

2020-03-31 19:42:35 +03:00
parent 75c4e8b19a 01b30b4ebb
commit a903752ff9
605 changed files with 4990 additions and 5304 deletions
@@ -8,6 +8,8 @@
 	var/obj/screen/craft/C = new()
 	C.icon = H.ui_style
 	H.static_inventory += C
+	if(!CL.prefs.widescreenpref)
+		C.screen_loc = ui_boxcraft
 	CL.screen += C
 	RegisterSignal(C, COMSIG_CLICK, .proc/component_ui_interact)