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

2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
@@ -964,7 +964,7 @@
 	illustration = "fruit"
 	var/theme_name

-/obj/item/storage/box/ingredients/Initialize()
+/obj/item/storage/box/ingredients/Initialize(mapload)
 	. = ..()
 	if(theme_name)
 		name = "[name] ([theme_name])"
@@ -1287,7 +1287,7 @@
 	var/expiration_date_min = 2300
 	var/expiration_date_max = 2700

-/obj/item/storage/box/mre/Initialize()
+/obj/item/storage/box/mre/Initialize(mapload)
 	. = ..()
 	if(can_expire)
 		expiration_date = rand(expiration_date_min, expiration_date_max)