diff --git a/Resources/Locale/en-US/botany/components/seed-component.ftl b/Resources/Locale/en-US/botany/components/seed-component.ftl index eace4c1d9c..7ee2141b10 100644 --- a/Resources/Locale/en-US/botany/components/seed-component.ftl +++ b/Resources/Locale/en-US/botany/components/seed-component.ftl @@ -1,6 +1,6 @@ ## Entity -seed-component-description = It has a picture of [color=yellow]{$seedName}[/color] on the front. +seed-component-description = It looks like you can grow [color=yellow]{$seedName}[/color] from these. seed-component-has-variety-tag = It's tagged as variety [color=lightgray]no. {$seedUid}[/color]. seed-component-plant-yield-text = Plant Yield: [color=lightblue]{$seedYield}[/color] seed-component-plant-potency-text = Plant Potency: [color=lightblue]{$seedPotency}[/color] diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index ebf341ed18..145e2aa51f 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -103,6 +103,7 @@ flavor-complex-orange = like oranges flavor-complex-watermelon = like watermelon flavor-complex-garlic = like garlic flavor-complex-grape = like grapes +flavor-complex-berry = like berries flavor-complex-meatballs = like meatballs flavor-complex-nettles = like nettles flavor-complex-jungle = like jungle diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl index befcc5cb4e..bbc9817b30 100644 --- a/Resources/Locale/en-US/reagents/meta/toxins.ftl +++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl @@ -63,3 +63,6 @@ reagent-desc-honk = A toxin found in bananium. Causes severe honking and interna reagent-name-lead = lead reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albiet in trace amounts. Tasteless. + +reagent-name-bungotoxin = bungotoxin +reagent-desc-bungotoxin = A moderately slow-acting poison found within the pit of the bungo fruit. diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 152d5ba6a4..2e0388ec52 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -93,3 +93,7 @@ seeds-grape-name = grape seeds-grape-display-name = grape plant seeds-cocoa-name = cocoa seeds-cocoa-display-name = cocoa plant +seeds-berries-name = berries +seeds-berries-display-name = berry bush +seeds-bungo-name = bungo +seeds-bungo-display-name = bungo plant \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 39e8839152..5d2798a667 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -20,6 +20,8 @@ amount: 2 - id: PineappleSeeds amount: 2 + - id: BungoSeeds + amount: 2 - type: entity id: CrateHydroponicsSeedsMedicinal diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index a0d19b95ea..98de54dc52 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -32,5 +32,6 @@ WheatSeeds: 5 WatermelonSeeds: 5 CocoaSeeds: 3 + BerrySeeds: 5 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 47d457189e..04e109f311 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -154,8 +154,7 @@ - type: FlavorProfile flavors: - sweet - - banana - - creamy + - berry - type: Sprite layers: - state: tin @@ -172,6 +171,7 @@ - type: FlavorProfile flavors: - sweet + - berry - type: Sprite layers: - state: plain-slice diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 5fe38c4a57..4a5aa42130 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1451,3 +1451,84 @@ reagents: - ReagentId: JuiceGrape Quantity: 10 + +- type: entity + name: berries + parent: FoodProduceBase + id: FoodBerries + description: A handful of various types of berries. + components: + - type: FlavorProfile + flavors: + - berry + - type: SolutionContainerManager + solutions: + food: + maxVol: 11 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 + - type: Sprite + sprite: Objects/Specific/Hydroponics/berries.rsi + - type: Produce + seedId: berries + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceBerry + Quantity: 10 + +- type: entity + name: bungo fruit + parent: FoodProduceBase + id: FoodBungo + description: The humble bungo fruit. + components: + - type: FlavorProfile + flavors: + - bungo + - type: Food + trash: FoodBungoPit + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Enzyme + Quantity: 10 + - type: Sprite + sprite: Objects/Specific/Hydroponics/bungo.rsi + - type: Produce + seedId: bungo + +- type: entity + name: bungo pit + parent: FoodInjectableBase + id: FoodBungoPit + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/bungo.rsi + state: pit + - type: Tag + tags: + - Recyclable + - Trash + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Bungotoxin + Quantity: 5 + - type: Extractable + grindableSolutionName: food + - type: Seed + seedId: bungo + - type: SpaceGarbage + - type: BadFood \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index c24021c8cc..16d9fd1a64 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -477,4 +477,24 @@ seedId: cocoa - type: Sprite sprite: Objects/Specific/Hydroponics/cocoa.rsi - \ No newline at end of file + +- type: entity + parent: SeedBase + name: packet of berry seeds + id: BerrySeeds + components: + - type: Seed + seedId: berries + - type: Sprite + sprite: Objects/Specific/Hydroponics/berries.rsi + +- type: entity + parent: SeedBase + name: packet of bungo seeds + description: "Don't eat the pits." + id: BungoSeeds + components: + - type: Seed + seedId: bungo + - type: Sprite + sprite: Objects/Specific/Hydroponics/bungo.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index ab82a13fcb..2b8e2b0e2f 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -729,6 +729,11 @@ flavorType: Complex description: flavor-complex-grape +- type: flavor + id: berry + flavorType: Complex + description: flavor-complex-berry + - type: flavor id: garlic flavorType: Complex diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 277cadd12b..e990ffdb37 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1235,7 +1235,8 @@ production: 6 yield: 6 idealLight: 7 - waterConsumption: 6 + waterConsumption: 1 + nutrientConsumption: 0.8 idealHeat: 298 chemicals: Vitamin: @@ -1246,3 +1247,58 @@ Min: 1 Max: 2 PotencyDivisor: 50 + +- type: seed + id: berries + name: seeds-berries-name + noun: seeds-noun-seeds + displayName: seeds-berries-display-name + plantRsi: Objects/Specific/Hydroponics/berries.rsi + packetPrototype: BerrySeeds + productPrototypes: + - FoodBerries + harvestRepeat: Repeat + lifespan: 50 + maturation: 6 + production: 6 + yield: 4 + idealLight: 7 + nutrientConsumption: 0.6 + chemicals: + Nutriment: + Min: 2 + Max: 5 + PotencyDivisor: 30 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 40 + +- type: seed + id: bungo + name: seeds-bungo-name + noun: seeds-noun-seeds + displayName: seeds-bungo-display-name + plantRsi: Objects/Specific/Hydroponics/bungo.rsi + packetPrototype: BungoSeeds + productPrototypes: + - FoodBungo + harvestRepeat: Repeat + lifespan: 50 + maturation: 8 + production: 6 + potency: 10 + yield: 3 + idealLight: 8 + idealHeat: 298 + growthStages: 4 + waterConsumption: 0.6 + chemicals: + Nutriment: + Min: 5 + Max: 10 + PotencyDivisor: 20 + Enzyme: + Min: 5 + Max: 10 + PotencyDivisor: 20 \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index a77621cab5..206d7dcd2b 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -23,7 +23,7 @@ parent: BaseDrink desc: reagent-desc-juice-berry physicalDesc: reagent-physical-desc-sweet - flavor: juice + flavor: berry color: "#660099" - type: reagent diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 2f926f0630..e2a40ffbb3 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -533,3 +533,19 @@ damage: types: Poison: 0.6 # Makes it 20 damage per unit. + +- type: reagent + id: Bungotoxin + name: reagent-name-bungotoxin + group: Toxins + desc: reagent-desc-bungotoxin + physicalDesc: reagent-physical-desc-nondescript + color: "#EBFF8E" + metabolisms: + Poison: + metabolismRate: 0.2 + effects: + - !type:HealthChange + damage: + types: + Poison: 1.8 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index d329821230..bb43beb9fd 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -868,6 +868,18 @@ FoodBanana: 1 MonkeyCube: 1 +- type: microwaveMealRecipe + id: RecipeBungoSoup + name: bungo soup recipe + result: FoodSoupBungo + time: 10 + reagents: + Water: 5 + solids: + FoodBowlBig: 1 + FoodBungo: 2 + FoodChili: 1 + #Other - type: microwaveMealRecipe @@ -959,6 +971,18 @@ Milk: 5 Egg: 6 +- type: microwaveMealRecipe + id: RecipeBlueberryPancake + name: blueberry pancake recipe + result: FoodBakedPancakeBb + time: 5 + reagents: + Flour: 5 + Milk: 5 + Egg: 6 + solids: + FoodBerries: 2 + - type: microwaveMealRecipe id: RecipeWaffles name: waffle recipe @@ -1048,6 +1072,16 @@ FoodApple: 3 FoodPlateTin: 1 +- type: microwaveMealRecipe + id: RecipeBerryClafoutis + name: berry clafoutis + result: FoodPieClafoutis + time: 15 + solids: + FoodDoughPie: 1 + FoodBerries: 3 + FoodPlateTin: 1 + - type: microwaveMealRecipe id: RecipeMeatPie name: meat pie recipe @@ -1104,6 +1138,15 @@ FoodCakePlain: 1 FoodOrange: 3 +- type: microwaveMealRecipe + id: RecipeBlueberryCake + name: blueberry cake recipe + result: FoodCakeBlueberry + time: 5 + solids: + FoodCakePlain: 1 + FoodBerries: 3 + - type: microwaveMealRecipe id: RecipeLimeCake name: lime cake recipe diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/dead.png new file mode 100644 index 0000000000..60756f9f0d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/harvest.png new file mode 100644 index 0000000000..73c06b1016 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json new file mode 100644 index 0000000000..3dd93d36e3 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation: https://github.com/tgstation/tgstation/commit/696dfcc59c9e65e7bbe3923d1f7e880ea384783f", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "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/berries.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce.png new file mode 100644 index 0000000000..6f58152c52 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/seed.png new file mode 100644 index 0000000000..ed3b519075 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-1.png new file mode 100644 index 0000000000..cf39d0c73d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-2.png new file mode 100644 index 0000000000..53c51d4528 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-3.png new file mode 100644 index 0000000000..ef3fda7dfa Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-4.png new file mode 100644 index 0000000000..2f54d6d35b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-5.png new file mode 100644 index 0000000000..7062b70c67 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-6.png new file mode 100644 index 0000000000..0319ddd239 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-6.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/dead.png new file mode 100644 index 0000000000..729dbf5fa3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/harvest.png new file mode 100644 index 0000000000..9bf2c29dc9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/meta.json new file mode 100644 index 0000000000..0d785e03c4 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation: https://github.com/tgstation/tgstation/commit/b3399ffe39f9ace645123c98323c4832412cc641", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "pit" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/pit.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/pit.png new file mode 100644 index 0000000000..85538b2dcf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/pit.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/produce.png new file mode 100644 index 0000000000..9c1ecdc0e8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/seed.png new file mode 100644 index 0000000000..9177bed6b6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-1.png new file mode 100644 index 0000000000..1ea36a64cc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-2.png new file mode 100644 index 0000000000..1fbb57875c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-3.png new file mode 100644 index 0000000000..9f31d750c8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-4.png new file mode 100644 index 0000000000..fd4bde4560 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-4.png differ