]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cabbage, Red Onion and related salads. (#14161)
authorFluffiest Floofers <thebluewulf@gmail.com>
Sat, 18 Feb 2023 23:52:58 +0000 (00:52 +0100)
committerGitHub <noreply@github.com>
Sat, 18 Feb 2023 23:52:58 +0000 (17:52 -0600)
* 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>
23 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/seeds/seeds.ftl
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Resources/Prototypes/Catalog/Fills/Crates/botany.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Hydroponics/seeds.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Textures/Objects/Consumable/Food/bowl.rsi/caesar.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/coleslaw.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/kimchi.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/stage-1.png [new file with mode: 0644]

index 1ce4a5eafd0ef27a28af250ed966a4448c368b95..ad8ab001f5c196ac00f7a611a7e7a8cc1fb7196f 100644 (file)
@@ -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
index adb5df000720468a64fecb8204aaa8d59868a5ea..deb21906094185a8c5b971b366bb5fed90bd44ce 100644 (file)
@@ -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
index f7d176a176343b5ce4be16c440d02ac28a600541..de0057d9bd255c7b376c30f932d1be6718ccdece 100644 (file)
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSeedsFilled
-  cost: 2000
+  cost: 2200
   category: Hydroponics
   group: market
 
index 5ec1b7d2b74c2c09fd2086a4cf8823c845a7cc06..6d4d4ae08e44238153618fcd620855d24898a376 100644 (file)
@@ -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
index 2f77063d53547eb4faf926c0d594c65f79200f76..2557190510933bdefb991b9a424f84f30bb474bb 100644 (file)
@@ -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
index e714d91326a1baea7546d2770278a60c4a54b6a7..e95fca1d87578d26417f39160af202518a5f9275 100644 (file)
@@ -42,6 +42,9 @@
       - FoodSaladFruit
       - FoodSaladJungle
       - FoodSaladCitrus
+      - FoodSaladCaesar
+      - FoodSaladColeslaw
+      - FoodSaladKimchi
       - FoodRiceBoiled
       - FoodRiceEgg
       - FoodRicePork
index 90ef322a1139d2009e0cbc6730d0d0f7fe903fc6..ccd9f2400c346420ddfa5b12ec26a1a901ca686e 100644 (file)
   - type: FlavorProfile
     flavors:
       - meaty
+      - cabbage
   - type: Sprite
     state: cornedbeef
   - type: SolutionContainerManager
index 758c06cb795d161c613f89016c885c07f2036969..fb94ade21c238bcc0f55c0d181bf7e073ea15308 100644 (file)
       - 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
index d03cef8f1def9e587a723b60acc1efb0f4b495d8..652a0ddcad7d02845af5b0e6b293a9d3548ad7cf 100644 (file)
           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
index 3f71e0e798b44de27440ad25a2dbe8938368da09..91831999404a822bae11cd527072898cf8903b78 100644 (file)
     - 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
       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
index 6808a4593c53cc26253923c848cc70ebfa6947e1..89dbd3105c28fa6b201614b635a9ed26b0400304 100644 (file)
   flavorType: Complex
   description: flavor-complex-carrot
 
+- type: flavor
+  id: cabbage
+  flavorType: Complex
+  description: flavor-complex-cabbage
+
 - type: flavor
   id: potatoes
   flavorType: Complex
index 21001a31bfa35d9700c997eec35e5da253474a32..7e7b6b339fbcd499a364a8586496e909be5d3b75 100644 (file)
       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
index d98dd03c4e554fb6913278a45b756c0ab7d7fdd1..09ef121dcd4b0860f7de4afb6c378aafc72e52fc 100644 (file)
     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 (file)
index 0000000..4e3f6e8
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 (file)
index 0000000..9d6501d
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 (file)
index 0000000..2da3437
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/kimchi.png differ
index 1950d67e7620662a64a6b79b4aa680e1d8dc116c..73cd2fe641348a025521ed2d020ea1b8ee555812 100644 (file)
     },
     {
       "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 (file)
index 0000000..3ce7308
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 (file)
index 0000000..1d0706f
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 (file)
index 0000000..18d6e79
--- /dev/null
@@ -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 (file)
index 0000000..34f0c13
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 (file)
index 0000000..5120f6b
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 (file)
index 0000000..293e00f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/stage-1.png differ