Merge branch 'master' into gatofication2

2024-11-21 22:11:24 +01:00
parent 4518a0b016 2dd9f92643
commit 9d9f805d7b
193 changed files with 4649 additions and 708 deletions
@@ -388,7 +388,7 @@
 	name = "bluespace tray"
 	icon_state = "bluespace_tray"
 	desc = "A tray created using bluespace technology to fit more food on it."
-	max_items = 30 // far more items
+	max_items = 100 //GS13 - we loooove our mountains of food here
 	custom_materials = list(/datum/material/iron = 2000, /datum/material/bluespace = 500)

 /*