diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index d72bd20d77..64dee28c24 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -63,3 +63,7 @@ seeds-flyamanita-name = fly amanita seeds-flyamanita-display-name = fly amanita seeds-gatfruit-name = gatfruit seeds-gatfruit-display-name = gatfruit tree +seeds-rice-name = rice +seeds-rice-display-name = rice stalks +seeds-soybeans-name = soybeans +seeds-soybeans-display-name = soy plant diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index ac7ffccbe8..d69e75c451 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -132,7 +132,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 2300 + cost: 2500 category: Hydroponics group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 0a3a8686ff..72281e24e6 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -97,3 +97,7 @@ amount: 1 - id: OnionRedSeeds amount: 1 + - id: RiceSeeds + amount: 1 + - id: SoybeanSeeds + amount: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 1c8449b2da..90b2ac0d04 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -21,6 +21,8 @@ OnionRedSeeds: 5 PoppySeeds: 3 PotatoSeeds: 5 + RiceSeeds: 5 + SoybeanSeeds: 5 SugarcaneSeeds: 5 TomatoSeeds: 5 TowercapSeeds: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index c14f426a7f..db58917caf 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -295,12 +295,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 45 + maxVol: 48 reagents: - ReagentId: Nutriment Quantity: 30 - - ReagentId: Vitamin - Quantity: 5 + - ReagentId: Protein + Quantity: 12 # Tastes like bread, tofu. - type: entity @@ -321,7 +321,7 @@ - ReagentId: Nutriment Quantity: 6 - ReagentId: Vitamin - Quantity: 1.2 + Quantity: 2.4 - type: entity name: cream cheese bread diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index bba6395935..d126b46e8d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -100,6 +100,15 @@ - tofu - type: Sprite state: tofu + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Protein + Quantity: 3 # Tastes like bun, tofu. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index bb4fed694d..040af2e4cb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -249,10 +249,10 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 50 reagents: - ReagentId: MilkOat - Quantity: 20 + Quantity: 50 # Misc @@ -463,6 +463,51 @@ - ReagentId: Nutriment Quantity: 5 +- type: entity + name: tofu + parent: FoodBakingBase + id: FoodTofu + description: Solid white block with a subtle flavor. + components: + - type: FlavorProfile + flavors: + - tofu + - type: Sprite + state: tofu + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Protein + Quantity: 9 + - ReagentId: Nutriment + Quantity: 6 + - type: SliceableFood + count: 3 + slice: FoodTofuSlice + +- type: entity + name: tofu slice + parent: FoodBakingBase + id: FoodTofuSlice + description: A slice of tofu. Ingredient of various vegetarian dishes. + components: + - type: FlavorProfile + flavors: + - tofu + - type: Sprite + state: tofu-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Protein + Quantity: 3 + - ReagentId: Nutriment + Quantity: 2 + - type: entity name: burned mess parent: FoodBakingBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 63e56b5471..a562db3787 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -930,3 +930,43 @@ seedId: gatfruit - type: Food trash: WeaponRevolverPython + +- type: entity + name: rice bushel + description: Can be ground into rice, perfect for pudding or sake. + id: RiceBushel + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/rice.rsi + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Rice + Quantity: 10 + - type: Produce + seedId: rice + +- type: entity + name: soybeans + description: For those who can't stand seeing good old meat. + id: FoodSoybeans + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/soybeans.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 4 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - type: Produce + seedId: soybeans + - type: Extractable + juiceSolution: + reagents: + - ReagentId: MilkSoy + Quantity: 5 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index b643b10c62..75bd73fd60 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -315,6 +315,26 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/onion.rsi +- type: entity + parent: SeedBase + name: packet of rice seeds + id: RiceSeeds + components: + - type: Seed + seedId: rice + - type: Sprite + sprite: Objects/Specific/Hydroponics/rice.rsi + +- type: entity + parent: SeedBase + name: packet of soybean seeds + id: SoybeanSeeds + components: + - type: Seed + seedId: soybeans + - type: Sprite + sprite: Objects/Specific/Hydroponics/soybeans.rsi + - type: entity parent: SeedBase name: packet of red onion seeds diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index abaf587557..2b3317c9fb 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1,4 +1,4 @@ -- type: seed +- type: seed id: wheat name: seeds-wheat-name noun: seeds-noun-seeds @@ -768,3 +768,51 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: rice + name: seeds-rice-name + noun: seeds-noun-seeds + displayName: seeds-rice-display-name + plantRsi: Objects/Specific/Hydroponics/rice.rsi + productPrototypes: + - RiceBushel + lifespan: 25 + maturation: 6 + production: 1 + yield: 4 + potency: 5 + growthStages: 4 + idealLight: 5 + nutrientConsumption: 0.15 + chemicals: + Nutriment: + Min: 1 + Max: 20 + PotencyDivisor: 20 + Rice: + Min: 5 + Max: 20 + PotencyDivisor: 20 + +- type: seed + id: soybeans + name: seeds-soybeans-name + noun: seeds-noun-seeds + displayName: seeds-soybeans-display-name + plantRsi: Objects/Specific/Hydroponics/soybeans.rsi + productPrototypes: + - FoodSoybeans + growthStages: 4 + lifespan: 25 + maturation: 4 + production: 4 + yield: 3 + potency: 5 + idealLight: 7 + nutrientConsumption: 0.15 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 4357599094..89365d1d77 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -158,7 +158,7 @@ desc: reagent-desc-milk-oat physicalDesc: reagent-physical-desc-refreshing flavor: oats - color: "#302000" + color: "#DEDACD" metabolisms: Drink: effects: @@ -170,6 +170,9 @@ parent: MilkOat name: reagent-name-milk-soy desc: reagent-desc-milk-soy + physicalDesc: reagent-physical-desc-refreshing + flavor: soy + color: "#D2C29D" - type: reagent id: MilkSpoiled diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 51e771f313..899ef6bc68 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -107,15 +107,14 @@ FoodBreadBun: 1 ClothingHeadHatBeret: 1 -# - type: microwaveMealRecipe -# id: RecipeTofuBurger -# name: tofu burger recipe -# result: FoodBurgerTofu -# time: 5 -# reagents: -# Flour: 15 -# solids: -# FoodTofu: 1 +- type: microwaveMealRecipe + id: RecipeTofuBurger + name: tofu burger recipe + result: FoodBurgerTofu + time: 5 + solids: + FoodBreadBun: 1 + FoodTofuSlice: 1 - type: microwaveMealRecipe id: RecipeXenoburger @@ -232,6 +231,15 @@ FoodBreadPlainSlice: 1 FoodFlyAmanita: 1 +- type: microwaveMealRecipe + id: RecipeTofuBread + name: tofu bread recipe + result: FoodBreadTofu + time: 20 + solids: + FoodDough: 1 + FoodTofu: 1 + - type: microwaveMealRecipe id: RecipeGarlicBread name: garlic bread slice recipe diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 38e8410e38..7c0d71caf8 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -70,7 +70,7 @@ entity: FoodDoughPie # TG has a cake recipe that uses soy milk instead of eggs. -# but afaik it spawns the exact same cake batter entity. +# but afaik it spawns the exact same cake batter entity. # Maybe change this if you want to do allergies or something - type: reaction id: CreateVeganCakeBatter @@ -87,6 +87,19 @@ - !type:CreateEntityReactionEffect entity: FoodCakeBatter +- type: reaction + id: CreateTofu + impact: Low + quantized: true + reactants: + MilkSoy: + amount: 30 + Enzyme: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: FoodTofu + # Condiments - type: reaction @@ -132,7 +145,7 @@ amount: 5 products: Ketchunaise: 10 - + - type: reaction id: CookingBbqSauce reactants: @@ -141,10 +154,10 @@ Vinegar: amount: 5 Sugar: - amount: 5 + amount: 5 products: BbqSauce: 15 - + - type: reaction id: CookingHotsauce reactants: @@ -167,6 +180,16 @@ products: Vinegar: 10 +- type: reaction + id: CookingSoysauce + reactants: + MilkSoy: + amount: 10 + SulfuricAcid: + amount: 5 + products: + Soysauce: 15 + - type: reaction id: CookingVinaigrette reactants: diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index cd099532ca..47df0c0a56 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188", + "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514", "size": { "x": 32, "y": 32 @@ -84,6 +84,12 @@ }, { "name": "sugar-small" + }, + { + "name": "tofu" + }, + { + "name": "tofu-slice" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tofu-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tofu-slice.png new file mode 100644 index 0000000000..57dee3403e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tofu-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tofu.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tofu.png new file mode 100644 index 0000000000..e403e4851a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tofu.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/dead.png new file mode 100644 index 0000000000..fad40105e1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/harvest.png new file mode 100644 index 0000000000..513f2554a8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json new file mode 100644 index 0000000000..57a5caa641 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12", + "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" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce.png new file mode 100644 index 0000000000..abf70fe162 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/seed.png new file mode 100644 index 0000000000..090991b794 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-1.png new file mode 100644 index 0000000000..33333f209d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-2.png new file mode 100644 index 0000000000..9891ba9956 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-3.png new file mode 100644 index 0000000000..ada9aa7adf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-4.png new file mode 100644 index 0000000000..138ab45eab Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/rice.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/dead.png new file mode 100644 index 0000000000..44755fdd88 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/harvest.png new file mode 100644 index 0000000000..7d50c8a41e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json new file mode 100644 index 0000000000..516ec2496c --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet/commit/bd870d649cc8ac9d8af2fbc046af4a79afb5ab28", + "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" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png new file mode 100644 index 0000000000..ab4f4fda82 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/seed.png new file mode 100644 index 0000000000..0410af3ef9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-1.png new file mode 100644 index 0000000000..9a12e8fdd8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-2.png new file mode 100644 index 0000000000..05fbeeef12 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-3.png new file mode 100644 index 0000000000..5d77527980 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-4.png new file mode 100644 index 0000000000..c1058f829a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/stage-4.png differ