diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl index 1231d7167b..a6b3cb5479 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl @@ -9,3 +9,6 @@ reagent-desc-vitamin = Found in healthy, complete meals. reagent-name-protein = protein reagent-desc-protein = Found in certain meals, good for bodily health. + +reagent-name-cocoapowder = сocoa powder +reagent-desc-cocoapowder = From the best varieties of cocoa beans diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 8e22f046c8..b7d77ca1e6 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -75,3 +75,5 @@ seeds-watermelon-name = watermelon seeds-watermelon-display-name = watermelon plant seeds-grape-name = grape seeds-grape-display-name = grape plant +seeds-cocoa-name = cocoa +seeds-cocoa-display-name = cocoa plant diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 05b1d52d53..a0d19b95ea 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -31,5 +31,6 @@ TowercapSeeds: 5 WheatSeeds: 5 WatermelonSeeds: 5 + CocoaSeeds: 3 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index b307510a4e..0477816874 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -620,3 +620,32 @@ - type: Tag tags: - Trash + +- type: entity + name: cocoa beans + parent: FoodProduceBase + id: FoodCocoaBeans + description: You can never have too much chocolate! + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: Objects/Specific/Hydroponics/cocoa.rsi + state: produce-beans + - type: SolutionContainerManager + solutions: + food: + maxVol: 14 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: CocoaPowder + Quantity: 2 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CocoaPowder + Quantity: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 4c76bf7f98..097be3c37a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -579,6 +579,36 @@ - ReagentId: JuiceApple Quantity: 10 +- type: entity + name: cocoa pod + parent: FoodProduceBase + id: FoodCocoaPod + description: You can never have too much chocolate! + components: + - type: FlavorProfile + flavors: + - chocolate + - type: SolutionContainerManager + solutions: + food: + maxVol: 14 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Sprite + sprite: Objects/Specific/Hydroponics/cocoa.rsi + - type: Produce + seedId: cocoa + - type: SpawnItemsOnUse + items: + - id: FoodCocoaBeans + sound: + path: /Audio/Effects/packetrip.ogg + - type: entity name: ear of corn parent: FoodProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 4c60fee616..fb02a92949 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -118,6 +118,8 @@ Quantity: 10 - ReagentId: Theobromine Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 - type: entity name: energy bar diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index d64f908a8d..0d98669fae 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -384,4 +384,14 @@ seedId: grape - type: Sprite sprite: Objects/Specific/Hydroponics/grape.rsi + +- type: entity + parent: SeedBase + name: packet of cocoa seeds + id: CocoaSeeds + components: + - type: Seed + seedId: cocoa + - type: Sprite + sprite: Objects/Specific/Hydroponics/cocoa.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 467f49b8e5..8c8abe478d 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -961,3 +961,30 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: cocoa + name: seeds-cocoa-name + noun: seeds-noun-seeds + displayName: seeds-cocoa-display-name + plantRsi: Objects/Specific/Hydroponics/cocoa.rsi + packetPrototype: CocoaSeeds + productPrototypes: + - FoodCocoaPod + harvestRepeat: Repeat + lifespan: 50 + maturation: 6 + production: 6 + yield: 6 + idealLight: 7 + waterConsumption: 6 + idealHeat: 298 + chemicals: + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + Nutriment: + Min: 1 + Max: 2 + PotencyDivisor: 50 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 1e6b210a0c..be61993e7d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -197,3 +197,29 @@ type: Local messages: [ "capsaicin-effect-light-burn" ] probability: 0.2 + +- type: reagent + id: CocoaPowder #Candy and chocolate + name: reagent-name-cocoapowder + group: Foods + desc: reagent-desc-cocoapowder + physicalDesc: reagent-physical-desc-powdery + flavor: chocolate + color: "#800000" + meltingPoint: 146.0 + metabolisms: + Food: + effects: + - !type:SatiateHunger + conditions: + - !type:ReagentThreshold #Only satiates when eaten with nutriment + reagent: Nutriment + min: 0.1 + factor: 1 + plantMetabolism: + - !type:PlantAdjustNutrition + amount: 0.1 + - !type:PlantAdjustWeeds + amount: 2 + - !type:PlantAdjustPests + amount: 2 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 2ef1cf2dab..284b1c763a 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -266,3 +266,19 @@ effects: - !type:CreateEntityReactionEffect entity: FoodMeatMeatball + +- type: reaction + id: CreateChocolate + impact: Low + quantized: true + conserveEnergy: false + reactants: + CocoaPowder: + amount: 4 + Milk: + amount: 2 + Sugar: + amount: 2 + effects: + - !type:CreateEntityReactionEffect + entity: FoodSnackChocolateBar diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/dead.png new file mode 100644 index 0000000000..df1a43cd50 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/harvest.png new file mode 100644 index 0000000000..5176c3fe5d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json new file mode 100644 index 0000000000..b58eccfe5e --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13. produce-beans drawn by FillerVK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "produce-beans" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-beans.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-beans.png new file mode 100644 index 0000000000..4f080be711 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-beans.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce.png new file mode 100644 index 0000000000..478d79b1de Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/seed.png new file mode 100644 index 0000000000..1c008dff4e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-1.png new file mode 100644 index 0000000000..dd8ff776d8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-2.png new file mode 100644 index 0000000000..95d9d8d925 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-3.png new file mode 100644 index 0000000000..9fa1754917 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-4.png new file mode 100644 index 0000000000..666be76cb0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-5.png new file mode 100644 index 0000000000..13cb04e435 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-6.png new file mode 100644 index 0000000000..13cb04e435 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-6.png differ