Merge pull request #3141 from CHOMPStationBot/upstream-merge-11705

[MIRROR] Brainfood

code/game/objects/items/trash.dm

@@ -249,6 +249,12 @@
 	drop_sound = 'sound/items/drop/soda.ogg'
 	pickup_sound = 'sound/items/pickup/soda.ogg'
 
+/obj/item/trash/tomato
+	name = "empty tomato soup can"
+	icon_state = "tomato"
+	drop_sound = 'sound/items/drop/soda.ogg'
+	pickup_sound = 'sound/items/pickup/soda.ogg'
+
 /obj/item/trash/spinach
 	name = "empty spinach can"
 	icon_state = "spinach"
@@ -410,3 +416,14 @@
 	name = "burrito packaging"
 	icon_state = "smolburrito"
 
+/obj/item/trash/brainzsnax
+	name = "\improper BrainzSnax can"
+	icon_state = "brainzsnax"
+	drop_sound = 'sound/items/drop/soda.ogg'
+	pickup_sound = 'sound/items/pickup/soda.ogg'
+
+/obj/item/trash/brainzsnaxred
+	name = "\improper BrainzSnax RED can"
+	icon_state = "brainzsnaxred"
+	drop_sound = 'sound/items/drop/soda.ogg'
+	pickup_sound = 'sound/items/pickup/soda.ogg'

code/game/objects/items/weapons/storage/boxes_vr.dm

@@ -25,3 +25,14 @@
 
 /obj/item/weapon/storage/secure/briefcase/trashmoney
 	starts_with = list(/obj/item/weapon/spacecash/c200 = 10)
+
+/obj/item/weapon/storage/box/brainzsnax
+	name = "\improper BrainzSnax box"
+	icon_state = "brainzsnax_box"
+	desc = "A box designed to hold canned food. This one has BrainzSnax branding printed on it."
+	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/canned)
+	max_storage_space = ITEMSIZE_COST_NORMAL * 6
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax = 6)
+
+/obj/item/weapon/storage/box/brainzsnax/red
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax/red = 6)