diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl new file mode 100644 index 0000000000..e02b97eede --- /dev/null +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -0,0 +1,3 @@ +flavor-complex-pear = like pears +flavor-base-basic = basic + diff --git a/Resources/Locale/en-US/_NF/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/_NF/nutrition/components/food-sequence.ftl new file mode 100644 index 0000000000..bd66c79e9a --- /dev/null +++ b/Resources/Locale/en-US/_NF/nutrition/components/food-sequence.ftl @@ -0,0 +1 @@ +food-sequence-content-pear = pear diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl new file mode 100644 index 0000000000..2ad481dcba --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -0,0 +1,2 @@ +reagent-name-pumpkin-spice-latte = spiced pumpkin latte +reagent-desc-pumpkin-spice-latte = It's autumn somewhere. Smells like cinnamon and cloves. diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl new file mode 100644 index 0000000000..15840f7cb9 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl @@ -0,0 +1,2 @@ +reagent-name-coffeegrounds = coffee grounds +reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew. diff --git a/Resources/Locale/en-US/_NF/seeds/seeds.ftl b/Resources/Locale/en-US/_NF/seeds/seeds.ftl new file mode 100644 index 0000000000..83771c1832 --- /dev/null +++ b/Resources/Locale/en-US/_NF/seeds/seeds.ftl @@ -0,0 +1,5 @@ +seeds-pear-name = pear +seeds-pear-display-name = pear tree +seeds-coffee-name = coffee +seeds-coffee-display-name = coffee plant + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index bd0990050b..327f0aea5f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -12,6 +12,7 @@ CherrySeeds: 5 ChiliSeeds: 5 CocoaSeeds: 3 + CoffeeSeeds: 5 # Frontier CornSeeds: 5 CottonSeeds: 5 EggplantSeeds: 5 @@ -27,6 +28,7 @@ OnionSeeds: 5 OnionRedSeeds: 5 OrangeSeeds: 5 + PearSeeds: 3 # Frontier PeaSeeds: 5 PoppySeeds: 3 PotatoSeeds: 5 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index 9e2d05dfa0..d1a2f7629e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -174,3 +174,8 @@ amount: !type:RangeNumberSelector range: 1, 5 # End DeltaV additions + # Begin Frontier additions + - id: FoodCoffee # Frontier + amount: !type:RangeNumberSelector + range: 1, 5 + # End Frontier additions diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml new file mode 100644 index 0000000000..f369920131 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml @@ -0,0 +1,98 @@ +- type: entity + name: raw coffee beans + parent: FoodProduceBase + id: FoodCoffeeBeansRaw + description: Green coffee beans, just waiting to be roasted. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Theobromine # Caffeine + Quantity: 1 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans + - type: Tag + tags: + - Fruit + - type: Construction + graph: Coffee + node: start + defaultTarget: light roasted coffee + - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them + - type: Temperature # Temperature components needed to cook the beans + currentTemperature: 290 + - type: InternalTemperature + thickness: 0.008 # 8mm (roughly bean sized) + area: .2 # essentially a giant sheet of beans + +- type: entity + name: light roasted coffee beans + parent: FoodProduceBase + id: FoodCoffeeBeansRoastedLight + description: Cinnamon roast coffee beans. Bright and fruity. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: CoffeeGrounds + Quantity: 5 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-light + - type: Tag + tags: + - Fruit + - type: Construction + graph: Coffee + node: light roasted coffee + defaultTarget: medium roasted coffee + - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them + - type: Temperature # Temperature components needed to cook the beans + - type: InternalTemperature + thickness: 0.008 # 8mm (roughly bean sized) + area: .2 # essentially a giant sheet of beans + conductivity: 1.5 # Arbitrarily chosen + - type: Extractable + grindableSolutionName: food + +- type: entity + name: medium roasted coffee beans + parent: FoodCoffeeBeansRoastedLight + id: FoodCoffeeBeansRoastedMedium + description: City roast coffee beans. Smooth and nutty. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-medium + - type: Construction + graph: Coffee + node: medium roasted coffee + defaultTarget: dark roasted coffee + +- type: entity + name: dark roasted coffee beans + parent: FoodCoffeeBeansRoastedLight + id: FoodCoffeeBeansRoastedDark + description: Viennese roast coffee beans. Smoky and spicy. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + state: produce-beans-dark + - type: Construction + graph: Coffee + node: dark roasted coffee diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml new file mode 100644 index 0000000000..aabc218d6a --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -0,0 +1,144 @@ +- type: entity + name: poached pears + parent: FoodBowlBase + id: FoodMealPoachedPears + description: The classiest use for a can of wine. + components: + - type: FlavorProfile + flavors: + - fruity + - alcohol + - pear + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: poachedpear + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Wine # DeltaV we dont have Flavorol, changed to wine + Quantity: 8 + - type: Tag + tags: + - Fruit + +- type: entity + name: pears belle helene + parent: FoodBowlBase + id: FoodMealPearsBelleHelene + description: The delicate flavor of the immaculate pear drenched in chocolate. + components: + - type: FlavorProfile + flavors: + - chocolate + - pear + - creamy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: bellepear + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 16 # DeltaV increase for lack of flavorol + - ReagentId: Vitamin + Quantity: 12 # DeltaV increase for lack of flavorol + - ReagentId: Theobromine + Quantity: 3 + - type: Tag + tags: + - Fruit + +- type: entity + name: pear muffin + parent: FoodMealBase + id: FoodBakedMuffinPear + description: I won't tell if you just try to pick out the chocolate. + components: + - type: FlavorProfile + flavors: + - chocolate + - muffin + - pear + - type: Sprite + sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi + state: pearmuffin + scale: .75, .75 + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 7 # DeltaV increase for lack of flavorol + - ReagentId: Vitamin + Quantity: 5 # DeltaV increase for lack of flavorol + - ReagentId: Theobromine + Quantity: 1 + - type: Tag + tags: + - Fruit + +- type: entity + name: pear and cheese tart + parent: FoodPieBase + id: FoodTartPearCheese + description: The most sublime pair. + components: + - type: FlavorProfile + flavors: + - sweet + - cheesy + - pear + - type: Sprite + sprite: _NF/Objects/Consumable/Food/Baked/pie.rsi + layers: + - state: tin + - state: pearandcheese + - type: Tag + tags: + - Fruit + - Pie + +- type: entity + name: coffee berries + parent: FoodProduceBase + id: FoodCoffee + description: Red berries encasing coffee beans. + components: + - type: FlavorProfile + flavors: + - bitter + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Theobromine + Quantity: 1 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + - type: Produce + seedId: coffee + - type: Tag + tags: + - Fruit + - type: SpawnItemsOnUse + items: + - id: FoodCoffeeBeansRaw + sound: + path: /Audio/Effects/packetrip.ogg diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml new file mode 100644 index 0000000000..e85a41fdf5 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/produce.yml @@ -0,0 +1,25 @@ +- type: entity + name: pear + parent: FoodProduceBase + id: FoodPear + description: It's peary good. + components: + - type: FlavorProfile + flavors: + - pear + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 5 + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/pear.rsi + - type: Produce + seedId: pear + - type: Tag + tags: + - Fruit diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml new file mode 100644 index 0000000000..ee313969b8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -0,0 +1,75 @@ +- type: entity + parent: SeedBase + name: packet of pear seeds + description: They are peary good for you. + id: PearSeeds + components: + - type: Seed + seedId: pear + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/pear.rsi + +- type: entity + parent: SeedBase + name: packet of coffee seeds + description: Perfect for any self-respecting coffee roaster. + id: CoffeeSeeds + components: + - type: Seed + seedId: coffee + - type: Sprite + sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi + +- type: seed + id: pear + name: seeds-pear-name + noun: seeds-noun-seeds + displayName: seeds-pear-display-name + plantRsi: _NF/Objects/Specific/Hydroponics/pear.rsi + packetPrototype: PearSeeds + productPrototypes: + - FoodPear + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + +- type: seed + id: coffee + name: seeds-coffee-name + noun: seeds-noun-seeds + displayName: seeds-coffee-display-name + plantRsi: _NF/Objects/Specific/Hydroponics/coffee.rsi + packetPrototype: CoffeeSeeds + productPrototypes: + - FoodCoffee + lifespan: 25 + maturation: 9 + production: 1 + yield: 2 + potency: 5 + idealLight: 8 + growthStages: 5 + harvestRepeat: Repeat + waterConsumption: 0.60 + chemicals: + Nutriment: + Min: 2 + Max: 8 + PotencyDivisor: 16 + Theobromine: + Min: 1 + Max: 4 + PotencyDivisor: 25 diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml new file mode 100644 index 0000000000..b353838aa2 --- /dev/null +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -0,0 +1,9 @@ +- type: flavor + id: pear + flavorType: Complex + description: flavor-complex-pear + +- type: flavor + id: basic + flavorType: Base + description: flavor-base-basic diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml new file mode 100644 index 0000000000..6317a70b26 --- /dev/null +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -0,0 +1,25 @@ +- type: reagent + id: PumpkinSpiceLatte + name: reagent-name-pumpkin-spice-latte + parent: BaseDrink + desc: reagent-desc-pumpkin-spice-latte + physicalDesc: reagent-physical-desc-aromatic + flavor: basic + color: "#a45c08" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + - !type:AdjustReagent + reagent: Sugar + amount: 0.2 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi + state: icon_empty + metamorphicMaxFillLevels: 2 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml b/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml new file mode 100644 index 0000000000..28c008bf7d --- /dev/null +++ b/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml @@ -0,0 +1,17 @@ +- type: reagent + id: CoffeeGrounds + name: reagent-name-coffeegrounds + group: Foods + desc: reagent-desc-coffeegrounds + flavor: bitter + color: "#4B382A" + physicalDesc: reagent-physical-desc-powdery + slippery: false + recognizable: true # "Waiter, there seems to be grounds in my coffee." + metabolisms: + Drink: + effects: + - !type:SatiateHunger + factor: 0.1 + - !type:SatiateThirst + factor: -0.25 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml new file mode 100644 index 0000000000..9f2f32d980 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/food/coffee.yml @@ -0,0 +1,40 @@ +# coffee +- type: constructionGraph + id: Coffee + start: start + graph: + + - node: start + edges: + - to: light roasted coffee + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 365 # ~92 C - arbitrarily set to take a while + # - minTemperature: 453 # 180 C + + - node: light roasted coffee + entity: FoodCoffeeBeansRoastedLight + edges: + - to: medium roasted coffee + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 375 # ~102 C - arbitrarily set to take a while + # - minTemperature: 477 # 204 C + + - node: medium roasted coffee + entity: FoodCoffeeBeansRoastedMedium + edges: + - to: dark roasted coffee + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 385 # ~112 C - arbitrarily set to take a while + #- minTemperature: 493 # 220 C + + - node: dark roasted coffee + entity: FoodCoffeeBeansRoastedDark diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml new file mode 100644 index 0000000000..67bb060501 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,48 @@ +- type: microwaveMealRecipe + id: RecipePoachedPears + name: poached pears recipe + result: FoodMealPoachedPears + time: 10 + solids: + FoodBowlBig: 1 + FoodPear: 3 + FoodOrange: 2 + reagents: + Wine: 10 + +- type: microwaveMealRecipe + id: RecipePearsBelleHelene + name: pears belle helene recipe + result: FoodMealPearsBelleHelene + time: 10 + solids: + FoodBowlBig: 1 + FoodPear: 3 + FoodSnackChocolateBar: 2 + FoodLemon: 1 + reagents: + Cream: 5 + +- type: microwaveMealRecipe + id: RecipePearMuffin + name: pear muffin recipe + result: FoodBakedMuffinPear + time: 10 + solids: + FoodPear: 1 + FoodSnackChocolateBar: 1 + reagents: + Flour: 5 + Oats: 5 + Sugar: 5 + +- type: microwaveMealRecipe + id: RecipePearCheeseTart + name: pear and cheese tart recipe + result: FoodTartPearCheese + time: 15 + solids: + FoodPlateTin: 1 + FoodDoughPie: 1 + FoodPear: 2 + FoodChevre: 1 diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml new file mode 100644 index 0000000000..c42381bc3d --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -0,0 +1,24 @@ +- type: reaction + id: Coffee + minTemp: 353 # ~80 deg C + reactants: + Water: + amount: 3 + CoffeeGrounds: + amount: 1 + products: + Coffee: 4 + +- type: reaction + id: PumpkinSpiceLatte + reactants: + CafeLatte: + amount: 3 + PumpkinFlesh: + amount: 1 + Sugar: + amount: 1 + Blackpepper: + amount: 1 + products: + PumpkinSpiceLatte: 6 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-1.png new file mode 100644 index 0000000000..b459537e1c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-2.png new file mode 100644 index 0000000000..63284c562d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon.png new file mode 100644 index 0000000000..63284c562d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon_empty.png new file mode 100644 index 0000000000..5d3e855925 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json new file mode 100644 index 0000000000..6478c39eb9 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by Stagnation (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-left.png new file mode 100644 index 0000000000..f5ed6b39cd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-right.png new file mode 100644 index 0000000000..9e9290dd8c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/meta.json new file mode 100644 index 0000000000..0d0e8bfacf --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Avocado toast by gentlebutter (Discord). Bagel and BagelPoppy were created by DrEnzyme, edited by Dusty Lens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pearmuffin" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/pearmuffin.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/pearmuffin.png new file mode 100644 index 0000000000..9806beaa66 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/pearmuffin.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png new file mode 100644 index 0000000000..23aeffa07a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png new file mode 100644 index 0000000000..01027d3f31 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json new file mode 100644 index 0000000000..1355ee3a5c --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, pearandcheese by dustylens (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "tin" + }, + { + "name": "pearandcheese" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/pearandcheese.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/pearandcheese.png new file mode 100644 index 0000000000..3883f9dbc4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/pearandcheese.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/tin.png b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/tin.png new file mode 100644 index 0000000000..5bdbc10a93 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/tin.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bellepear.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bellepear.png new file mode 100644 index 0000000000..bd9c6376ea Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bellepear.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bowl.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bowl.png new file mode 100644 index 0000000000..9f91f21ff4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/bowl.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json new file mode 100644 index 0000000000..95d0ddb16c --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x, edited by Dusty Lens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bowl" + }, + { + "name": "poachedpear" + }, + { + "name": "bellepear" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/poachedpear.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/poachedpear.png new file mode 100644 index 0000000000..931f576a25 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/poachedpear.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png new file mode 100644 index 0000000000..25c664b4e1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/dead.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png new file mode 100644 index 0000000000..445ba40887 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/harvest.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json new file mode 100644 index 0000000000..343a09ba63 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13. produce, produce-beans and variants created by Stagnation (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "produce-beans" + }, + { + "name": "produce-beans-light" + }, + { + "name": "produce-beans-medium" + }, + { + "name": "produce-beans-dark" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png new file mode 100644 index 0000000000..82cefcec1a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-dark.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png new file mode 100644 index 0000000000..9558a63ca9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-light.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png new file mode 100644 index 0000000000..751b30d35e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans-medium.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png new file mode 100644 index 0000000000..d1fe1a808a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce-beans.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png new file mode 100644 index 0000000000..b19fc35b75 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/produce.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png new file mode 100644 index 0000000000..d598a71786 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/seed.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png new file mode 100644 index 0000000000..5310c00726 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png new file mode 100644 index 0000000000..f75059755f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png new file mode 100644 index 0000000000..0a2428d8cf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png new file mode 100644 index 0000000000..2f8611e951 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png new file mode 100644 index 0000000000..32bffe3407 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi/stage-5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/dead.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/dead.png new file mode 100644 index 0000000000..817c0f4bff Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/dead.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/harvest.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/harvest.png new file mode 100644 index 0000000000..2677f3d39b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/harvest.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/meta.json new file mode 100644 index 0000000000..d4469cef73 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken from https://ninjikin.itch.io/fruit edited by terezi4real github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "harvest" + }, + { + "name": "produce" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/produce.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/produce.png new file mode 100644 index 0000000000..4b8ec004ac Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/produce.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/seed.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/seed.png new file mode 100644 index 0000000000..fd1e43affc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/seed.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-1.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-1.png new file mode 100644 index 0000000000..97245d27f2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-2.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-2.png new file mode 100644 index 0000000000..02222142ce Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-3.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-3.png new file mode 100644 index 0000000000..37bd6d53d1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-4.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-4.png new file mode 100644 index 0000000000..6826f6a32d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-5.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-5.png new file mode 100644 index 0000000000..ca7b73d50a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-6.png b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-6.png new file mode 100644 index 0000000000..3cc0947e34 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi/stage-6.png differ