From: Fluffiest Floofers Date: Sat, 18 Feb 2023 23:52:58 +0000 (+0100) Subject: Cabbage, Red Onion and related salads. (#14161) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=adf9ccbe8a15a6df6f5add5dade7315748e614d9;p=space-station-14.git Cabbage, Red Onion and related salads. (#14161) * Cabbage That's it, just cabbage. * Up RestockSeed Cargo price. 2000 -> 2100 * Coleslawn, Caesar and Kimchi. Requires red onions so I also added it to the list. * Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml Fix kimchi's incorrect name. Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> --------- Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 1ce4a5eafd..ad8ab001f5 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -84,6 +84,7 @@ flavor-complex-pineapple = like pineapple flavor-complex-onion = like onion flavor-complex-eggplant = like eggplant flavor-complex-carrot = like carrots +flavor-complex-cabbage = like cabbages flavor-complex-potatoes = like potatoes flavor-complex-mushroom = like mushrooms flavor-complex-tomato = like tomatoes diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index adb5df0007..deb2190609 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -11,6 +11,8 @@ seeds-banana-name = banana seeds-banana-display-name = banana plant seeds-carrots-name = carrot seeds-carrots-display-name = carrots +seeds-cabbage-name = cabbage +seeds-cabbage-display-name = cabbages seeds-lemon-name = lemon seeds-lemon-display-name = lemon trees seeds-pineapple-name = pineapple diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index f7d176a176..de0057d9bd 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: 2000 + cost: 2200 category: Hydroponics group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 5ec1b7d2b7..6d4d4ae08e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -79,6 +79,8 @@ amount: 1 - id: CarrotSeeds amount: 1 + - id: CabbageSeeds + amount: 1 - id: ChanterelleSeeds amount: 1 - id: PotatoSeeds @@ -91,3 +93,5 @@ amount: 1 - id: OnionSeeds amount: 1 + - id: OnionRedSeeds + amount: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 2f77063d53..2557190510 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -6,6 +6,7 @@ AppleSeeds: 5 BananaSeeds: 5 CarrotSeeds: 5 + CabbageSeeds: 5 ChanterelleSeeds: 5 ChiliSeeds: 5 CornSeeds: 5 @@ -16,6 +17,7 @@ LingzhiSeeds: 3 OatSeeds: 5 OnionSeeds: 5 + OnionRedSeeds: 5 PoppySeeds: 3 PotatoSeeds: 5 SugarcaneSeeds: 5 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml index e714d91326..e95fca1d87 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml @@ -42,6 +42,9 @@ - FoodSaladFruit - FoodSaladJungle - FoodSaladCitrus + - FoodSaladCaesar + - FoodSaladColeslaw + - FoodSaladKimchi - FoodRiceBoiled - FoodRiceEgg - FoodRicePork diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 90ef322a11..ccd9f2400c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -243,6 +243,7 @@ - type: FlavorProfile flavors: - meaty + - cabbage - type: Sprite state: cornedbeef - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 758c06cb79..fb94ade21c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -247,6 +247,29 @@ - ReagentId: JuiceCarrot Quantity: 10 +- type: entity + name: cabbage + parent: FoodProduceBase + id: FoodCabbage + description: Ewwwwwwwwww. Cabbage. + components: + - type: FlavorProfile + flavors: + - cabbage + - type: SolutionContainerManager + solutions: + food: + maxVol: 14 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 + - type: Sprite + sprite: Objects/Specific/Hydroponics/cabbage.rsi + - type: Produce + seedId: cabbage + - type: entity name: lemon parent: FoodProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index d03cef8f1d..652a0ddcad 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -156,6 +156,87 @@ Quantity: 5 # Tastes like leaves, potato, meat, valids. +- type: entity + name: coleslaw + parent: FoodBowlBase + id: FoodSaladColeslaw + description: Shredded cabbage and red onions dressed with a vinaigrette. + components: + - type: FlavorProfile + flavors: + - onion + - cabbage + - sour + - type: Sprite + layers: + - state: bowl + - state: coleslaw + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Allicin + Quantity: 3 +# Tastes like cabbage, onion, sour. + +- type: entity + name: caesar salad + parent: FoodBowlBase + id: FoodSaladCaesar + description: A simple yet flavorful salad of onions, lettuce, croutons, and shreds of cheese dressed in oil. Comes with a slice of pita bread! + components: + - type: FlavorProfile + flavors: + - onion + - cabbage + - bread + - cheesy + - type: Sprite + layers: + - state: bowl + - state: caesar + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 6 +# Tastes like cabbage, onion, croutons, cheese. + +- type: entity + name: kimchi salad + parent: FoodBowlBase + id: FoodSaladKimchi + description: It really is just a spicy salad. + components: + - type: FlavorProfile + flavors: + - spicy + - cabbage + - carrot + - type: Sprite + layers: + - state: bowl + - state: kimchi + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 +# Tastes like spicy cabbage, carrots. + - type: entity name: fruit salad parent: FoodBowlBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 3f71e0e798..9183199940 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -53,6 +53,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/carrot.rsi +- type: entity + parent: SeedBase + name: packet of cabbage seeds + id: CabbageSeeds + components: + - type: Seed + seedId: cabbage + - type: Sprite + sprite: Objects/Specific/Hydroponics/cabbage.rsi + - type: entity parent: SeedBase name: packet of lemon seeds @@ -294,3 +304,14 @@ seedId: onion - type: Sprite sprite: Objects/Specific/Hydroponics/onion.rsi + +- type: entity + parent: SeedBase + name: packet of red onion seeds + description: "Purple despite the name." + id: OnionRedSeeds + components: + - type: Seed + seedId: onionred + - type: Sprite + sprite: Objects/Specific/Hydroponics/onion_red.rsi diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 6808a4593c..89dbd3105c 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -294,6 +294,11 @@ flavorType: Complex description: flavor-complex-carrot +- type: flavor + id: cabbage + flavorType: Complex + description: flavor-complex-cabbage + - type: flavor id: potatoes flavorType: Complex diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 21001a31bf..7e7b6b339f 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -276,6 +276,30 @@ Max: 4 PotencyDivisor: 25 +- type: seed + id: cabbage + name: seeds-cabbage-name + noun: seeds-noun-seeds + displayName: seeds-cabbage-display-name + plantRsi: Objects/Specific/Hydroponics/cabbage.rsi + productPrototypes: + - FoodCabbage + lifespan: 50 + maturation: 3 + production: 5 + yield: 4 + potency: 10 + growthStages: 1 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + - type: seed id: apple name: seeds-apple-name diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index d98dd03c4e..09ef121dcd 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -982,6 +982,45 @@ FoodPotato: 1 FoodMeatMeatball: 1 +- type: microwaveMealRecipe + id: RecipeColeslaw + name: coleslaw recipe + result: FoodSaladColeslaw + time: 5 + reagents: + Vinegar: 5 + OilOlive: 5 + solids: + FoodBowlBig: 1 + FoodOnionRed: 1 + FoodCabbage: 1 + +- type: microwaveMealRecipe + id: RecipeCaesarSalad + name: caesar salad recipe + result: FoodSaladCaesar + time: 5 + reagents: + OilOlive: 5 + solids: + FoodBowlBig: 1 + FoodOnionRedSlice: 1 + FoodBreadPlainSlice: 1 + FoodCheeseSlice: 1 + FoodCabbage: 1 + +- type: microwaveMealRecipe + id: RecipeKimchiSalad + name: kimchi salad recipe + result: FoodSaladKimchi + time: 5 + reagents: + Vinegar: 5 + solids: + FoodBowlBig: 1 + FoodCarrot: 1 + FoodCabbage: 1 + # NOT ACTUAL FOOD - type: microwaveMealRecipe diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/caesar.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/caesar.png new file mode 100644 index 0000000000..4e3f6e8a63 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/caesar.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/coleslaw.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/coleslaw.png new file mode 100644 index 0000000000..9d6501d96b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/coleslaw.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/kimchi.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/kimchi.png new file mode 100644 index 0000000000..2da34370c6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/kimchi.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json index 1950d67e76..73cd2fe641 100644 --- a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json @@ -158,6 +158,15 @@ }, { "name": "wingfangchu" + }, + { + "name": "coleslaw" + }, + { + "name": "caesar" + }, + { + "name": "kimchi" } ] } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/dead.png new file mode 100644 index 0000000000..3ce7308419 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/harvest.png new file mode 100644 index 0000000000..1d0706fd63 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json new file mode 100644 index 0000000000..18d6e7962e --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12#diff-3fdb6bdffec70eb17e6315b5cc5447b4cc73d39f583f077f064ad70f286138fa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png new file mode 100644 index 0000000000..34f0c13081 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/seed.png new file mode 100644 index 0000000000..5120f6b54c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/stage-1.png new file mode 100644 index 0000000000..293e00f444 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/stage-1.png differ