From 95ad982fb29761c875bbba8bed6194fb569f6fca Mon Sep 17 00:00:00 2001 From: Casey Date: Wed, 20 Jul 2022 13:24:08 -0400 Subject: [PATCH] Merge pull request #13372 from Screemonster/braaaaiiiins makes brainzsnax obtainable ingame --- code/game/objects/structures/trash_pile_vr.dm | 2 ++ code/modules/economy/vending_machines.dm | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index f1ee401884..f37c53b301 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -208,6 +208,8 @@ prob(2);/obj/item/toy/tennis/cyan, prob(2);/obj/item/toy/tennis/blue, prob(2);/obj/item/toy/tennis/purple, + prob(1);/obj/item/weapon/storage/box/brainzsnax, + prob(1);/obj/item/weapon/storage/box/brainzsnax/red, prob(1);/obj/item/clothing/glasses/sunglasses, prob(1);/obj/item/clothing/glasses/sunglasses/bigshot, prob(1);/obj/item/clothing/glasses/welding, diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index bd79cb1f7b..1984cc8154 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -194,7 +194,8 @@ /obj/item/weapon/reagent_containers/food/snacks/cb10 = 6, /obj/item/weapon/reagent_containers/food/snacks/tuna = 2) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6, - /obj/item/weapon/reagent_containers/food/snacks/unajerky = 12) + /obj/item/weapon/reagent_containers/food/snacks/unajerky = 12, + /obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax = 6) prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1, /obj/item/weapon/reagent_containers/food/snacks/candy/gummy = 2, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5, @@ -1067,7 +1068,8 @@ /obj/item/weapon/reagent_containers/food/snacks/driedfish = 8, /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 8 ) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/unajerky = 1) + contraband = list(/obj/item/weapon/reagent_containers/food/snacks/unajerky = 1, + /obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax/red = 6) prices = list( /obj/item/weapon/reagent_containers/food/snacks/tuna = 5, /obj/item/weapon/reagent_containers/food/snacks/semki = 5,