diff --git a/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl b/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl index 4524744417..8f45ec586d 100644 --- a/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl +++ b/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl @@ -2,6 +2,7 @@ cp14-food-sequence-content-pumpkin = pumpkin cp14-food-sequence-content-cucumber = cucumber +cp14-food-sequence-content-pepper = pepper # SANDWICH diff --git a/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl b/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl index bb492af922..6b29c2d981 100644 --- a/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl +++ b/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl @@ -2,6 +2,7 @@ cp14-food-sequence-content-pumpkin = тыква cp14-food-sequence-content-cucumber = огурец +cp14-food-sequence-content-pepper = перец # SANDWICH diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index 777ed72b73..bf45ea892d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -43,7 +43,7 @@ parent: FoodInjectableBase categories: [ ForkFiltered ] name: cabbage leaf - description: Time to make green salads + description: Time to make green salads. components: - type: Item size: Tiny @@ -158,7 +158,7 @@ parent: FoodInjectableBase categories: [ ForkFiltered ] name: potato - description: Cute potato + description: Cute potato. components: - type: Item size: Tiny @@ -237,9 +237,42 @@ Quantity: 2 - ReagentId: Water Quantity: 3 + - type: SliceableFood + count: 2 + sliceTime: 1 + slice: CP14FoodCucumberSlice - type: Tag tags: - CP14FarmFood + +- type: entity + id: CP14FoodCucumberSlice + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: cucumber slice + description: An evenly cut cucumber, still as green and watery. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - CP14Water + - CP14cucumber + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/cucumber.rsi + layers: + - state: slice1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Water + Quantity: 1.5 - type: FoodSequenceElement entries: CP14Sandwich: CP14CucumberSandwich @@ -436,6 +469,10 @@ base1: "" base2: "" base3: "" + - type: SliceableFood + count: 4 + sliceTime: 2 + slice: CP14FoodPepperSlice - type: SolutionContainerManager solutions: food: @@ -449,6 +486,35 @@ tags: - CP14FarmFood +- type: entity + id: CP14FoodPepperSlice + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: pepper slice + description: Still as red and sweetish. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - peppery + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/pepper.rsi + layers: + - state: slice1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 3.5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - type: FoodSequenceElement + entries: + CP14Sandwich: CP14PepperSandwich + - type: entity id: CP14FoodOnion parent: FoodInjectableBase @@ -483,8 +549,43 @@ Quantity: 4 - ReagentId: Allicin Quantity: 3 + - type: SliceableFood + count: 4 + sliceTime: 2 + slice: CP14FoodOnionSlice - type: CP14Seed plantProto: CP14PlantOnion - type: Tag tags: - CP14FarmFood + +- type: entity + id: CP14FoodOnionSlice + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: onion ring + description: A more tolerable and easy to eat onion ring. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - onion + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/onion.rsi + layers: + - state: slice1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2.2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Allicin + Quantity: 0.8 + - type: FoodSequenceElement + entries: + CP14Sandwich: CP14OnionSandwich diff --git a/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml index d1dc1b638b..96beac71c1 100644 --- a/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml @@ -96,3 +96,26 @@ state: slice1 tags: - Fruit + +# Pepper + +- type: foodSequenceElement + id: CP14PepperSandwich + name: cp14-food-sequence-content-pepper + sprites: + - sprite: _CP14/Objects/Flora/Farm/pepper.rsi + state: slice1 + tags: + - Vegetable + +# Onion + +- type: foodSequenceElement + id: CP14OnionSandwich + name: food-sequence-content-onion + sprites: + - sprite: _CP14/Objects/Flora/Farm/onion.rsi + state: slice1 + tags: + - Vegetable + - Slice diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json index a8586fd342..c760ebc254 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json @@ -18,6 +18,9 @@ }, { "name": "base4" + }, + { + "name": "slice1" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/slice1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/slice1.png new file mode 100644 index 0000000000..8207b7efca Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/slice1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json index 0e000b787a..ec4cd529b6 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "base3" + }, + { + "name": "slice1" } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/slice1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/slice1.png new file mode 100644 index 0000000000..23b6165075 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/slice1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/meta.json index 0e000b787a..ec4cd529b6 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "base3" + }, + { + "name": "slice1" } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/slice1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/slice1.png new file mode 100644 index 0000000000..04242df0be Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/slice1.png differ