Merge remote-tracking branch 'origin/master' into Garlic

2020-04-02 20:41:58 +03:00
parent 9db779ddc6 bff77480d1
commit 2cf7a1f6ba
287 changed files with 1607 additions and 1975 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)