diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index 50d3eb238752..090c5d2e899d 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -561,6 +561,7 @@ - Cake - Pie - Bread + - Pistachios - type: cargoBounty id: BountyVegetable diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 1a6f83809610..a46a16737c80 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -77,3 +77,43 @@ cost: 2400 category: cargoproduct-category-name-food group: market + +- type: cargoProduct + id: FoodCookGetmore + icon: + sprite: Objects/Consumable/Food/snacks.rsi + state: raisins + product: CrateFoodGetMore + cost: 750 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: FoodHappyHonkMeals + icon: + sprite: Objects/Consumable/Food/burger.rsi + state: bigbite + product: CrateFoodHappyHonkBigBite + cost: 1000 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: FoodIceCream + icon: + sprite: Objects/Consumable/Food/frozen.rsi + state: sandwich + product: CrateFoodIceCream + cost: 1200 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: FoodSnowcone + icon: + sprite: Objects/Consumable/Food/frozen.rsi + state: cone + product: CrateFoodSnowcone + cost: 1100 + category: cargoproduct-category-name-food + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 5e1834316fe7..23d1b2f79544 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -166,3 +166,84 @@ - id: DrinkFourteenLokoCan amount: 4 +- type: entity + id: CrateFoodGetMore + parent: CratePlastic + name: Getmore Bakemore crate + description: Getmore branded snacks and baking supplies for the creative chef, all without the need of emptying your station's Getmore machines! + components: + - type: StorageFill + contents: + - id: FoodSnackRaisins + amount: 4 + - id: FoodSnackChocolate + amount: 6 + - id: FoodSnackPistachios + amount: 4 + - id: ReagentContainerFlour + amount: 3 + - id: ReagentContainerSugar + amount: 2 + - id: FoodCondimentPacketSalt + amount: 3 + - id: DrinkMilkCarton + amount: 2 + - id: FoodContainerEgg + amount: 2 + - id: FoodBoxCloth + amount: 1 + +- type: entity + id: CrateFoodIceCream + parent: CrateFreezer + name: ice cream delivery + description: An assortment of ice cream delights for any occasion! Includes 16 frozen treats. + components: + - type: StorageFill + contents: + - id: FoodFrozenSandwich + amount: 3 + - id: FoodFrozenSandwichStrawberry + amount: 2 + - id: FoodFrozenPopsicleOrange + amount: 2 + - id: FoodFrozenPopsicleBerry + amount: 2 + - id: FoodFrozenPopsicleJumbo + amount: 3 + - id: FoodFrozenCornuto + amount: 2 + - id: FoodFrozenSundae + amount: 2 + +- type: entity + id: CrateFoodSnowcone + parent: CrateFreezer + name: snowcone delivery + description: A freezer packed with refreshing snowcones for a hard working crew, or even a lazy one! Includes 16 snowcones. + components: + - type: StorageFill + contents: + - id: FoodFrozenSnowconeBase + amount: 3 + - id: FoodFrozenSnowconeBerry + amount: 3 + - id: FoodFrozenSnowconeFruit + amount: 3 + - id: FoodFrozenSnowconeRainbow + amount: 3 + - id: FoodFrozenSnowconeClown + amount: 2 + - id: FoodFrozenSnowconeMime + amount: 2 + +- type: entity + id: CrateFoodHappyHonkBigBite + parent: CratePlastic + name: Happy Honk meal delivery + description: Two fully loaded Happy Honk Big Bite burger meals, complete with cheesy fries, a bottle of Space Cola, a slice of apple pie and a toy! + components: + - type: StorageFill + contents: + - id: FoodMealHappyHonkBigBite + amount: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index fe690d8bd1d5..25e07a31c51a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -767,6 +767,81 @@ prob: 0.1 orGroup: GiftPool +- type: entity + id: FoodMealHappyHonkBigBite + parent: HappyHonk + name: Happy Honk Big Bite Meal + description: Someone paid good money to get this fast food meal shipped out this way. It smells fresh, somehow. + components: + - type: StorageFill + contents: + - id: FoodBurgerBig + amount: 1 + - id: FoodMealFriesCheesy + amount: 1 + - id: DrinkColaBottleFull + amount: 1 + - id: FoodPieAppleSlice + amount: 1 + - id: ToyMouse + orGroup: GiftPool + - id: ToyAi + orGroup: GiftPool + - id: ToyNuke + orGroup: GiftPool + - id: ToyFigurinePassenger + orGroup: GiftPool + - id: ToyGriffin + orGroup: GiftPool + - id: ToyHonk + orGroup: GiftPool + - id: ToyIan + orGroup: GiftPool + - id: ToyMarauder + orGroup: GiftPool + - id: ToyMauler + orGroup: GiftPool + - id: ToyGygax + orGroup: GiftPool + - id: ToyOdysseus + orGroup: GiftPool + - id: ToyOwlman + orGroup: GiftPool + - id: ToyDeathRipley + orGroup: GiftPool + - id: ToyPhazon + orGroup: GiftPool + - id: ToyFireRipley + orGroup: GiftPool + - id: ToyReticence + orGroup: GiftPool + - id: ToyRipley + orGroup: GiftPool + - id: ToySeraph + orGroup: GiftPool + - id: ToyDurand + orGroup: GiftPool + - id: ToySkeleton + orGroup: GiftPool + - id: FoamBlade + orGroup: GiftPool + - id: ClothingHeadHatBunny + orGroup: GiftPool + - id: PersonalAI + orGroup: GiftPool + - id: ToySword + orGroup: GiftPool + - id: RevolverCapGun + orGroup: GiftPool + - id: ToyRubberDuck + orGroup: GiftPool + - id: BikeHorn + prob: 0.5 + orGroup: GiftPool + - id: GoldenBikeHorn + prob: 0.1 + orGroup: GiftPool + - type: entity parent: BoxCardboard id: FoodBoxCloth diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 31963ca3b015..56584af1570f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -178,10 +178,10 @@ - type: Item - type: entity - name: sweetie's pistachios + name: Sweetie's Pistachios parent: FoodSnackBase id: FoodSnackPistachios - description: Sweeties's name-brand pistachios. probably won't give you diseases. Probably. + description: Sweeties's name-brand pistachios. Probably won't give you diseases. Probably. components: - type: FlavorProfile flavors: @@ -196,6 +196,7 @@ - type: Tag tags: - Fruit # Seed of a fruit, you can yell at me + - Pistachios # Added tag due to CrateFoodGetMore interaction with BountyFruit. - type: entity name: popcorn diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 968805a7b69c..e5bf2ba3b8af 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -978,6 +978,9 @@ - type: Tag id: Pipe +- type: Tag + id: Pistachios + - type: Tag id: Pizza