diff --git a/Resources/Locale/en-US/_CP14/recipe/title.ftl b/Resources/Locale/en-US/_CP14/recipe/title.ftl index c68c080969..0a38a6f924 100644 --- a/Resources/Locale/en-US/_CP14/recipe/title.ftl +++ b/Resources/Locale/en-US/_CP14/recipe/title.ftl @@ -1,2 +1,4 @@ cp14-recipe-title-meat = various pieces of raw meat +cp14-recipe-title-meat-cooked = various pieces of cooked meat +cp14-recipe-title-meat-cooked-leg = various leg of cooked meat cp14-recipe-title-energy-crystal = energycrystals diff --git a/Resources/Locale/ru-RU/_CP14/recipe/title.ftl b/Resources/Locale/ru-RU/_CP14/recipe/title.ftl index 1b7e47053c..d87d86ad8c 100644 --- a/Resources/Locale/ru-RU/_CP14/recipe/title.ftl +++ b/Resources/Locale/ru-RU/_CP14/recipe/title.ftl @@ -1,2 +1,4 @@ cp14-recipe-title-meat = разные кусочки сырого мяса +cp14-recipe-title-meat-cooked = разные кусочки приготовленного мяса +cp14-recipe-title-meat-cooked-leg = разные окорока приготовленного мяса cp14-recipe-title-energy-crystal = энергокристаллы \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml index c403c99b05..0bb0b0bbae 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml @@ -1,6 +1,6 @@ #Base for future bottles - type: entity - name: green Bottle + name: green bottle parent: CP14BaseVialFragile id: CP14GreenBottle suffix: Empty @@ -74,7 +74,7 @@ sprite: _CP14/Objects/Consumable/Drinks/orange_bottle.rsi - type: entity - name: red Bottle + name: red bottle parent: CP14GreenBottle id: CP14RedBottle description: A red bottle perfect for drinking wine. diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml new file mode 100644 index 0000000000..8df28706b7 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml @@ -0,0 +1,54 @@ +- type: entity + parent: CP14DrinkBaseMug + id: CP14DrinkBaseGoblet + name: goblet + description: A metal goblet for those who want to drink exquisitely. + abstract: true + categories: [ ForkFiltered ] + components: + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- + +- type: entity + parent: CP14DrinkBaseGoblet + id: CP14SteelGobletIron + name: iron goblet + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Consumable/Drinks/goblet.rsi + layers: + - state: iron_goblet + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-5 + visible: false + +- type: entity + parent: CP14DrinkBaseGoblet + id: CP14SteelGobletCopper + name: copper goblet + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Consumable/Drinks/goblet.rsi + layers: + - state: copper_goblet + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-5 + visible: false + +- type: entity + parent: CP14DrinkBaseGoblet + id: CP14SteelGobletGold + name: gold goblet + description: A goblet made of solid gold to show how rich its owner is. + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Consumable/Drinks/goblet.rsi + layers: + - state: gold_goblet + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-5 + visible: false diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml index 567d3cc3ce..e5d44f250b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/mugs.yml @@ -64,7 +64,7 @@ - type: entity parent: CP14DrinkBaseMug id: CP14MetalBeerMug - name: Metal mug + name: metal mug categories: [ ForkFiltered ] description: The most common metal mug. components: @@ -82,7 +82,7 @@ - type: entity parent: CP14DrinkBaseMug id: CP14WoodenBeerMug - name: Wooden mug + name: wooden mug categories: [ ForkFiltered ] description: Wooden mug for beer. components: @@ -92,7 +92,7 @@ - type: entity parent: CP14DrinkBaseMug id: CP14SteelBeerMug - name: Beer mug + name: beer mug categories: [ ForkFiltered ] description: Wooden mug with iron inclusions. components: @@ -102,7 +102,7 @@ - type: entity parent: CP14DrinkBaseMug id: CP14SteelWoodBeerMug - name: Beer mug + name: beer mug categories: [ ForkFiltered ] description: Wooden mug with iron inclusions. components: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/base.yml new file mode 100644 index 0000000000..451582c645 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/base.yml @@ -0,0 +1,14 @@ +- type: entity + abstract: true + id: CP14BurnsAsh + categories: [ ForkFiltered ] + components: + - type: Temperature + currentTemperature: 290 + - type: InternalTemperature + thickness: 0.02 + area: 0.02 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 400, 500 + transformTo: CP14Ash1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cutlery.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cutlery.yml new file mode 100644 index 0000000000..7e5019adbb --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cutlery.yml @@ -0,0 +1,105 @@ +- type: entity + id: CP14Plate + parent: BaseItem + name: plate + description: This is your plate for a delicious meal! + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/plates.rsi + state: plate + - type: Item + shape: + - 0,0,1,0 + - type: Tag + tags: + - CP14Plate + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 # 2 wooden plank in craft + +- type: entity + id: CP14PlatePie + parent: BaseItem + name: pie plate + description: A mould for making a delicious pie. + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/pie.rsi + state: tin + - type: Item + shape: + - 0,0,1,0 + - type: Tag + tags: + - CP14PlatePie + - type: PhysicalComposition + materialComposition: + CP14Iron: 10 # 1 iron bar = 1 plate pie in craft + +- type: entity + parent: BaseItem + id: CP14Fork + name: fork + description: Thousands of years of progress, and there it is, the fork. + categories: [ ForkFiltered ] + components: + - type: Tag + tags: + - Hoe + - Metal + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/cutlery.rsi + state: fork + - type: Item + sprite: _CP14/Objects/Consumable/Food/cutlery.rsi + heldPrefix: fork + - type: Utensil + types: + - Fork + - type: MeleeWeapon + wideAnimationRotation: 180 + attackRate: 1.5 + damage: + types: + Piercing: 1 + - type: PhysicalComposition + materialComposition: + CP14Iron: 4 + +- type: entity + parent: BaseItem + id: CP14Spoon + name: spoon + description: It is considered the first tool for eating, not counting the hands. + categories: [ ForkFiltered ] + components: + - type: Tag + tags: + - Metal + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/cutlery.rsi + state: spoon + - type: Item + sprite: _CP14/Objects/Consumable/Food/cutlery.rsi + heldPrefix: spoon + - type: Utensil + types: + - Spoon + - type: MeleeWeapon + wideAnimationRotation: 180 + attackRate: 1.5 + damage: + types: + Blunt: 1 + - type: Shovel + speedModifier: 0.1 # you can try + - type: ReactionMixer + mixMessage: "spoon-mixing-success" + timeToMix: 0.5 + reactionTypes: + - Stir + - type: PhysicalComposition + materialComposition: + CP14Iron: 4 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml index 1eb231403b..ef45a00090 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml @@ -177,6 +177,9 @@ Quantity: 2 - ReagentId: Fat Quantity: 6 + - type: Tag + tags: + - CP14CookedMeatSlice - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -512,6 +515,9 @@ - random: rabbit_meat1_cooked: "" rabbit_meat2_cooked: "" + - type: Tag + tags: + - CP14CookedMeatSlice - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -633,6 +639,9 @@ Quantity: 10 - ReagentId: Fat Quantity: 12 + - type: Tag + tags: + - CP14CookedMeatLeg - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -759,6 +768,9 @@ Quantity: 1 - ReagentId: Fat Quantity: 4 + - type: Tag + tags: + - CP14CookedMeatSlice - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -890,6 +902,9 @@ Quantity: 3 - ReagentId: Fat Quantity: 4 + - type: Tag + tags: + - CP14CookedMeatLeg - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -948,6 +963,9 @@ Quantity: 0.5 - ReagentId: Fat Quantity: 1.5 + - type: Tag + tags: + - CP14CookedMeatSlice - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -1182,4 +1200,4 @@ - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 - transformTo: CP14Ash1 \ No newline at end of file + transformTo: CP14Ash1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat_dish.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat_dish.yml new file mode 100644 index 0000000000..f669fab854 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat_dish.yml @@ -0,0 +1,80 @@ +- type: entity + name: ham in cheese + parent: + - FoodInjectableBase + - CP14BurnsAsh + id: CP14FoodHamCheese + description: Juicy and oozy ham, in cheese and lettuce leaves. Just like in the best restaurants. + categories: [ ForkFiltered ] + components: + - type: FlavorProfile + flavors: + - meaty + - cabbage + - cheesy + - type: SolutionContainerManager + solutions: + food: + maxVol: 32 + reagents: + - ReagentId: Nutriment + Quantity: 13 + - ReagentId: Protein + Quantity: 12 + - ReagentId: Vitamin + Quantity: 2.5 + - type: Sprite + layers: + - sprite: _CP14/Objects/Consumable/Food/plates.rsi + state: plate + - sprite: _CP14/Objects/Consumable/Food/pig_cheese.rsi + state: pig_cheese + - type: Tag + tags: + - Meat + - type: Food + trash: + - CP14Plate + +- type: entity + name: Klanir stuffed pumpkin + parent: + - FoodInjectableBase + - CP14BurnsAsh + id: CP14FoodStuffedPumpkin + description: Pumpkin stuffed with meat and vegetables is very popular among the people of the Kingdom of Klanir. + categories: [ ForkFiltered ] + components: + - type: FlavorProfile + flavors: + - meaty + - pumpkin + - CP14HotPotato + - type: Sprite + layers: + - sprite: _CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi + state: stuffed_pumpkin1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + stuffed_pumpkin1: "" + stuffed_pumpkin2: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: PumpkinFlesh + Quantity: 4 + - ReagentId: Protein + Quantity: 2 + - ReagentId: Nutriment + Quantity: 13 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Fat + Quantity: 6 + - type: Tag + tags: + - Meat diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml deleted file mode 100644 index 157191d52e..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: entity - id: CP14Plate - parent: BaseItem - name: plate - description: This is your plate for a delicious meal! - categories: [ ForkFiltered ] - components: - - type: Sprite - sprite: _CP14/Objects/Consumable/Food/plates.rsi - state: plate - - type: Item - shape: - - 0,0,1,0 - - type: Tag - tags: - - CP14Plate - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 20 # 2 wooden plank in craft - -- type: entity - id: CP14PlatePie - parent: BaseItem - name: pie plate - description: A mould for making a delicious pie. - categories: [ ForkFiltered ] - components: - - type: Sprite - sprite: _CP14/Objects/Consumable/Food/pie.rsi - state: tin - - type: Item - shape: - - 0,0,1,0 - - type: Tag - tags: - - CP14PlatePie - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 # 1 iron bar = 1 plate pie in craft \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/simple_dish.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/simple_dish.yml index 75ca643a46..215bfadcf0 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/simple_dish.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/simple_dish.yml @@ -1,6 +1,8 @@ - type: entity id: CP14FoodPotatoHot - parent: FoodInjectableBase + parent: + - FoodInjectableBase + - CP14BurnsAsh categories: [ ForkFiltered ] name: hot potato description: Warm and ruddy potatoes cooked over the fire. @@ -25,13 +27,79 @@ - type: SolutionContainerManager solutions: food: - maxVol: 11 + maxVol: 8 reagents: - ReagentId: Nutriment - Quantity: 7 + Quantity: 4 - ReagentId: Vitamin Quantity: 2 - - type: CP14TemperatureTransformation - entries: - - temperatureRange: 400, 500 - transformTo: CP14Ash1 + +- type: entity + id: CP14FoodStuffedPotato + parent: + - FoodInjectableBase + - CP14BurnsAsh + categories: [ ForkFiltered ] + name: stuffed potato + description: Baked potatoes stuffed with juicy meat. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - CP14HotPotato + - meaty + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/hot_potato.rsi + layers: + - state: stuffed_potato1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + stuffed_potato1: "" + stuffed_potato2: "" + stuffed_potato3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Protein + Quantity: 1 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Fat + Quantity: 2 + +- type: entity + id: CP14FoodChromiumJelly + parent: + - FoodInjectableBase + - CP14BurnsAsh + categories: [ ForkFiltered ] + name: chromium jelly + description: At first glance unremarkable, but tastier than it looks, the main thing is not to overeat. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - jelly + - type: Sprite + sprite: _CP14/Objects/Consumable/Food/jelly.rsi + layers: + - state: chromium_jelly + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: CP14ChromiumSlime + Quantity: 1 + - ReagentId: Vitamin + Quantity: 6 + - type: Temperature + currentTemperature: 250 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index 80dd236113..3bdc88af61 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -113,6 +113,15 @@ reagents: - ReagentId: CP14ChromiumSlime Quantity: 4 + - type: Temperature + currentTemperature: 250 + - type: InternalTemperature + thickness: 0.02 + area: 0.02 + - type: CP14TemperatureTransformation + entries: + - temperatureRange: 100, 200 + transformTo: CP14FoodChromiumJelly - type: entity id: CP14WildSage diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index f1a2a441f2..1499026d55 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -444,3 +444,70 @@ stack: CP14CopperBar count: 1 result: CP14EnergyCrystalMediumEmpty + +- type: CP14Recipe + id: CP14Fork + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:SkillRequired + skills: + - IronMelting + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14Fork + resultCount: 2 + +- type: CP14Recipe + id: CP14Spoon + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:SkillRequired + skills: + - IronMelting + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14Spoon + resultCount: 2 + +- type: CP14Recipe + id: CP14SteelGobletCopper + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:SkillRequired + skills: + - CopperMelting + - !type:StackResource + stack: CP14CopperBar + count: 1 + result: CP14SteelGobletCopper + +- type: CP14Recipe + id: CP14SteelGobletIron + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:SkillRequired + skills: + - IronMelting + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14SteelGobletIron + +- type: CP14Recipe + id: CP14SteelGobletGold + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:SkillRequired + skills: + - GoldMelting + - !type:StackResource + stack: CP14GoldBar + count: 1 + result: CP14SteelGobletGold diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/meat_dish.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/meat_dish.yml new file mode 100644 index 0000000000..5049ce2f3d --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/meat_dish.yml @@ -0,0 +1,40 @@ +- type: CP14Recipe + id: CP14FoodHamCheese + tag: CP14RecipeCooking + craftTime: 5 + requirements: + - !type:ProtoIdResource + protoId: CP14Plate + - !type:ProtoIdResource + protoId: CP14FoodCabbageSlice + count: 3 + - !type:ProtoIdResource + protoId: CP14FoodCheeseSlice + count: 2 + - !type:TagResource + tag: CP14CookedMeatLeg + count: 1 + title: cp14-recipe-title-meat-cooked-leg + texture: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: different_meat_leg + result: CP14FoodHamCheese + +- type: CP14Recipe + id: CP14FoodStuffedPumpkin + tag: CP14RecipeCooking + craftTime: 5 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPumpkin + - !type:ProtoIdResource + protoId: CP14FoodPotatoHot + count: 2 + - !type:TagResource + tag: CP14CookedMeatSlice + count: 2 + title: cp14-recipe-title-meat-cooked + texture: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: different_meat_slice + result: CP14FoodStuffedPumpkin diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml index 76b1524b70..8a78cd70f4 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml @@ -39,3 +39,19 @@ protoId: CP14FoodDoughMedium count: 1 result: CP14FoodDoughMediumFlat + +- type: CP14Recipe + id: CP14FoodStuffedPotato + tag: CP14RecipeCooking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPotatoHot + - !type:TagResource + tag: CP14CookedMeatSlice + count: 1 + title: cp14-recipe-title-meat-cooked + texture: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: different_meat_slice + result: CP14FoodStuffedPotato diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index d01219b63a..6702261538 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -156,3 +156,9 @@ - type: Tag id: CP14Sandwich + +- type: Tag + id: CP14CookedMeatSlice + +- type: Tag + id: CP14CookedMeatLeg diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/copper_goblet.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/copper_goblet.png new file mode 100644 index 0000000000..15011560ef Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/copper_goblet.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-1.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-1.png new file mode 100644 index 0000000000..ca9b35d530 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-2.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-2.png new file mode 100644 index 0000000000..10e01c7492 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-3.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-3.png new file mode 100644 index 0000000000..0429e29e78 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-4.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-4.png new file mode 100644 index 0000000000..572dbb5163 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-4.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-5.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-5.png new file mode 100644 index 0000000000..6744a10fde Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/fill-5.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/gold_goblet.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/gold_goblet.png new file mode 100644 index 0000000000..bb1b90ab60 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/gold_goblet.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/iron_goblet.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/iron_goblet.png new file mode 100644 index 0000000000..80d20b4b9a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/iron_goblet.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json new file mode 100644 index 0000000000..d6aabc8cd2 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "copper_goblet" + }, + { + "name": "iron_goblet" + }, + { + "name": "gold_goblet" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork-inhand-left.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork-inhand-left.png new file mode 100644 index 0000000000..cb2a4b4c6b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork-inhand-right.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork-inhand-right.png new file mode 100644 index 0000000000..5c65356194 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork.png new file mode 100644 index 0000000000..e74f394de4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/fork.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/meta.json new file mode 100644 index 0000000000..428036783e --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fork" + }, + { + "name": "fork-inhand-left", + "directions": 4 + }, + { + "name": "fork-inhand-right", + "directions": 4 + }, + { + "name": "spoon" + }, + { + "name": "spoon-inhand-left", + "directions": 4 + }, + { + "name": "spoon-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon-inhand-left.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon-inhand-left.png new file mode 100644 index 0000000000..88e2f34027 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon-inhand-right.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon-inhand-right.png new file mode 100644 index 0000000000..c1d3cd9eb4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon.png new file mode 100644 index 0000000000..90dfcf0f7f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cutlery.rsi/spoon.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/meta.json index 979b2dc151..cfd5670ee6 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by Dinazewwr", + "copyright": "Created by Dinazewwr, stuffed_potato by prazat911", "size": { "x": 32, "y": 32 @@ -18,6 +18,15 @@ }, { "name": "base4" + }, + { + "name": "stuffed_potato1" + }, + { + "name": "stuffed_potato2" + }, + { + "name": "stuffed_potato3" } ] } diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato1.png b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato1.png new file mode 100644 index 0000000000..f18e773d24 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato1.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato2.png new file mode 100644 index 0000000000..94e73a7462 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato2.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato3.png b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato3.png new file mode 100644 index 0000000000..6581714a37 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/hot_potato.rsi/stuffed_potato3.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/jelly.rsi/chromium_jelly.png b/Resources/Textures/_CP14/Objects/Consumable/Food/jelly.rsi/chromium_jelly.png new file mode 100644 index 0000000000..c6c5a4010b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/jelly.rsi/chromium_jelly.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/jelly.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/jelly.rsi/meta.json new file mode 100644 index 0000000000..1a08acde1d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/jelly.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "chromium_jelly" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/different_meat_leg.png b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/different_meat_leg.png new file mode 100644 index 0000000000..158db64c30 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/different_meat_leg.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json index 6713b24a90..fb5979b351 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/meat.rsi/meta.json @@ -148,6 +148,9 @@ { "name": "different_meat_slice" }, + { + "name": "different_meat_leg" + }, { "name": "flem_head" }, diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/pig_cheese.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/pig_cheese.rsi/meta.json new file mode 100644 index 0000000000..913f64f2a2 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/pig_cheese.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pig_cheese" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/pig_cheese.rsi/pig_cheese.png b/Resources/Textures/_CP14/Objects/Consumable/Food/pig_cheese.rsi/pig_cheese.png new file mode 100644 index 0000000000..8867db0006 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/pig_cheese.rsi/pig_cheese.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/meta.json new file mode 100644 index 0000000000..d7f1c087f1 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stuffed_pumpkin1" + }, + { + "name": "stuffed_pumpkin2" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/stuffed_pumpkin1.png b/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/stuffed_pumpkin1.png new file mode 100644 index 0000000000..5ef5c4131b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/stuffed_pumpkin1.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/stuffed_pumpkin2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/stuffed_pumpkin2.png new file mode 100644 index 0000000000..4a17852d5c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/stuffed_pumpkin.rsi/stuffed_pumpkin2.png differ