diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs index 1692f9e609..7f8a0f7cb0 100644 --- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs @@ -49,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Nutrition private bool _defaultToOpened; [ViewVariables(VVAccess.ReadWrite)] - public ReagentUnit TransferAmount { get; [UsedImplicitly] private set; } = ReagentUnit.New(2); + public ReagentUnit TransferAmount { get; [UsedImplicitly] private set; } = ReagentUnit.New(5); [ViewVariables(VVAccess.ReadWrite)] public bool Opened diff --git a/Resources/Audio/Effects/packetrip.ogg b/Resources/Audio/Effects/packetrip.ogg new file mode 100644 index 0000000000..c0f6aaa301 Binary files /dev/null and b/Resources/Audio/Effects/packetrip.ogg differ diff --git a/Resources/Audio/Items/eating_1.ogg b/Resources/Audio/Items/eating_1.ogg new file mode 100644 index 0000000000..68942cd3d1 Binary files /dev/null and b/Resources/Audio/Items/eating_1.ogg differ diff --git a/Resources/Audio/Items/eating_2.ogg b/Resources/Audio/Items/eating_2.ogg new file mode 100644 index 0000000000..332dbb056f Binary files /dev/null and b/Resources/Audio/Items/eating_2.ogg differ diff --git a/Resources/Audio/Items/eating_3.ogg b/Resources/Audio/Items/eating_3.ogg new file mode 100644 index 0000000000..3174dc6cf5 Binary files /dev/null and b/Resources/Audio/Items/eating_3.ogg differ diff --git a/Resources/Audio/Items/pop.ogg b/Resources/Audio/Items/pop.ogg new file mode 100644 index 0000000000..aca8c7ade4 Binary files /dev/null and b/Resources/Audio/Items/pop.ogg differ diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 866c47ce2d..573ee07c2d 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -428,14 +428,14 @@ entities: parent: 853 type: Transform - uid: 44 - type: FoodBananaCreamPie + type: FoodPieBananaCream components: - rot: 4.371139006309477E-08 rad pos: -18.509874,-9.279623 parent: 853 type: Transform - uid: 45 - type: FoodBananaCreamPie + type: FoodPieBananaCream components: - rot: 4.371139006309477E-08 rad pos: -18.947374,-9.467123 @@ -672,7 +672,7 @@ entities: parent: 853 type: Transform - uid: 75 - type: FoodDonkPocket + type: FoodDonkpocket components: - pos: 33.274685,-1.5622956 parent: 853 @@ -699,7 +699,7 @@ entities: parent: 853 type: Transform - uid: 79 - type: FoodDonkPocket + type: FoodDonkpocket components: - pos: 33.66531,-1.3435456 parent: 853 @@ -942,7 +942,7 @@ entities: - caps: Refillable, Drainable type: SolutionContainer - uid: 114 - type: BoxDonkpocket + type: FoodBoxDonkpocket components: - pos: -7.4998503,-29.362736 parent: 853 @@ -1041,7 +1041,7 @@ entities: parent: 853 type: Transform - uid: 127 - type: BoxDonkpocket + type: FoodBoxDonkpocket components: - pos: 33.477264,-2.2359364 parent: 853 @@ -42315,7 +42315,7 @@ entities: parent: 853 type: Transform - uid: 4254 - type: BoxDonkpocket + type: FoodBoxDonkpocket components: - pos: -5.4874,13.702112 parent: 853 diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/food.yml b/Resources/Prototypes/Catalog/Fills/Boxes/food.yml deleted file mode 100644 index d25023a859..0000000000 --- a/Resources/Prototypes/Catalog/Fills/Boxes/food.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - name: donkpocket box - parent: BoxBase - id: BoxDonkpocket - description: 'Instructions: Heat in microwave. Product will cool if not eaten within seven minutes.' - components: - - type: StorageFill - contents: - - name: FoodDonkPocket - amount: 6 - - type: Sprite - sprite: Objects/Storage/donkpocket.rsi - state: icon - - type: Item - color: "#951710" - sprite: Objects/Storage/donkpocket.rsi - - type: Storage - capacity: 30 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 775b90313f..b8dd14cf7a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -103,7 +103,7 @@ components: - type: StorageFill contents: - - name: FoodContainerMonkeyCubeBox + - name: MonkeyCubeBox amount: 1 diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index a0d00475b2..8044af1e58 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -8,13 +8,13 @@ contents: - name: ClothingMaskBreath amount: 2 - - name: FoodChocolateBar + - name: FoodSnackChocolate - name: FlashlightLantern amount: 2 - name: HarmonicaInstrument prob: 0.15 orGroup: HarmonicaOrChocolate - - name: FoodChocolateBar + - name: FoodSnackChocolate orGroup: HarmonicaOrChocolate - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index c65688972b..f054d79d21 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -31,7 +31,7 @@ - type: StorageFill contents: - name: CrowbarRed - - name: FoodContainerMonkeyCubeBox + - name: MonkeyCubeBox - name: SprayBottleWater - name: ReagentContainerFlour diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml index bcab1ee12c..0add1dbc99 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml @@ -4,17 +4,8 @@ description: A vending machine containing discount snacks from the infamous 'Discount Dan' franchise. spriteName: discount startingInventory: - Food4NoRaisins: 10 - FoodCandy: 10 - FoodCandyCorn: 2 - FoodCheesieHonkers: 5 - FoodChips: 5 - FoodCookie: 2 - FoodDonut: 1 - FoodFrostedDonut: 1 - FoodHotdog: 2 - FoodLiquidFood: 1 - FoodSosJerky: 5 - FoodSpaceTwinkie: 3 - FoodSyndiCakes: 2 - + FoodSnackCheesie: 3 + FoodSnackChips: 3 + FoodSnackBoritos: 2 + FoodSnackPopcorn: 1 + FoodSnackEnergybar: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index b18bb2402d..d52a96a3a3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -8,8 +8,8 @@ Handcuffs: 8 GrenadeFlashBang: 4 Flash: 5 - FoodDonut: 12 - FoodContainerDonutBox: 2 + FoodDonutHomer: 12 + FoodBoxDonut: 2 FlashlightLantern: 4 #seclite ClothingEyesGlassesSunglasses: 2 ClothingBeltSecurityWebbing: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index 6a3ba024de..6397a046dd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -1,13 +1,11 @@ - type: vendingMachineInventory id: GetmoreChocolateCorpInventory name: Getmore Chocolate Corp - description: "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars." + description: A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars. animationDuration: 0.5 spriteName: snack startingInventory: - Food4NoRaisins: 4 - FoodCandy: 4 - FoodCandyCorn: 4 - FoodPopcorn: 4 - FoodSpaceTwinkie: 8 - FoodSyndiCakes: 4 + FoodSnackRaisins: 2 + FoodSnackChocolate: 2 + FoodSnackPopcorn: 2 + FoodSnackSyndi: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml index 6029aeb5f8..4a7931cd44 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml @@ -6,26 +6,24 @@ - type: Sprite layers: - state: red - - texture: Objects/Consumable/Trash/candy.rsi/icon.png + - texture: Objects/Consumable/Food/snacks.rsi/pistachio-trash.png - type: RandomSpawner rarePrototypes: - PuddleVomit - - TrashPlate - - TrashSnackBowl + - FoodPlateSmallTrash + - FoodBowlBigTrash rareChance: 0.03 prototypes: - - TrashRaisins - - TrashCandy - - TrashCheesieHonkers - - TrashChips - - TrashLiquidFood - - TrashPistachiosPack - - TrashPlasticBag - - TrashPopcorn - - TrashSemkiPack - - TrashSOSJerky - - TrashSyndiCakes - - TrashTastyBread +# - TrashCandy + - FoodPacketCheesieTrash + - FoodPacketChipsTrash + - FoodPacketPistachioTrash +# - TrashPlasticBag + - FoodPacketPopcornTrash + - FoodPacketRaisinsTrash + - FoodPacketSemkiTrash + - FoodPacketSusTrash + - FoodPacketSyndiTrash chance: 0.5 offset: 0.2 placement: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml new file mode 100644 index 0000000000..5154e389c5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -0,0 +1,345 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodBreadBase + abstract: true + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/Baked/bread.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 20 + +- type: entity + parent: FoodBreadBase + id: FoodBreadSliceBase + abstract: true + components: + - type: SolutionContainer + maxVol: 7 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 7 + +# Custom Bread Example + +- type: entity + name: volcanic loaf + parent: FoodBreadBase + id: FoodBreadVolcanic + description: A dark loaf. Resembles pumice. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: alpha + color: "#281415" + - state: alpha-filling + color: "#FF613F" + - type: SliceableFood + slice: FoodBreadVolcanicSlice + +- type: entity + name: volcanic slice + parent: FoodBreadSliceBase + id: FoodBreadVolcanicSlice + description: A slice of dark loaf. Resembles pumice. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: alpha-slice + color: "#281415" + - state: alpha-slice-filling + color: "#FF613F" + +# Bread + +- type: entity + name: bread + parent: FoodBreadBase + id: FoodBreadPlain + description: Some plain old earthen bread. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: plain + - type: SliceableFood + slice: FoodBreadPlainSlice + +- type: entity + name: bread slice + parent: FoodBreadSliceBase + id: FoodBreadPlainSlice + description: A slice of home. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: plain-slice + +- type: entity + name: meatbread loaf + parent: FoodBreadBase + id: FoodBreadMeat + description: The culinary base of every self-respecting eloquen/tg/entleman. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: meat + - type: SliceableFood + slice: FoodBreadMeatSlice +# Tastes like bread, meat. + +- type: entity + name: meatbread slice + parent: FoodBreadSliceBase + id: FoodBreadMeatSlice + description: A slice of delicious meatbread. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: meat-slice + +- type: entity + name: xeno-meat bread + parent: FoodBreadBase + id: FoodBreadMeatXeno + description: Reassuringly green meatloaf made from xeno meat. Extra heretical. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: xenomeat + - type: SliceableFood + slice: FoodBreadMeatXenoSlice +# Tastes like bread, acid. + +- type: entity + name: xeno-meatbread slice + parent: FoodBreadSliceBase + id: FoodBreadMeatXenoSlice + description: A slice of delicious meatbread. Extra heretical. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: xenomeat-slice + +- type: entity + name: spider-meatbread + parent: FoodBreadBase + id: FoodBreadMeatSpider + description: Reassuringly green meatloaf made from spider meat. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: spidermeat + - type: SliceableFood + slice: FoodBreadMeatSpiderSlice +# Tastes like bread, cobwebs. + +- type: entity + name: spider-meatbread slice + parent: FoodBreadSliceBase + id: FoodBreadMeatSpiderSlice + description: A slice of meatloaf made from an animal that most likely still wants you dead. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: spidermeat-slice + +- type: entity + name: banana-nut bread + parent: FoodBreadBase + id: FoodBreadBanana + description: A heavenly and filling treat. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: banana + - type: SliceableFood + slice: FoodBreadBananaSlice +# Tastes like bread, banana, nut. + +- type: entity + name: banana-nut bread slice + parent: FoodBreadSliceBase + id: FoodBreadBananaSlice + description: A slice of delicious banana bread. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: banana-slice + +- type: entity + name: tofu bread + parent: FoodBreadBase + id: FoodBreadTofu + description: Like meatbread but for vegetarians. Brag to your crewmates about how much better it is. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: tofu + - type: SliceableFood + slice: FoodBreadTofuSlice +# Tastes like bread, tofu. + +- type: entity + name: tofu bread slice + parent: FoodBreadSliceBase + id: FoodBreadTofuSlice + description: A slice of delicious tofu bread. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: tofu-slice + +- type: entity + name: cream cheese bread + parent: FoodBreadBase + id: FoodBreadCreamcheese + description: Yum yum yum! + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: creamcheese + - type: SliceableFood + slice: FoodBreadCreamcheeseSlice +# Tastes like bread, cheese. + +- type: entity + name: cream cheese bread slice + parent: FoodBreadSliceBase + id: FoodBreadCreamcheeseSlice + description: A slice of yum! + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: creamcheese-slice + +- type: entity + name: mimana bread + parent: FoodBreadBase + id: FoodBreadMimana + description: Best eaten in silence. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: mimana + - type: SliceableFood + slice: FoodBreadMimanaSlice +# Tastes like bread, cheese. + +- type: entity + name: Mimana bread slice + parent: FoodBreadSliceBase + id: FoodBreadMimanaSlice + description: A slice of silence! + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: mimana-slice + +# Other than bread/slices + +- type: entity + name: moldy slice + parent: FoodBreadSliceBase + id: FoodBreadMoldySlice + description: Entire stations have been ripped apart over arguing whether this is still good to eat. + components: + - type: Sprite + layers: + - state: plate + - state: moldy-slice +# Tastes like decaying fungus. + +- type: entity + name: baguette + parent: FoodBreadBase + id: FoodBreadBaguette + description: Bon appétit! + components: + - type: Sprite + state: baguette +# Tastes like France. + +- type: entity + name: garlic bread + parent: FoodBreadSliceBase + id: FoodBreadGarlicSlice + description: Alas, it is limited. + components: + - type: Sprite + layers: + - state: plate + - state: garlic-slice +# Tastes like garlic, Italy. + +- type: entity + name: buttered toast + parent: FoodBreadSliceBase + id: FoodBreadButteredToast + description: Crunchy. + components: + - type: Sprite + state: buttered-toast +# Tastes like bread, butter. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml new file mode 100644 index 0000000000..5f792c0c8e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -0,0 +1,507 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodCakeBase + abstract: true + components: + - type: Food + trash: FoodPlate + - type: Sprite + sprite: Objects/Consumable/Food/Baked/cake.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 20 + +- type: entity + parent: FoodCakeBase + id: FoodCakeSliceBase + abstract: true + description: Just a slice of cake, it is enough for everyone. + components: + - type: Food + trash: FoodPlateSmall + - type: SolutionContainer + maxVol: 7 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 7 + +# Custom Cake Example + +- type: entity + name: blueberry cake + parent: FoodCakeBase + id: FoodCakeBlueberry + description: Stains your teeth. + components: + - type: Sprite + layers: + - state: plate + - state: plain + - state: alpha-filling + color: blue + - type: SliceableFood + slice: FoodCakeBlueberrySlice + +- type: entity + name: blueberry slice + parent: FoodCakeSliceBase + id: FoodCakeBlueberrySlice + description: Stains your teeth. + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice + - state: alpha-slice-filling + color: blue + +# Cake + +- type: entity + name: cake + parent: FoodCakeBase + id: FoodCakePlain + description: A plain cake, not a lie. + components: + - type: Sprite + layers: + - state: plate + - state: plain + - type: SliceableFood + slice: FoodCakePlainSlice + +- type: entity + name: slice of cake + parent: FoodCakeSliceBase + id: FoodCakePlainSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice +# Tastes like sweetness, cake. + +- type: entity + name: carrot cake + parent: FoodCakeBase + id: FoodCakeCarrot + description: A favorite desert of a certain wascally wabbit. + components: + - type: Sprite + layers: + - state: plate + - state: carrot + - type: SliceableFood + slice: FoodCakeCarrotSlice + +- type: entity + name: slice of carrot cake + parent: FoodCakeSliceBase + id: FoodCakeCarrotSlice + description: Carrotty slice of carrot cake. Carrots are good for your eyes! + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: carrot-slice +# Tastes like sweetness, cake, carrot. + +- type: entity + name: brain cake + parent: FoodCakeBase + id: FoodCakeBrain + description: A squishy cake-thing. + components: + - type: Sprite + layers: + - state: plate + - state: brain + - type: SliceableFood + slice: FoodCakeBrainSlice + +- type: entity + name: slice of brain cake + parent: FoodCakeSliceBase + id: FoodCakeBrainSlice + description: Lemme tell you something about prions. THEY'RE DELICIOUS. + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: brain-slice +# Tastes like sweetness, cake, brains. + +- type: entity + name: cheese cake + parent: FoodCakeBase + id: FoodCakeCheese + description: DANGEROUSLY cheesy. + components: + - type: Sprite + layers: + - state: plate + - state: cheese + - type: SliceableFood + slice: FoodCakeCheeseSlice + +- type: entity + name: slice of cheese cake + parent: FoodCakeSliceBase + id: FoodCakeCheeseSlice + description: Slice of pure cheestisfaction. + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: cheese-slice +# Tastes like sweetness, cream cheese. + +- type: entity + name: orange cake + parent: FoodCakeBase + id: FoodCakeOrange + description: A cake with added orange. + components: + - type: Sprite + layers: + - state: plate + - state: orange + - type: SliceableFood + slice: FoodCakeOrangeSlice + +- type: entity + name: slice of orange cake + parent: FoodCakeSliceBase + id: FoodCakeOrangeSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: orange-slice +# Tastes like sweetness, cake, oranges. + +- type: entity + name: lime cake + parent: FoodCakeBase + id: FoodCakeLime + description: A cake with added lime. + components: + - type: Sprite + layers: + - state: plate + - state: lime + - type: SliceableFood + slice: FoodCakeLimeSlice + +- type: entity + name: slice of lime cake + parent: FoodCakeSliceBase + id: FoodCakeLimeSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: lime-slice +# Tastes like sweetness, cake, limes. + +- type: entity + name: lemon cake + parent: FoodCakeBase + id: FoodCakeLemon + description: A cake with added lemon. + components: + - type: Sprite + layers: + - state: plate + - state: lemon + - type: SliceableFood + slice: FoodCakeLemonSlice + +- type: entity + name: slice of lemon cake + parent: FoodCakeSliceBase + id: FoodCakeLemonSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: lemon-slice +# Tastes like sweetness, cake, lemons. + +- type: entity + name: chocolate cake + parent: FoodCakeBase + id: FoodCakeChocolate + description: A cake with added chocolate. + components: + - type: Sprite + layers: + - state: plate + - state: chocolate + - type: SliceableFood + slice: FoodCakeChocolateSlice + +- type: entity + name: slice of chocolate cake + parent: FoodCakeSliceBase + id: FoodCakeChocolateSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: chocolate-slice +# Tastes like sweetness, cake, chocolate. + +- type: entity + name: apple cake + parent: FoodCakeBase + id: FoodCakeApple + description: A cake centred with apple. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: apple + - type: SliceableFood + slice: FoodCakeAppleSlice + +- type: entity + name: slice of apple cake + parent: FoodCakeSliceBase + id: FoodCakeAppleSlice + description: A slice of heavenly cake. + components: + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: apple-slice +# Tastes like sweetness, cake, slime. + +- type: entity + name: slime cake + parent: FoodCakeBase + id: FoodCakeSlime + description: A cake made of slimes. Probably not electrified. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: slime + - type: SliceableFood + slice: FoodCakeSlimeSlice + +- type: entity + name: slice of slime cake + parent: FoodCakeSliceBase + id: FoodCakeSlimeSlice + description: A slice of slime cake. + components: + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: slime-slice +# Tastes like sweetness, cake, slime. + +- type: entity + name: pumpkin-spice cake + parent: FoodCakeBase + id: FoodCakePumpkin + description: A hollow cake with real pumpkin. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: pumpkinspice + - type: SliceableFood + slice: FoodCakePumpkinSlice + +- type: entity + name: slice of pumpkin-spice cake + parent: FoodCakeSliceBase + id: FoodCakePumpkinSlice + description: A spicy slice of pumpkin goodness. + components: + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: pumpkinspice-slice +# Tastes like sweetness, cake, pumpkin. + +- type: entity + name: christmas cake + parent: FoodCakeBase + id: FoodCakeChristmas + description: A cake made of christmas. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: christmas + - type: SliceableFood + slice: FoodCakeChristmasSlice + +- type: entity + name: slice of christmas cake + parent: FoodCakeSliceBase + id: FoodCakeChristmasSlice + components: + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: christmas-slice +# Tastes like sweetness, cake, christmas. + +- type: entity + name: birthday cake + parent: FoodCakeBase + id: FoodCakeBirthday + description: Happy Birthday little clown... + components: + - type: Food + trash: FoodPlatePlastic + - type: Sprite + layers: + - state: plate-plastic + - state: birthday + - type: SliceableFood + slice: FoodCakeBirthdaySlice + +- type: entity + name: slice of birthday cake + parent: FoodCakeSliceBase + id: FoodCakeBirthdaySlice + description: A slice of your birthday. + components: + - type: Food + trash: FoodPlateSmallPlastic + - type: Sprite + layers: + - state: plate-small-plastic + - state: birthday-slice +# Tastes like sweetness, cake, christmas. + +- type: entity + name: vanilla cake + parent: FoodCakeBase + id: FoodCakeVanilla + description: A vanilla frosted cake. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: vanilla + - type: SliceableFood + slice: FoodCakeVanillaSlice + +- type: entity + name: slice of vanilla cake + parent: FoodCakeSliceBase + id: FoodCakeVanillaSlice + description: A slice of vanilla frosted cake. + components: + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: vanilla-slice +# Tastes like sweetness, cake, vanilla. + +- type: entity + name: clown cake + parent: FoodCakeBase + id: FoodCakeClown + description: A funny cake with a clown face on it. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: clown + - type: SliceableFood + slice: FoodCakeClownSlice + +- type: entity + name: slice of clown cake + parent: FoodCakeSliceBase + id: FoodCakeClownSlice + description: A slice of bad jokes, and silly props. + components: + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: clown-slice +# Tastes like sweetness, cake, clown. + +- type: entity + name: spaceman's cake + parent: FoodCakeBase + id: FoodCakeSpaceman + description: A spaceman's trumpet frosted cake. + components: + - type: Food + trash: FoodPlate + - type: Sprite + layers: + - state: plate + - state: trumpet + - type: SliceableFood + slice: FoodCakeSpacemanSlice + +- type: entity + name: slice of spaceman's cake + parent: FoodCakeSliceBase + id: FoodCakeSpacemanSlice + description: A spaceman's trumpet frosted cake. + components: + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: trumpet-slice +# Tastes like sweetness, cake, jam. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml new file mode 100644 index 0000000000..814a195790 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -0,0 +1,217 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodDonkpocketBase + abstract: true + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + netsync: false + - type: SolutionContainer + maxVol: 10 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - type: Item + size: 1 + +# Donkpocket + +# Warm gives +5 nutriment. + +- type: entity + name: donk-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocket + description: The food of choice for the seasoned traitor. + components: + - type: Sprite + state: plain + +- type: entity + name: warm donk-pocket + parent: FoodDonkpocket + id: FoodDonkpocketWarm + description: The heated food of choice for the seasoned traitor. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 7 + +- type: entity + name: dank-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketDank + description: The food of choice for the seasoned botanist. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + state: dank + +- type: entity + name: warm dank-pocket + parent: FoodDonkpocketDank + id: FoodDonkpocketDankWarm + description: The heated food of choice for the seasoned botanist. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: spicy-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketSpicy + description: The classic snack food, now with a heat-activated spicy flair. + components: + - type: Sprite + state: plain + +- type: entity + name: warm spicy-pocket + parent: FoodDonkpocketDank + id: FoodDonkpocketSpicyWarm + description: The classic snack food, now maybe a bit too spicy. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: Sprite + state: spicy + +- type: entity + name: teriyaki-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketTeriyaki + description: An East Asian take on the classic stationside snack. + components: + - type: Sprite + state: teriyaki + +- type: entity + name: warm teriyaki-pocket + parent: FoodDonkpocketTeriyaki + id: FoodDonkpocketTeriyakiWarm + description: An East Asian take on the classic stationside snack, now steamy and warm. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: pizza-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketPizza + description: Delicious, cheesy and surprisingly filling. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: Sprite + state: pizza + +- type: entity + name: warm pizza-pocket + parent: FoodDonkpocketPizza + id: FoodDonkpocketPizzaWarm + description: An East Asian take on the classic stationside snack, now steamy and warm. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: honk-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketHonk + description: The award-winning donk-pocket that won the hearts of clowns and humans alike. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + state: banana + +- type: entity + name: warm honk-pocket + parent: FoodDonkpocketHonk + id: FoodDonkpocketHonkWarm + description: The award-winning donk-pocket, now warm and toasty. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: berry-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketBerry + description: A relentlessly sweet donk-pocket first created for use in Operation Iraqi Freedom. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + state: berry + +- type: entity + name: warm berry-pocket + parent: FoodDonkpocketBerry + id: FoodDonkpocketBerryWarm + description: A relentlessly sweet donk-pocket, now warm and delicious. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: gondola-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketGondola + description: The choice to use real gondola meat in the recipe is controversial, to say the least. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + state: gondola + +- type: entity + name: warm gondola-pocket + parent: FoodDonkpocketGondola + id: FoodDonkpocketGondolaWarm + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml new file mode 100644 index 0000000000..32623c81ea --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -0,0 +1,291 @@ +# Base + +- type: Tag + id: Donut + +- type: entity + parent: BaseItem + id: FoodDonutBase + abstract: true + description: Goes great with robust coffee. + components: + - type: Food + - type: Tag + tags: + - Donut + - type: Sprite + sprite: Objects/Consumable/Food/Baked/donut.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 5 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - type: Item + sprite: Objects/Consumable/Food/Baked/donut.rsi + size: 1 +# Tastes like donut. + +# The sprinkles are now an overlay, so you can put them on any donut! If we really +# wanted to go for EXTREME roleplay we could apply a different color to the sprinkles +# Since it's technically an alpha layer. + +# You'll be able to bake the plain donuts, then mix up different glazes for them to +# apply with a brush or something. + +# Plain Donuts + +- type: entity + name: plain donut + parent: FoodDonutBase + id: FoodDonutPlain + components: + - type: Sprite + state: plain + +- type: entity + name: plain jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyPlain + components: + - type: Sprite + state: jelly-plain + +# Donuts + +- type: entity + name: donut + parent: FoodDonutBase + id: FoodDonutHomer + components: + - type: Sprite + state: homer + - type: Item + HeldPrefix: pink + +- type: entity + name: chaos donut + parent: FoodDonutBase + id: FoodDonutChaos + description: Like life, it never quite tastes the same. + components: + - type: Sprite + state: chaos +# Tastes like donut, chaos. + +- type: entity + name: meat donut + parent: FoodDonutBase + id: FoodDonutMeat + description: Tastes as gross as it looks. + components: + - type: Sprite + state: meat +# Tastes like meat. + +- type: entity + name: pink donut + parent: FoodDonutBase + id: FoodDonutPink + description: Goes great with a soy latte. + components: + - type: Sprite + state: pink + - type: Item + HeldPrefix: pink + +- type: entity + name: spaceman's donut + parent: FoodDonutBase + id: FoodDonutSpaceman + description: Goes great with a cold beaker of malk. + components: + - type: Sprite + state: purple +# Tastes like donut, violets. + +- type: entity + name: apple donut + parent: FoodDonutBase + id: FoodDonutApple + description: Goes great with a shot of cinnamon schnapps. + components: + - type: Sprite + state: green +# Tastes like donut, green apples. + +- type: entity + name: caramel donut + parent: FoodDonutBase + id: FoodDonutCaramel + description: Goes great with a mug of hot coco. + components: + - type: Sprite + state: beige +# Tastes like donut, buttery sweetness. + +- type: entity + name: chocolate donut + parent: FoodDonutBase + id: FoodDonutChocolate + description: Goes great with a glass of warm milk. + components: + - type: Sprite + state: choc +# Tastes like donut, bitterness. + +- type: entity + name: blumpkin donut + parent: FoodDonutBase + id: FoodDonutBlumpkin + description: Goes great with a mug of soothing drunken blumpkin. + components: + - type: Sprite + state: blue +# Tastes like donut, blumpkin. + +- type: entity + name: bungo donut + parent: FoodDonutBase + id: FoodDonutBungo + description: Goes great with a mason jar of hippie's delight. + components: + - type: Sprite + state: yellow +# Tastes like donut, tropical sweetness. + +- type: entity + name: matcha donut + parent: FoodDonutBase + id: FoodDonut + description: The L-theanine in this donut is relaxing, yet not euphoric. Goes great with a cup of tea. + components: + - type: Sprite + state: olive +# Tastes like donut, matcha. + +- type: entity + name: sweet pea donut + parent: FoodDonutBase + id: FoodDonutSweetpea + description: Goes great with a bottle of Bastion Burbon! + components: + - type: Sprite + state: laugh +# Tastes like donut, fizzy tutti frutti. + +# Jelly Donuts + +- type: entity + name: jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyHomer + description: You jelly? + components: + - type: Sprite + state: jelly-homer + - type: Item + HeldPrefix: pink + +- type: entity + name: pink jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyPink + description: Goes great with a soy latte. + components: + - type: Sprite + state: jelly-pink + - type: Item + HeldPrefix: pink + +- type: entity + name: spaceman's jelly-donut + parent: FoodDonutBase + id: FoodDonutJellySpaceman + description: Goes great with a cold beaker of malk. + components: + - type: Sprite + state: jelly-purple +# Tastes like jelly-donut, violets. + +- type: entity + name: apple jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyApple + description: Goes great with a shot of cinnamon schnapps. + components: + - type: Sprite + state: jelly-green +# Tastes like jelly-donut, green apples. + +- type: entity + name: caramel jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyCaramel + description: Goes great with a mug of hot coco. + components: + - type: Sprite + state: jelly-beige +# Tastes like jelly-donut, buttery sweetness. + +- type: entity + name: chocolate jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyChocolate + description: Goes great with a glass of warm milk. + components: + - type: Sprite + state: jelly-choc +# Tastes like jelly-donut, bitterness. + +- type: entity + name: blumpkin jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyBlumpkin + description: Goes great with a mug of soothing drunken blumpkin. + components: + - type: Sprite + state: jelly-blue +# Tastes like jelly-donut, blumpkin. + +- type: entity + name: bungo jelly-donut + parent: FoodDonutBase + id: FoodDonutJellyBungo + description: Goes great with a mason jar of hippie's delight. + components: + - type: Sprite + state: jelly-yellow +# Tastes like jelly-donut, tropical sweetness. + +- type: entity + name: matcha jelly-donut + parent: FoodDonutBase + id: FoodDonutJelly + description: The L-theanine in this jelly-donut is relaxing, yet not euphoric. Goes great with a cup of tea. + components: + - type: Sprite + state: jelly-olive +# Tastes like jelly-donut, matcha. + +- type: entity + name: sweet pea jelly-donut + parent: FoodDonutBase + id: FoodDonutJellySweetpea + description: Goes great with a bottle of Bastion Burbon! + components: + - type: Sprite + state: jelly-laugh +# Tastes like jelly-donut, fizzy tutti frutti. + +- type: entity + name: slugcat jelly-donut + parent: FoodDonutBase + id: FoodDonutJellySlugcat + description: No holes in this donut incase a suspicious looking pole shows up. + components: + - type: Sprite + state: jelly-slug +# Tastes like jelly-donut, fizzy tutti frutti. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml new file mode 100644 index 0000000000..d697dd849f --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -0,0 +1,326 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodBakedBase + abstract: true + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/Baked/misc.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 5 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Item + size: 1 + +# Muffins/Buns + +- type: entity + name: muffin + parent: FoodBakedBase + id: FoodBakedMuffin + description: A delicious and spongy little cake. + components: + - type: Sprite + state: muffin + +- type: entity + name: berry muffin + parent: FoodBakedBase + id: FoodBakedMuffinBerry + description: A delicious and spongy little cake, with berries. + components: + - type: Sprite + state: muffin-berry + +- type: entity + name: cherry muffin + parent: FoodBakedBase + id: FoodBakedMuffinCherry + description: A sweet muffin with cherry bits. + components: + - type: Sprite + state: muffin-cherry + +- type: entity + name: bluecherry muffin + parent: FoodBakedBase + id: FoodBakedMuffinBluecherry + description: Blue cherries inside a delicious muffin. + components: + - type: Sprite + state: muffin-bluecherry + +- type: entity + name: honey bun + parent: FoodBakedBase + id: FoodBakedBunHoney + description: A sticky pastry bun glazed with honey. + components: + - type: Sprite + state: bun-honey + +- type: entity + name: hotcross bun + parent: FoodBakedBase + id: FoodBakedBunHotX + description: A sticky pastry bun glazed with a distinct white cross. + components: + - type: Sprite + state: bun-hotcross + +- type: entity + name: meat bun + parent: FoodBakedBase + id: FoodBakedBunMeat + description: Has the potential to not be dog. + components: + - type: Sprite + state: bun-meat + +# Cookies + +- type: entity + name: cookie + parent: FoodBakedBase + id: FoodBakedCookie + description: COOKIE!!! + components: + - type: Sprite + state: COOKIE!!! + +- type: entity + name: fortune cookie + parent: FoodBakedBase + id: FoodBakedCookieFortune + description: A true prophecy in each cookie! + components: + # - Food: + # trash: PaperFortune + - type: Sprite + state: cookie-fortune + +- type: entity + name: oatmeal cookie + parent: FoodBakedBase + id: FoodBakedCookieOatmeal + description: The best of both cookie and oat. + components: + - type: Sprite + state: cookie-oatmeal + +- type: entity + name: raisin cookie + parent: FoodBakedBase + id: FoodBakedCookieRaisin + description: Why would you put raisins in a cookie? + components: + - type: Sprite + state: cookie-raisin + +- type: entity + name: sugar cookie + parent: FoodBakedBase + id: FoodBakedCookieSugar + description: Just like your mom used to make. + components: + - type: Sprite + state: cookie-sugar + +# Nuggets + +- type: Tag + id: Nugget + +- type: entity + name: chicken nugget + parent: FoodBakedBase + id: FoodBakedNugget + description: A "chicken" nugget vaguely shaped into an object. # Should change depending on name. + components: + - type: Tag + tags: + - Nugget + - type: Sprite + sprite: Objects/Consumable/Food/Baked/nuggets.rsi + state: tendie + netsync: true + - type: RandomSpriteState + spriteStates: + - tendie + - lizard + - star + - corgi + +# Waffles/Pancakes + +# Once StackVisualizer is updated you should be able to mix/match stacks of pancakes. + +- type: entity + name: pancake + parent: FoodBakedBase + id: FoodBakedPancake + description: A fluffy pancake. The softer, superior relative of the waffle. + components: + # - type: Food + # trash: FoodPlateSmall + - type: Stack + stackType: Pancake + max: 9 + count: 1 + - type: Sprite + state: pancakes1 + # - type: Sprite + # layers: + # - state: plate-small + # - state: pancakes1 + - type: Appearance + visuals: + - type: StackVisualizer + composite: true + stackLayers: + - pancakes1 + - pancakes2 + - pancakes3 + - pancakes4 + - pancakes5 + - pancakes6 + - pancakes7 + - pancakes8 + - pancakes9 + +- type: entity + name: blueberry pancake + parent: FoodBakedBase + id: FoodBakedPancakeBb + description: A fluffy and delicious blueberry pancake. + components: + # - type: Food + # trash: FoodPlateSmall + - type: Stack + stackType: Pancake + max: 3 + count: 1 + - type: Sprite + state: pancakesbb1 + # - type: Sprite + # layers: + # - state: plate-small + # - state: pancakesbb1 + - type: Appearance + visuals: + - type: StackVisualizer + composite: true + stackLayers: + - pancakesbb1 + - pancakesbb2 + - pancakesbb3 + +- type: entity + name: chocolate chip pancake + parent: FoodBakedBase + id: FoodBakedPancakeCc + description: A fluffy and delicious chocolate chip pancake. + components: + # - type: Food + # trash: FoodPlateSmall + - type: Stack + stackType: Pancake + max: 3 + count: 1 + - type: Sprite + state: pancakescc1 + # - type: Sprite + # layers: + # - state: plate-small + # - state: pancakescc1 + - type: Appearance + visuals: + - type: StackVisualizer + composite: true + stackLayers: + - pancakescc1 + - pancakescc2 + - pancakescc3 + +- type: entity + name: waffles + parent: FoodBakedBase + id: FoodBakedWaffle + description: Mmm, waffles. + components: + - type: Sprite + layers: + - state: tray + - state: waffles + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: soy waffles + parent: FoodBakedWaffle + id: FoodBakedWaffleSoy + description: You feel healthier and - more feminine? + components: + - type: Sprite + layers: + - state: tray + - state: waffles-soy + +- type: entity + name: soylent waffles + parent: FoodBakedWaffle + id: FoodBakedWaffleSoylent + description: Not made of people. Honest. # Definitely people + components: + - type: Sprite + layers: + - state: tray + - state: waffles-soylent + +- type: entity + name: roffle waffles + parent: FoodBakedWaffle + id: FoodBakedWaffleRoffle + description: Waffles from Roffle. Co. + components: + - type: Sprite + layers: + - state: tray + - state: waffles-roffle + +# Misc + +- type: entity + name: poppy pretzel + parent: FoodBakedBase + id: FoodBakedPretzel + description: It's all twisted up! + components: + - type: Sprite + state: pretzel + +- type: entity + name: cannoli + parent: FoodBakedBase + id: FoodBakedCannoli + description: A sicilian treat that makes you into a wise guy. + components: + - type: Sprite + state: cannoli + - type: SolutionContainer + maxVol: 15 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml new file mode 100644 index 0000000000..9b0b90600c --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -0,0 +1,325 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodPieBase + abstract: true + components: + - type: Food + trash: FoodPlateTin + - type: Sprite + sprite: Objects/Consumable/Food/Baked/pie.rsi + netsync: false + - type: SolutionContainer + maxVol: 15 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: SliceableFood + count: 4 + +- type: entity + parent: FoodPieBase + id: FoodPieSliceBase + abstract: true + description: A slice of pie. Tasty! + components: + - type: Food + trash: FoodPlateSmall + - type: SolutionContainer + maxVol: 5 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + +# Pie + +- type: entity + name: apple pie + parent: FoodPieBase + id: FoodPieApple + description: A pie containing sweet, sweet love... or apple. + components: + - type: Sprite + layers: + - state: tin + - state: apple + - type: SliceableFood + slice: FoodPieAppleSlice + +- type: entity + name: slice of apple pie + parent: FoodPieSliceBase + id: FoodPieAppleSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice + - state: alpha-slice-filling + color: orange +# Tastes like pie, apple. + +- type: entity + name: baklava + parent: FoodPieBase + id: FoodPieBaklava + description: A delightful healthy snack made of nut layers with thin bread. + components: + - type: Sprite + layers: + - state: tin + - state: baklava + - type: SliceableFood + slice: FoodPieBaklavaSlice + +- type: entity + name: slice of baklava + parent: FoodPieSliceBase + id: FoodPieBaklavaSlice + description: A portion of a delightful healthy snack made of nut layers with thin bread. + components: + - type: Sprite + layers: + - state: plate-small + - state: baklava-slice +# Tastes like pie, nuts. + +- type: entity + name: banana cream pie + parent: FoodPieBase + id: FoodPieBananaCream + description: Just like back home, on clown planet! HONK! + components: + - type: Sprite + layers: + - state: tin + - state: plain + - type: CreamPie + - type: Ammo + caliber: CreamPie + caseless: true + projectile: BulletCreampie +# Tastes like pie, cream, banana. + +- type: entity + name: berry clafoutis + parent: FoodPieBase + id: FoodPieClafoutis + description: No black birds, this is a good sign. + components: + - type: Sprite + layers: + - state: tin + color: pink + - state: berryclafoutis + - type: SliceableFood + slice: FoodPieClafoutisSlice + +- type: entity + name: slice of berry clafoutis + parent: FoodPieSliceBase + id: FoodPieClafoutisSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice + - state: alpha-slice-filling + color: pink +# Tastes like pie, blackberries. + +- type: entity + name: cherry pie + parent: FoodPieBase + id: FoodPieCherry + description: Tastes good enough to make a grown man cry. + components: + - type: Sprite + layers: + - state: tin + - state: cherry + - type: SliceableFood + slice: FoodPieCherrySlice + +- type: entity + name: slice of cherry pie + parent: FoodPieSliceBase + id: FoodPieCherrySlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice + - state: alpha-slice-filling + color: red +# Tastes like pie, cherries. + +- type: entity + name: meat pie + parent: FoodPieBase + id: FoodPieMeat + description: An old barber recipe, very delicious! + components: + - type: Sprite + layers: + - state: tin + - state: meat + - type: SliceableFood + slice: FoodPieMeatSlice + +- type: entity + name: slice of meat pie + parent: FoodPieSliceBase + id: FoodPieMeatSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice + - state: alpha-slice-filling + color: brown +# Tastes like pie, meat. + +- type: entity + name: xeno pie + parent: FoodPieBase + id: FoodPieXeno + components: + - type: Sprite + layers: + - state: tin + - state: xeno + - type: SliceableFood + slice: FoodPieXenoSlice + +- type: entity + name: slice of xeno pie + parent: FoodPieSliceBase + id: FoodPieXenoSlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice + - state: alpha-slice-filling + color: green +# Tastes like pie, meat, acid. + +- type: entity + name: frosty pie + parent: FoodPieBase + id: FoodPieFrosty + description: Tastes like blue and cold. + components: + - type: Sprite + layers: + - state: tin + - state: frosty + - type: SliceableFood + slice: FoodPieFrostySlice + +- type: entity + name: slice of frosty pie + parent: FoodPieSliceBase + id: FoodPieFrostySlice + components: + - type: Sprite + layers: + - state: plate-small + - state: plate-slice-shading + - state: plain-slice + - state: alpha-slice-filling + color: blue +# Tastes like pie, mint. + +# No Slice + +- type: entity + name: amanita pie + parent: FoodPieBase + id: FoodPieAmanita + description: Sweet and tasty poison pie. + components: + - type: Sprite + layers: + - state: plate + - state: amanita +# Tastes like pie, mushrooms. + +- type: entity + name: amanita pie + parent: FoodPieBase + id: FoodPiePlump + description: I bet you love stuff made out of plump helmets! + components: + - type: Sprite + layers: + - state: plate + - state: plump +# Tastes like pie, mushrooms. + +# Tart + +- type: entity + name: grape tart + parent: FoodPieBase + id: FoodTartGrape + description: A tasty dessert that reminds you of the wine you didn't make. + components: + - type: Food + trash: FoodPlateSmall2 + - type: Sprite + layers: + - state: plate-tart + - state: grape +# Tastes like tart, grape. + +- type: entity + name: mime tart + parent: FoodPieBase + id: FoodTartMime + description: "\" \"" + components: + - type: Food + trash: FoodPlateSmall2 + - type: Sprite + layers: + - state: plate-tart + - state: mime +# Tastes like nothing. + +- type: entity + name: golden apple streusal tart + parent: FoodPieBase + id: FoodTartGapple + description: A tasty dessert that won't make it through a metal detector. + components: + - type: Food + trash: FoodPlateSmall2 + - type: Sprite + layers: + - state: plate-tart + - state: gapple +# Tastes like tart, apple, expensive metal. + +- type: entity + name: chocolate lava tart + parent: FoodPieBase + id: FoodTartCoco + description: A tasty dessert made of chocolate, with a liquid core. + components: + - type: Food + trash: FoodPlateSmall2 + - type: Sprite + layers: + - state: plate-tart + - state: cocolava +# Tastes like tart, dark chocolate. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml new file mode 100644 index 0000000000..2699e4aa0e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -0,0 +1,280 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodPizzaBase + abstract: true + components: + - type: Food + trash: Plate + - type: Sprite + sprite: Objects/Consumable/Food/Baked/pizza.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 15 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: SliceableFood + count: 8 + - type: Item + size: 8 + +- type: entity + parent: FoodPizzaBase + id: FoodPizzaSliceBase + abstract: true + components: + - type: Food + trash: PlateTart + - type: SolutionContainer + maxVol: 5 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Item + size: 1 + +# Pizza + +- type: entity + name: margherita pizza + parent: FoodPizzaBase + id: FoodPizzaMargherita + description: The cheesiest pizza in the galaxy. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: margherita + - type: SliceableFood + slice: FoodPizzaMargheritaSlice + +- type: entity + name: slice of margherita pizza + parent: FoodPizzaSliceBase + id: FoodPizzaMargheritaSlice + description: A slice of the cheesiest pizza in the galaxy. + components: + - type: Sprite + layers: + - state: plate-slice + - state: margherita-slice +# Tastes like crust, tomato, cheese. + +- type: entity + name: meat pizza + parent: FoodPizzaBase + id: FoodPizzaMeat + description: Greasy pizza with delicious meat. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: meat + - type: SliceableFood + slice: FoodPizzaMeatSlice + +- type: entity + name: slice of meat pizza + parent: FoodPizzaSliceBase + id: FoodPizzaMeatSlice + description: A nutritious slice of meatpizza. + components: + - type: Sprite + layers: + - state: plate-slice + - state: meat-slice +# Tastes like crust, tomato, cheese, meat. + +- type: entity + name: mushroom pizza + parent: FoodPizzaBase + id: FoodPizzaMushroom + description: Very special pizza. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: mushroom + - type: SliceableFood + slice: FoodPizzaMushroomSlice + +- type: entity + name: slice of mushroom pizza + parent: FoodPizzaSliceBase + id: FoodPizzaMushroomSlice + description: Maybe it is the last slice of pizza in your life. + components: + - type: Sprite + layers: + - state: plate-slice + - state: mushroom-slice +# Tastes like crust, tomato, cheese, mushroom. + +- type: entity + name: vegetable pizza + parent: FoodPizzaBase + id: FoodPizzaVegetable + description: The station's vegetarians will thank you for making this. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: vegetable + - type: SliceableFood + slice: FoodPizzaVegetableSlice + +- type: entity + name: slice of vegetable pizza + parent: FoodPizzaSliceBase + id: FoodPizzaVegetableSlice + description: A slice of this is enough to satisfy even the pickiest station personnel. + components: + - type: Sprite + layers: + - state: plate-slice + - state: vegetable-slice +# Tastes like crust, tomato, cheese, carrot. + +- type: entity + name: donk-pocket pizza + parent: FoodPizzaBase + id: FoodPizzaDonkpocket + description: Who thought this would be a good idea? + components: + - type: Sprite + layers: + - state: plate-pizza + - state: donkpocket + - type: SliceableFood + slice: FoodPizzaDonkpocketSlice + +- type: entity + name: slice of donk-pocket pizza + parent: FoodPizzaSliceBase + id: FoodPizzaDonkpocketSlice + description: Smells like donk-pocket. + components: + - type: Sprite + layers: + - state: plate-slice + - state: donkpocket-slice +# Tastes like crust, tomato, cheese, meat, laziness. + +- type: entity + name: dank pizza + parent: FoodPizzaBase + id: FoodPizzaDank + description: The hippie's pizza of choice. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: dank + - type: SliceableFood + slice: FoodPizzaDankSlice + +- type: entity + name: slice of dank pizza + parent: FoodPizzaSliceBase + id: FoodPizzaDankSlice + description: So good, man... + components: + - type: Sprite + layers: + - state: plate-slice + - state: dank-slice +# Tastes like crust, tomato, cheese, meat, satisfaction. + +- type: entity + name: sassysage pizza + parent: FoodPizzaBase + id: FoodPizzaSassysage + description: You can really smell the sassiness. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: sassysage + - type: SliceableFood + slice: FoodPizzaSassysageSlice + +- type: entity + name: slice of sassysage pizza + parent: FoodPizzaSliceBase + id: FoodPizzaSassysageSlice + description: Deliciously sassy. + components: + - type: Sprite + layers: + - state: plate-slice + - state: sassysage-slice +# Tastes like crust, tomato, cheese, sausage, sass. + +- type: entity + name: Hawaiian pizza + parent: FoodPizzaBase + id: FoodPizzaPineapple + description: Makes people burst into tears. Tears of joy or sadness depends on the persons fondness for pineapple. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: pineapple + - type: SliceableFood + slice: FoodPizzaPineappleSlice + +- type: entity + name: slice of pineapple pizza + parent: FoodPizzaSliceBase + id: FoodPizzaPineappleSlice + description: A slice of joy/sin. + components: + - type: Sprite + layers: + - state: plate-slice + - state: pineapple-slice +# Tastes like crust, tomato, cheese, pineapple, ham. + +#TODO: This is a meme pizza from /tg/. It has specially coded mechanics. +- type: entity + name: Arnold's pizza + parent: FoodPizzaBase + id: FoodPizzaArnold + description: Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni. + components: + - type: Sprite + layers: + - state: plate-pizza + - state: arnold + - type: SliceableFood + slice: FoodPizzaArnoldSlice + +- type: entity + name: slice of Arnold's pizza + parent: FoodPizzaSliceBase + id: FoodPizzaArnoldSlice + description: I come over, maybe I give you a pizza, maybe I break off your arm. + components: + - type: Sprite + layers: + - state: plate-slice + - state: arnold-slice +# Tastes like crust, tomato, cheese, pepperoni, 9 millimeter bullets. + +#TODO: Make this do poison damage and make cut pizza slices eventually rot into this. +- type: entity + name: slice of moldy pizza + parent: FoodPizzaSliceBase + id: FoodPizzaMoldySlice + description: Once a perfectly good slice of pizza pie, but now it lies here, rancid and bursting with spores. + components: + - type: Sprite + layers: + - state: plate-slice + - state: moldy-slice +# Tastes like stale crust, rancid cheese, mushroom. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml new file mode 100644 index 0000000000..07ff40713f --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -0,0 +1,56 @@ +# Bowls + +- type: entity + name: bowl + parent: BaseItem + id: FoodBowlBig + description: A simple bowl, used for soups and salads. + components: + - type: SolutionContainer + maxVol: 20 + - type: Sprite + sprite: Objects/Consumable/Food/bowl.rsi + state: bowl + netsync: false + - type: DamageOnLand + amount: 5 + - type: DamageOtherOnHit + amount: 5 + - type: Spillable + - type: Damageable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: GlassBreak + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + FoodBowlBigTrash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + name: broken bowl + parent: BaseItem + id: FoodBowlBigTrash + description: A simple bowl, broken and useless. + components: + - type: Sprite + sprite: Objects/Consumable/Food/bowl.rsi + state: bowl-trash + netsync: false + +- type: entity + name: bowl + parent: FoodBowlBig + id: FoodBowlFancy + description: A fancy bowl, used for SPECIAL soups and salads. + components: + - type: Sprite + state: bowl2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml new file mode 100644 index 0000000000..5bb1d3a4b1 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -0,0 +1,359 @@ +# Donut + +# There is a newer, better version of the donutbox from tgstation included in the +# donut.rsi. The reason it isn't implemented is it requires a StackVisualizer offsetting +# the layer sprite by a couple pixels everytime a new donut is added. It also requires +# an alpha color which -Y- said he would implement. + +- type: entity + parent: BaseItem + id: FoodBoxDonut + name: donutbox + description: Mmm, Donuts. + components: + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/Baked/donut.rsi + state: box + - type: Storage + capacity: 6 + - type: Item + sprite: Objects/Consumable/Food/Baked/donut.rsi + size: 6 + HeldPrefix: box + - type: StorageFill + contents: + - name: FoodDonutPink + amount: 3 + - name: FoodDonutPlain + amount: 3 + - type: StorageCounter + countTag: Donut + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: box-open + - type: StackVisualizer + composite: true + stackLayers: + - box1 + - pink-box2 + - box3 + - pink-box4 + - box5 + - pink-box6 + +# Egg + +- type: entity + parent: BaseItem + id: FoodContainerEgg + name: eggbox + description: Don't drop 'em! + components: + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/egg.rsi + state: box-closed + - type: Storage + capacity: 12 + - type: Item + sprite: Objects/Consumable/Food/egg.rsi + size: 12 + - type: StorageFill + contents: + - name: FoodEgg + amount: 12 + - type: StorageCounter + countTag: Egg + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: box-open + - type: StackVisualizer + composite: true + stackLayers: + - box1 + - box2 + - box3 + - box4 + - box5 + - box6 + - box7 + - box8 + - box9 + - box10 + - box11 + - box12 + # Someday... + # - type: LoopingSound + # - type: DamageOnLand + # amount: 5 + # - type: DamageOtherOnHit + # amount: 5 + # - type: Damageable + # - type: Destructible + # thresholds: + # - trigger: + # !type:DamageTrigger + # damage: 10 + # behaviors: + # - !type:PlaySoundCollectionBehavior + # soundCollection: desecration + # - !type:SpawnEntitiesBehavior + # spawn: + # EggBoxBroken: + # min: 1 + # max: 1 + # PuddleEgg: + # min: 1 + # max: 12 + # - !type:DoActsBehavior + # acts: [ "Destruction" ] + +- type: entity + parent: FoodContainerEgg + id: EggBoxBroken + components: + - type: StorageFill + contents: + - name: Eggshells + amount: 12 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + +# Pizza + +# This - is pretty hacky. It works, but you can't have stuff like messy pizza box +# layers after a pizza has been in. Also pizza box stacking, but this is impossible +# Since you could open pizza boxes in the stack. + +- type: entity + parent: BaseItem + id: FoodBoxPizza + name: pizza box + components: + - type: Sprite + sprite: Objects/Consumable/Food/Baked/pizza.rsi + drawdepth: FloorObjects + layers: + - state: box + - state: box-open + map: ["enum.StorageVisualLayers.Door"] + netsync: false + - type: EntityStorage + Capacity: 8 + CanWeldShut: false + - type: PlaceableSurface + placeCentered: true + - type: Item + sprite: Objects/Consumable/Food/Baked/pizza.rsi + HeldPrefix: box + # - type: Stack + # count: 1 + # max: 5 + # stackType: PizzaBox + - type: Appearance + visuals: + - type: StorageVisualizer + state_open: box-open + state_closed: box + # - type: StackVisualizer + # stackLayers: + # - box + # - box1 + # - box2 + # - box3 + # - box4 + +- type: entity + name: pizza box + parent: FoodBoxPizza + id: FoodBoxPizzaFilled + suffix: Filled + components: + - type: Sprite + layers: + - state: box + - state: box-open + map: ["enum.StorageVisualLayers.Door"] + - type: StorageFill + contents: + - name: FoodPizzaArnold + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaDank + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaSassysage + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaMargherita + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaMeat + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaMushroom + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaPineapple + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaVegetable + prob: 0.15 + orGroup: Pizza + - name: FoodPizzaDonkpocket + prob: 0.15 + orGroup: Pizza + +# Nugget + +- type: entity + parent: BaseItem + id: FoodBoxNugget + name: chicken nuggets + description: You suddenly have an urge to trade on the intergalactic stock market. + components: + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/Baked/nuggets.rsi + state: box + - type: Storage + capacity: 6 + - type: Item + sprite: Objects/Consumable/Food/Baked/nuggets.rsi + size: 6 + HeldPrefix: box + - type: StorageFill + contents: + - name: FoodBakedNugget + amount: 6 + - type: StorageCounter + countTag: Nugget + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: box-open + - type: StackVisualizer + composite: true + stackLayers: + - box1 + - box2 + - box3 + - box4 + - box5 + - box6 + +# Donkpocket + +- type: entity + parent: BaseItem + id: FoodBoxDonkpocket + name: box of donk-pockets + description: 'Instructions: Heat in microwave. Product will cool if not eaten within seven minutes.' + components: + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + state: box + - type: Storage + capacity: 6 + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + size: 6 + color: red + - type: StorageFill + contents: + - name: FoodDonkpocket + amount: 6 + +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketSpicy + name: box of spicy-flavoured donk-pockets + components: + - type: Sprite + state: spicy-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + - type: StorageFill + contents: + - name: FoodDonkpocketSpicy + amount: 6 + +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketTeriyaki + name: box of teriyaki-flavoured donk-pockets + components: + - type: Sprite + state: teriyaki-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + - type: StorageFill + contents: + - name: FoodDonkpocketTeriyaki + amount: 6 + +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketPizza + name: box of pizza-flavoured donk-pockets + components: + - type: Sprite + state: pizza-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + color: white + - type: StorageFill + contents: + - name: FoodDonkpocketPizza + amount: 6 + +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketGondola + name: box of gondola-flavoured donk-pockets + components: + - type: Sprite + state: gondola-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + color: brown + - type: StorageFill + contents: + - name: FoodDonkpocketGondola + amount: 6 + +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketBerry + name: box of berry-flavoured donk-pockets + components: + - type: Sprite + state: berry-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + - type: StorageFill + contents: + - name: FoodDonkpocketBerry + amount: 6 + +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketHonk + name: box of banana-flavoured donk-pockets + components: + - type: Sprite + state: banana-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + color: yellow + - type: StorageFill + contents: + - name: FoodDonkpocketHonk + amount: 6 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml new file mode 100644 index 0000000000..bf5e850d3e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -0,0 +1,564 @@ +# TODO: Removes the icon components from all these when that gets fixed. + +# Packets + +# Since this one is closed, the only way to insert liquid is with a syringe. +- type: entity + parent: BaseItem + id: FoodCondimentPacket + name: condiment packet + description: A small plastic pack with condiments to put on your food. + components: + - type: Drink + openSounds: packetOpenSounds + - type: SolutionContainer + maxVol: 10 + - type: SolutionTransfer + transferAmount: 5 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/condiments.rsi + state: packet-empty + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: packet-empty + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketAstrotame + name: Astrotame + description: The sweetness of a thousand sugars but none of the calories. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Astrotame + Quantity: 10 + - type: Sprite + layers: + - state: packet-trans-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-astrotame + - type: Icon + state: packet-astrotame + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-trans- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketBbq + name: BBQ sauce + description: Hand wipes not included. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: BbqSauce + Quantity: 10 + - type: Sprite + layers: + - state: packet-trans-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-bbq + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-trans- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketCornoil + name: corn oil + description: Corn oil. A delicious oil used in cooking. Made from corn. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Cornoil + Quantity: 10 + - type: Sprite + layers: + - state: packet-trans-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-cornoil + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-trans- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketFrostoil + name: coldsauce + description: Coldsauce. Leaves the tongue numb in its passage. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Frostoil + Quantity: 10 + - type: Sprite + layers: + - state: packet-trans-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-frostoil + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-trans- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketHorseradish + name: horseradish sauce + description: A packet of smelly horseradish sauce. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: HorseradishSauce + Quantity: 10 + - type: Sprite + layers: + - state: packet-solid-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-greygoo + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-solid- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketHotsauce + name: hotsauce + description: You can almost TASTE the stomach ulcers now! + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Hotsauce + Quantity: 10 + - type: Sprite + layers: + - state: packet-trans-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-hotsauce + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-trans- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketKetchup + name: ketchup + description: You feel more American already. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Ketchup + Quantity: 10 + - type: Sprite + layers: + - state: packet-solid-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-ketchup + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-solid- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketPepper + name: black pepper + description: Often used to flavor food or make people sneeze. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Blackpepper + Quantity: 10 + - type: Sprite + layers: + - state: packet-solid-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-pepper + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-solid- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketSalt + name: salt + description: Salt. From space oceans, presumably. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Salt + Quantity: 10 + - type: Sprite + layers: + - state: packet-solid-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - state: packet-label + color: black + - type: Icon + state: packet-salt + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-solid- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketSoy + name: soy sauce + description: A salty soy-based flavoring. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Soysauce + Quantity: 10 + - type: Sprite + layers: + - state: packet-solid-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-soysauce + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-solid- + +- type: entity + parent: FoodCondimentPacket + id: FoodCondimentPacketSugar + name: sugar + description: Tasty spacey sugar! + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Sugar + Quantity: 10 + - type: Sprite + layers: + - state: packet-solid-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + - type: Icon + state: packet-sugar + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 2 + fillBaseName: packet-solid- + +# Bottles + +- type: entity + parent: BaseItem + id: FoodCondimentBottle + name: condiment bottle + description: A thin glass bottle used to store condiments. + components: + - type: Drink + openSounds: pop + - type: SolutionContainer + maxVol: 30 + - type: SolutionTransfer + transferAmount: 5 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-empty + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: bottle-alpha- + +- type: entity + parent: FoodCondimentBottle + id: FoodCondimentBottleColdsauce + name: coldsauce bottle + description: Leaves the tongue numb in its passage. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Frostoil + Quantity: 30 + - type: Sprite + layers: + - state: bottle-empty + - state: label-c + - state: bottle-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-coldsauce + +- type: entity + parent: FoodCondimentBottle + id: FoodCondimentBottleEnzyme + name: universal enzyme + description: Used in cooking various dishes. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Enzyme + Quantity: 30 + - type: Sprite + layers: + - state: bottle-empty + - state: label-e + - state: bottle-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-enzyme + +- type: entity + parent: FoodCondimentBottle + id: FoodCondimentBottleHotsauce + name: hotsauce + description: You can almost TASTE the stomach ulcers now! + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Hotsauce + Quantity: 30 + - type: Sprite + layers: + - state: bottle-empty + - state: label-h + - state: bottle-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-hotsauce + +- type: entity + parent: FoodCondimentBottle + id: FoodCondimentBottleKetchup + name: ketchup + description: You feel more American already. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Ketchup + Quantity: 30 + - type: Sprite + layers: + - state: bottle-empty + - state: label-k + - state: bottle-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-ketchup + +- type: entity + parent: FoodCondimentBottle + id: FoodCondimentBottleBBQ + name: BBQ sauce + description: Hand wipes not included. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: BbqSauce + Quantity: 30 + - type: Sprite + layers: + - state: bottle-empty + - state: label-b + - state: bottle-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + # So there's no error. + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-ketchup + +# Small Bottles + +- type: entity + parent: BaseItem + id: FoodCondimentBottleSmall + name: condiment bottle + description: A smaller glass bottle used to store condiments. + components: + - type: Drink + openSounds: pop + - type: SolutionContainer + maxVol: 15 + - type: SolutionTransfer + transferAmount: 5 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-s-empty + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 3 + fillBaseName: bottle-s-alpha- + +- type: entity + parent: FoodCondimentBottleSmall + id: FoodCondimentBottleSmallColdsauce + name: coldsauce bottle + description: Leaves the tongue numb in its passage. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Frostoil + Quantity: 15 + - type: Sprite + layers: + - state: bottle-s-empty + - state: label-s-c + - state: bottle-s-alpha-3 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-s-coldsauce + +- type: entity + parent: FoodCondimentBottleSmall + id: FoodCondimentBottleSmallHotsauce + name: hotsauce + description: You can almost TASTE the stomach ulcers now! + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Hotsauce + Quantity: 15 + - type: Sprite + layers: + - state: bottle-s-empty + - state: label-s-h + - state: bottle-s-alpha-3 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-s-hotsauce + +- type: entity + parent: FoodCondimentBottleSmall + id: FoodCondimentBottleSmallKetchup + name: ketchup + description: You feel more American already. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Ketchup + Quantity: 15 + - type: Sprite + layers: + - state: bottle-s-empty + - state: label-s-k + - state: bottle-s-alpha-3 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-s-ketchup + +- type: entity + parent: FoodCondimentBottleSmall + id: FoodCondimentBottleSmallVinegar + name: vinegar + description: Used in cooking to enhance flavor. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Vinegar + Quantity: 15 + - type: Sprite + layers: + - state: bottle-s-empty + - state: label-s-v + - state: bottle-s-alpha-3 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + state: bottle-s-vinegar + +# Trash + +# Maybe in some dumb universe you could put liquid back in this and seal it +# with a lighter or something. +- type: entity + abstract: true + parent: BaseItem + id: FoodCondimentPacketTrash + name: empty condiment packet + description: A ripped condiment packet. Useless. + components: + - type: Sprite + sprite: Objects/Consumable/Food/condiments.rsi + netsync: false + state: packet-trash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml new file mode 100644 index 0000000000..e9f8825235 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -0,0 +1,164 @@ +# Plate +# In the future, I (Swept) want a system for putting stuff on plates and it'll provide more nutrition +# If it's on that plate. I've modified all load/slices to fit on the plate, so all we need +# is that system. Ideally, food on plates would have a system where when thrown, it would +# break the plate and the loaf would fall off. + +# Bread Plate + +- type: entity + name: plate + parent: BaseItem + id: FoodPlate + description: A large plate, excellent for bread. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate + netsync: false + - type: DamageOnLand + amount: 5 + - type: DamageOtherOnHit + amount: 5 + - type: Damageable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + FoodPlateTrash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + name: broken plate + parent: BaseItem + id: FoodPlateTrash + description: A large plate, broken and useless. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate-trash + netsync: false + +# Small Plate + +- type: entity + name: plate + parent: Plate + id: FoodPlateSmall + description: A small plate. Delicate. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate-small +# Needs the full thing because inherting is dumb sometimes. + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + PlateSmallTrash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + name: broken plate + parent: BaseItem + id: FoodPlateSmallTrash + description: A broken plate. Useless. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate-small-trash + netsync: false + +# A second small plate for different purposes. + +- type: entity + name: plate + parent: Plate + id: FoodPlateSmall2 + description: A small plate, excellent for a tart. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate-tart +# Needs the full thing because inherting is dumb sometimes. + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + PlateSmall2Trash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + name: broken plate + parent: BaseItem + id: FoodPlateSmall2Trash + description: A broken plate. Useless. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate-small-trash + netsync: false + +# Plastic Plate + +- type: entity + name: plastic plate + parent: BaseItem + id: FoodPlatePlastic + description: A large blue plastic plate, excellent for a birthday cake. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate-plastic + netsync: false + +- type: entity + name: plastic plate + parent: BaseItem + id: FoodPlateSmallPlastic + description: A blue plastic plate, excellent for slices of birthday cake. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: plate-small-plastic + netsync: false + +# Pie Tin + +- type: entity + name: pie tin + parent: BaseItem + id: FoodPlateTin + description: A cheap, foil tin for pies. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: tin + netsync: false diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml new file mode 100644 index 0000000000..f37b3c2670 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -0,0 +1,241 @@ +# Base + +- type: entity + abstract: true + parent: BaseItem + id: FoodTinBase + name: tin + description: A tin of something, sealed tight. + components: + - type: SolutionContainer + maxVol: 20 + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + netsync: false + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + HeldPrefix: packet + color: gray + - type: DamageOnLand + amount: 3 + - type: DamageOtherOnHit + amount: 3 + - type: Damageable + +- type: entity + abstract: true + parent: BaseItem + id: FoodTinBaseTrash + name: empty tin + description: An empty tin. Could get a bit of metal from this. + components: + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + netsync: false + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + HeldPrefix: packet + color: gray + +# Tins + +# Need something that you can open these tins with. I suggest a prying or cutting tool. + +- type: entity + parent: FoodTinBase + id: FoodTinPeaches + name: tinned peaches + description: Just a nice can of ripe peaches swimming in their own juices. + components: + - type: Sprite + state: peachtin + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 6 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: canOpenSounds + - !type:SpawnEntitiesBehavior + spawn: + FoodTinPeachesOpen: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: FoodTinBase + id: FoodTinPeachesOpen + name: tinned peaches + description: Just a nice can of ripe peaches swimming in their own juices. + components: + - type: Sprite + state: peachtin-open + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: LoopingSound + - type: Food + trash: FoodTinPeachesTrash + +- type: entity + parent: FoodTinBaseTrash + id: FoodTinPeachesTrash + name: tinned peaches + components: + - type: Sprite + state: peachtin-empty + +- type: entity + parent: FoodTinBase + id: FoodTinPeachesMaint + name: Maintenance Peaches + description: Just a nice can of ripe peaches swimming in their own juices. + components: + - type: Sprite + state: peachtinmaint + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 6 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: canOpenSounds + - !type:SpawnEntitiesBehavior + spawn: + FoodTinPeachesMaintOpen: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: FoodTinBase + id: FoodTinPeachesMaintOpen + name: Maintenance Peaches + description: Just a nice can of ripe peaches swimming in their own juices. + components: + - type: Sprite + state: peachtinmaint-open + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: LoopingSound + - type: Food + trash: FoodTinPeachesMaintTrash + +- type: entity + parent: FoodTinBaseTrash + id: FoodTinPeachesMaintTrash + name: Maintenance Peaches + components: + - type: Sprite + state: peachtinmaint-empty + +- type: entity + parent: FoodTinBase + id: FoodTinBeans + name: tin of beans + description: Musical fruit in a slightly less musical container. + components: + - type: Sprite + state: beans + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 6 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: canOpenSounds + - !type:SpawnEntitiesBehavior + spawn: + FoodTinBeansOpen: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: FoodTinBase + id: FoodTinBeansOpen + name: tin of beans + description: Musical fruit in a slightly less musical container. + components: + - type: Sprite + state: beans-open + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: LoopingSound + - type: Food + trash: FoodTinBeansTrash + +- type: entity + parent: FoodTinBaseTrash + id: FoodTinBeansTrash + name: tin of beans + components: + - type: Sprite + state: beans-empty + +# MRE can + +- type: entity + parent: FoodTinBase + id: FoodTinMRE + name: tinned meat + components: + - type: Sprite + sprite: Objects/Consumable/Food/mre.rsi + state: tin-closed + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 6 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: canOpenSounds + - !type:SpawnEntitiesBehavior + spawn: + FoodTinMREOpen: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: FoodTinBase + id: FoodTinMREOpen + name: tinned meat + components: + - type: Sprite + sprite: Objects/Consumable/Food/mre.rsi + state: tin-open + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: LoopingSound + - type: Food + trash: FoodTinMRETrash + +- type: entity + parent: FoodTinBaseTrash + id: FoodTinMRETrash + name: tinned meat + components: + - type: Sprite + sprite: Objects/Consumable/Food/mre.rsi + state: tin-trash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml new file mode 100644 index 0000000000..956cbabd68 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -0,0 +1,309 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodBurgerBase + abstract: true + components: + - type: Food + transferAmount: 5 + - type: Sprite + sprite: Objects/Consumable/Food/burger.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 15 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: Item + sprite: Objects/Consumable/Food/burger.rsi + +# Custom Burger Example + +- type: entity + name: jelly burger + parent: FoodBurgerBase + id: FoodBurgerJelly + description: Culinary delight..? + components: + - type: Sprite + layers: + - state: custburg-bottom + - state: custburg-filling + color: red + - state: custburg-top + +# Burger + +- type: entity + name: appendix burger + parent: FoodBurgerBase + id: FoodBurgerAppendix + description: Tastes like appendicitis. + components: + - type: Sprite + state: appendix +# Tastes like bun, grass. + +- type: entity + name: fillet -o- carp burger + parent: FoodBurgerBase + id: FoodBurgerCarp + description: Almost like a carp is yelling somewhere... + components: + - type: Sprite + state: fish +# Tastes like bun, fish. + +- type: entity + name: tofu burger + parent: FoodBurgerBase + id: FoodBurgerTofu + description: What... is that meat? + components: + - type: Sprite + state: tofu +# Tastes like bun, tofu. + +- type: entity + name: roburger + parent: FoodBurgerBase + id: FoodBurgerRobot + description: The lettuce is the only organic component. Beep. + components: + - type: Sprite + state: ro +# Tastes like bun, lettuce, sludge. + +- type: entity + name: xenoburger + parent: FoodBurgerBase + id: FoodBurgerXeno + description: Smells caustic. Tastes like heresy. + components: + - type: Sprite + state: x +# Tastes like bun, acid. + +- type: entity + name: bearger + parent: FoodBurgerBase + id: FoodBurgerBear + description: Best served rawr. + components: + - type: Sprite + state: bearger + +- type: entity + name: clown burger + parent: FoodBurgerBase + id: FoodBurgerClown + description: This tastes funny... + components: + - type: Sprite + state: clown + +- type: entity + name: mime burger + parent: FoodBurgerBase + id: FoodBurgerMime + description: Its taste defies language. + components: + - type: Sprite + state: mime +# Tastes like . + +- type: entity + name: brain burger + parent: FoodBurgerBase + id: FoodBurgerBrain + description: A strange looking burger. It looks almost sentient. + components: + - type: Sprite + state: brain +# Tastes like bun, brains. + +- type: entity + name: ghost burger + parent: FoodBurgerBase + id: FoodBurgerGhost + description: Too spooky! + components: + - type: Sprite + state: ghost +# Tastes like bun, ectoplasm. + +# Note: I would put a bunch of colored burgers here as listed in the tg .dm but +# I'd rather wait for a custom burger component. + +- type: entity + name: spell burger + parent: FoodBurgerBase + id: FoodBurgerSpell + description: This is absolutely Ei Nath. + components: + - type: Sprite + state: spell +# Tastes like bun, silver. + +- type: entity + name: big bite burger + parent: FoodBurgerBase + id: FoodBurgerBig + description: Forget the Big Mac. THIS is the future! + components: + - type: SolutionContainer + maxVol: 25 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 25 + - type: Sprite + state: bigbite +# Tastes like bun, silver, magic. + +- type: entity + name: super bite burger + parent: FoodBurgerBase + id: FoodBurgerSuper + description: This is a mountain of a burger. FOOD! + components: + - type: SolutionContainer + maxVol: 40 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 40 + - type: Sprite + state: superbite +# Tastes like bun, diabetes. + +- type: entity + name: five alarm burger + parent: FoodBurgerBase + id: FoodBurgerFive + description: HOT! HOT! HOT! + components: + - type: Sprite + state: fivealarm +# Tastes like bun, HEAT. + +- type: entity + name: rat burger + parent: FoodBurgerBase + id: FoodBurgerRat + description: Pretty much what you'd expect... + components: + - type: Sprite + state: rat +# Tastes like bun, HEAT. + +- type: entity + name: home run baseball burger + parent: FoodBurgerBase + id: FoodBurgerBaseball + description: It's still warm. The steam coming off of it smells kinda sweaty. + components: + - type: Sprite + state: baseball +# Tastes like bun, victory. + +- type: entity + name: bacon burger + parent: FoodBurgerBase + id: FoodBurgerBacon + description: The perfect combination of all things American. + components: + - type: Sprite + state: bacon +# Tastes like bun, bacon. + +- type: entity + name: empowered burger + parent: FoodBurgerBase + id: FoodBurgerEmpowered + description: It's shockingly good, if you live off of electricity that is. + components: + - type: Sprite + state: empowered +# Tastes like bun, pure electricity. + +- type: entity + name: empowered burger + parent: FoodBurgerBase + id: FoodBurgerCrab + description: A delicious patty of the crabby kind, slapped in between a bun. + components: + - type: Sprite + state: crab +# Tastes like bun, crab meat. + +- type: entity + name: soylent burger + parent: FoodBurgerBase + id: FoodBurgerSoy + description: After eating this you have the overwhelming urge to purchase overpriced figurines of superheroes. + components: + - type: Sprite + state: soylent +# Tastes like bun, redditors. + +- type: entity + name: mcrib + parent: FoodBurgerBase + id: FoodBurgerMcrib + description: An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it. + components: + - type: Sprite + state: mcrib +# Tastes like bun, pork patty. + +- type: entity + name: mcguffin + parent: FoodBurgerBase + id: FoodBurgerMcguffin + description: A cheap and greasy imitation of an eggs Benedict. + components: + - type: Sprite + state: mcguffin +# Tastes like muffin, bacon. + +- type: entity + name: chicken sandwich # Burger for you euro-cucks + parent: FoodBurgerBase + id: FoodBurgerChicken + description: A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier. + components: + - type: Sprite + state: chicken +# Tastes like bun, chicken. + +- type: entity + name: cheese burger + parent: FoodBurgerBase + id: FoodBurgerCheese + description: This noble burger stands proudly clad in golden cheese. + components: + - type: Sprite + state: cheese +# TODO: Make this work. + # - type: Sprite + # state: plate + # - type: RandomSpriteState + # spriteLayer: 1 + # spriteStates: + # - cheese + # - cheesealt +# Tastes like bun, beef patty, cheese. + +- type: entity + name: crazy hamburger # Burger for you euro-cucks + parent: FoodBurgerBase + id: FoodBurgerCrazy + description: This looks like the sort of food that a demented clown in a trenchcoat would make. + components: + - type: Sprite + state: crazy +# Tastes like bun, a smoking flare, chili. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml new file mode 100644 index 0000000000..82bcf64801 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml @@ -0,0 +1,96 @@ +# Base + +- type: Tag + id: Egg + +- type: entity + parent: BaseItem + id: FoodEggBase + description: An egg! + abstract: true + components: + - type: Tag + tags: + - Egg + - type: Food + trash: Eggshells + - type: Sprite + sprite: Objects/Consumable/Food/egg.rsi + - type: Item + sprite: Objects/Consumable/Food/egg.rsi + netsync: false + size: 1 + - type: SolutionContainer + maxVol: 5 + contents: + reagents: + - ReagentId: chem.Egg + Quantity: 5 + - type: LoopingSound + - type: DamageOnLand + amount: 1 + - type: DamageOtherOnHit + amount: 1 + - type: Damageable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: desecration + - !type:SpawnEntitiesBehavior + spawn: + Eggshells: + min: 1 + max: 1 + PuddleEgg: + min: 1 + max: 2 + # Wow double-yolk you're so lucky! + - !type:DoActsBehavior + acts: [ "Destruction" ] + +# Splat + +- type: entity + name: egg + id: PuddleEgg + parent: PuddleBase + description: If the floor was a little hotter this would fry. + components: + - type: Sprite + sprite: Objects/Consumable/Food/egg.rsi + state: egg-0 + - type: Puddle + variants: 4 + +- type: entity + name: eggshells + parent: BaseItem + id: Eggshells + description: You're walkin' on 'em bud. + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/egg.rsi + state: eggshells + netsync: false + - type: Item + size: 1 + +# Egg + +- type: entity + parent: FoodEggBase + id: FoodEgg + name: egg + components: + - type: Sprite + sprite: Objects/Consumable/Food/egg.rsi + state: icon + - type: RandomSpriteState + spriteStates: + - icon + - white diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml new file mode 100644 index 0000000000..86d65c8845 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -0,0 +1,236 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodFrozenBase + abstract: true + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/frozen.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 20 # For sprinkles or something? Idk. + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +# Ice-cream + +- type: entity + name: ice-cream sandwich + parent: FoodFrozenBase + id: FoodFrozenSandwich + description: Portable ice-cream in its own packaging. + components: + - type: Sprite + state: sandwich + +- type: entity + name: strawberry ice-cream sandwich + parent: FoodFrozenBase + id: FoodFrozenSandwichStrawberry + description: Portable ice-cream in its own packaging of the strawberry variety. + components: + - type: Sprite + state: sandwich-strawberry + +- type: entity + name: space freezy + parent: FoodFrozenBase + id: FoodFrozenFreezy + description: The best ice-cream in space. + components: + - type: Sprite + state: spacefreezy + +- type: entity + name: ice-cream sundae + parent: FoodFrozenBase + id: FoodFrozenSundae + description: A classic dessert. + components: + - type: Sprite + state: spacefreezy + +- type: entity + name: cornuto + parent: FoodFrozenBase + id: FoodFrozenCornuto + description: A neapolitan vanilla and chocolate ice-cream cone. It menaces with a sprinkling of caramelized nuts. + components: + - type: Sprite + state: cornuto + +# Popsicle + +- type: entity + name: orange creamsicle + parent: FoodFrozenBase + id: FoodFrozenPopsicleOrange + description: A classic orange creamsicle. A sunny frozen treat. + components: + - type: Sprite + layers: + - state: stick + - state: popsicle-base + - state: popsicle + color: orange + - type: Food + trash: FoodFrozenPopsicleTrash + +- type: entity + name: berry creamsicle + parent: FoodFrozenBase + id: FoodFrozenPopsicleBerry + description: A vibrant berry creamsicle. A berry good frozen treat. + components: + - type: Sprite + layers: + - state: stick + - state: popsicle-base + - state: popsicle + color: red + - type: Food + trash: FoodFrozenPopsicleTrash + +- type: entity + name: jumbo ice-cream + parent: FoodFrozenBase + id: FoodFrozenPopsicleJumbo + description: A luxurious ice-cream covered in rich chocolate. It's smaller than you remember. + components: + - type: Sprite + layers: + - state: stick + - state: jumbo + - type: Food + trash: FoodFrozenPopsicleTrash + +- type: entity + name: nogga black + parent: FoodFrozenBase + id: FoodFrozenPopsicleNogga + description: A salty licorice ice-cream. Those who cannot remember the past are doomed to repeat it. + components: + - type: Sprite + layers: + - state: stick + - state: nogga + - type: Food + trash: FoodFrozenPopsicleTrash + +# Snowcone + +# Use this one as a base for other colored snowcones. Apply a color to the alpha +# layer depending on soda/syrup/waterever. Name and description will also have +# to be modified. +- type: entity + name: flavorless snowcone +# name: [Flavor] snowcone + parent: FoodFrozenBase + id: FoodFrozenSnowcone + description: It's just shaved ice. Still fun to chew on. +# description: [Liquid] drizzled over a snowball in a paper cup. + components: + - type: Sprite + layers: + - state: cone + - state: alpha-filling +# color: foo + - type: Food + trash: FoodFrozenSnowconeTrash + +- type: entity + name: berry snowcone + parent: FoodFrozenBase + id: FoodFrozenSnowconeBerry + description: Berry syrup drizzled over a snowball in a paper cup. + components: + - type: Sprite + layers: + - state: cone + - state: berry + - type: Food + trash: FoodFrozenSnowconeTrash + +- type: entity + name: fruit salad snowcone + parent: FoodFrozenBase + id: FoodFrozenSnowconeFruit + description: A delightful mix of citrus syrups drizzled over a snowball in a paper cup. + components: + - type: Sprite + layers: + - state: cone + - state: fruitsalad + - type: Food + trash: FoodFrozenSnowconeTrash + +- type: entity + name: clowncone + parent: FoodFrozenBase + id: FoodFrozenSnowconeClown + description: Laughter drizzled over a snowball in a paper cup. + components: + - type: Sprite + layers: + - state: cone + - state: clown + - type: Food + trash: FoodFrozenSnowconeTrash + +- type: entity + name: mime snowcone + parent: FoodFrozenBase + id: FoodFrozenSnowconeMime + description: ... + components: + - type: Sprite + layers: + - state: cone + - state: mime + - type: Food + trash: FoodFrozenSnowconeTrash + +- type: entity + name: rainbow snowcone + parent: FoodFrozenBase + id: FoodFrozenSnowconeRainbow + description: A very colorful snowball in a paper cup. + components: + - type: Sprite + layers: + - state: cone + - state: rainbow + - type: Food + trash: FoodFrozenSnowconeTrash + +# Trash + +- type: entity + name: paper cone + parent: BaseItem + id: FoodFrozenSnowconeTrash + description: A crumpled paper cone used for an icy treat. Worthless. + components: + - type: Sprite + sprite: Objects/Consumable/Food/frozen.rsi + state: cone-trash + netsync: false + +- type: entity + name: popsicle stick + parent: BaseItem + id: FoodFrozenPopsicleTrash + description: Once held a delicious treat. Now, 'tis barren. + components: + - type: Sprite + sprite: Objects/Consumable/Food/frozen.rsi + state: stick + - type: RandomSpriteState + spriteStates: + - stick + - stick2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml new file mode 100644 index 0000000000..d0ab9bdbfa --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -0,0 +1,351 @@ +# Lots of misc stuff in here, hard to parent it. + +# Reagent Containers + +- type: entity + parent: BaseItem + id: ReagentContainerBase + components: + - type: Sprite + netsync: false + sprite: Objects/Consumable/Food/ingredients.rsi + - type: SolutionContainer + maxVol: 50 + - type: SolutionTransfer + transferAmount: 5 + - type: Drink + openSounds: packetOpenSounds + useSound: eating + - type: Spillable + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerFlour + name: flour bag + description: A big bag of flour. Good for baking! + components: + - type: Sprite + state: flour-big + - type: SolutionContainer + contents: + reagents: + - ReagentId: Flour + Quantity: 50 + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerFlourSmall + name: flour pack + description: A pack of flour. Good for baking! + components: + - type: Sprite + state: flour-small + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Flour + Quantity: 20 + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerRice + name: rice bag + description: A big bag of rice. Good for cooking! + components: + - type: Sprite + state: rice-big + - type: SolutionContainer + contents: + reagents: + - ReagentId: Rice + Quantity: 50 + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerRiceSmall + name: rice pack + description: A pack of rice. Good for cooking! + components: + - type: Sprite + state: rice-small + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Rice + Quantity: 20 + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerSugar + name: sugar bag + description: A big bag of tasty spacey sugar. + components: + - type: Sprite + state: sugar-big + - type: SolutionContainer + contents: + reagents: + - ReagentId: Sugar + Quantity: 50 + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerSugarSmall + name: sugar pack + description: A pack of tasty spacey sugar. + components: + - type: Sprite + state: sugar-small + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Sugar + Quantity: 20 + +# Milk + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerMilk + name: milk + description: It's milk. White and nutritious goodness! + components: + - type: Sprite + state: milk + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Milk + Quantity: 20 + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerMilkSoy + name: soy milk + description: It's soy milk. White and nutritious goodness! + components: + - type: Sprite + state: milk-soy + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: MilkSoy + Quantity: 20 + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerMilkOat + name: oat milk + description: It's oat milk. Tan and nutritious goodness! + components: + - type: Sprite + state: milk-oat + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: MilkOat + Quantity: 20 + +# Misc + +- type: entity + parent: ReagentContainerBase + id: ReagentContainerOliveoil + name: olive oil + description: Olive oil. From space olives presumably. + components: + - type: Sprite + state: oliveoil + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: OilOlive + Quantity: 20 + +# - type: entity +# parent: ReagentContainerBase +# id: ReagentContainerMayo +# name: mayonnaise +# description: +# components: +# - type: Sprite +# state: mayo +# - type: SolutionContainer +# maxVol: 10 +# contents: +# reagents: +# - ReagentId: Mayo +# Quantity: 10 + +# - type: entity +# parent: ReagentContainerBase +# id: ReagentContainerAllspice +# name: all-spice +# description: +# components: +# - type: Sprite +# state: spice +# - type: SolutionContainer +# maxVol: 10 +# contents: +# reagents: +# - ReagentId: Allspice +# Quantity: 10 + +# Baking + +- type: entity + abstract: true + parent: BaseItem + id: FoodBakingBase + description: Used in various recipes. + components: + - type: Sprite + sprite: Objects/Consumable/Food/ingredients.rsi + netsync: false + - type: Food + - type: SolutionContainer + maxVol: 15 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: dough + parent: FoodBakingBase + id: FoodDough + description: A piece of dough. + components: + - type: Sprite + state: dough + - type: SliceableFood + count: 3 + slice: FoodDoughSlice + +- type: entity + name: dough slice + parent: FoodBakingBase + id: FoodDoughSlice + description: A slice of dough. Can be cooked into a bun. + components: + - type: Sprite + state: dough-slice + +- type: entity + name: bun + parent: FoodBakingBase + id: FoodDoughBun + description: A base for any self-respecting burger. + components: + - type: Sprite + sprite: Objects/Consumable/Food/burger.rsi + state: bun + +- type: entity + name: raw pastry base + parent: FoodBakingBase + id: FoodDoughPastryBaseRaw + description: Must be cooked before use. + components: + - type: Sprite + state: dough-pastry + +- type: entity + name: pastry base + parent: FoodBakingBase + id: FoodDoughPastryBase + description: A base for any self-respecting pastry. + components: + - type: Sprite + state: dough-pastry-baked + +- type: entity + name: pie dough + parent: FoodBakingBase + id: FoodDoughPie + description: Cook it to get a pie. + components: + - type: Sprite + state: dough-pie + +- type: entity + name: flat dough + parent: FoodBakingBase + id: FoodDoughFlat + description: A flattened dough. + components: + - type: Sprite + state: dough-flat + +- type: entity + name: pizza bread + parent: FoodBakingBase + id: FoodDoughPizzaBaked + description: Add ingredients to make a pizza. + components: + - type: Sprite + state: pizzabread + +- type: entity + name: cake batter + parent: FoodBakingBase + id: FoodCakeBatter + description: Cook it to get a cake. + components: + - type: Sprite + state: cakebatter + +- type: entity + name: stick of butter + parent: FoodBakingBase + id: FoodButter + description: A stick of delicious, golden, fatty goodness. + components: + - type: Sprite + state: butter + +- type: entity + name: cheese wheel + parent: FoodBakingBase + id: FoodCheese + description: A big wheel of delcious Cheddar. + components: + - type: Sprite + state: cheesewheel + - type: SliceableFood + count: 3 + slice: FoodCheeseSlice + +- type: entity + name: cheese wedge + parent: FoodBakingBase + id: FoodCheeseSlice + description: A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far. + components: + - type: Sprite + state: cheesewedge + +- type: entity + name: burned mess + parent: FoodBakingBase + id: FoodBadRecipe + description: Someone should be demoted from cook for this. + components: + - type: Sprite + state: badrecipe + - type: SolutionContainer + maxVol: 5 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: chem.Toxin + Quantity: 3 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml new file mode 100644 index 0000000000..e6b5d75aa8 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -0,0 +1,239 @@ +# A bunch of different meals. This stuff doesn't come off their plates because +# it's assembled on them. Or they just don't have plates. + +# Base + +- type: entity + parent: BaseItem + id: FoodMealBase + abstract: true + description: A delicious meal, cooked with love. + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/meals.rsi + netsync: false + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 20 + +# Meals + +- type: entity + name: loaded baked potato + parent: FoodMealBase + id: FoodMealPotatoLoaded + description: Totally baked. + components: + - type: Sprite + state: loadedbakedpotato +# Tastes like potato. + +- type: entity + name: space fries + parent: FoodMealBase + id: FoodMealFries + description: AKA, French Fries, Freedom Fries, etc. + components: + - type: Sprite + state: fries +# Tastes like fries, salt. + +- type: entity + name: cheesy fries + parent: FoodMealBase + id: FoodMealFriesCheesy + description: Fries. Covered in cheese. Duh. + components: + - type: Sprite + state: fries-cheesy +# Tastes like fries, cheese. + +- type: entity + name: carrot fries + parent: FoodMealBase + id: FoodMealFriesCarrot + description: Tasty fries from fresh carrots. + components: + - type: Sprite + state: fries-carrot +# Tastes like carrots, salt. + +- type: entity + name: nachos + parent: FoodMealBase + id: FoodMealNachos + description: Chips from Space Mexico. + components: + - type: Sprite + state: nachos +# Tastes like nachos. + +- type: entity + name: cheesy nachos + parent: FoodMealBase + id: FoodMealNachosCheesy + description: The delicious combination of nachos and melting cheese. + components: + - type: Sprite + state: nachos-cheesy +# Tastes like nachos, cheese. + +- type: entity + name: Cuban nachos + parent: FoodMealBase + id: FoodMealNachosCuban + description: That's some dangerously spicy nachos. + components: + - type: Sprite + state: nachos-cuban +# Tastes like nachos, hot pepper. + +- type: entity + name: mint + parent: FoodMealBase + id: FoodMealMint + description: It's wafer thin. + components: + - type: Sprite + state: mint + - type: SolutionContainer + maxVol: 1 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 1 +# Tastes like parsnips, salt. + +- type: entity + name: eggplant parmigiana + parent: FoodMealBase + id: FoodMealEggplantParm + description: The only good recipe for eggplant. + components: + - type: Sprite + state: eggplantparm +# Tastes like eggplant, cheese. + +- type: entity + name: yaki imo + parent: FoodMealBase + id: FoodMealPotatoYaki + description: Made with roasted sweet potatoes! + components: + - type: Sprite + state: yakiimo +# Tastes like sweet potato. + +- type: entity + name: Cuban carp + parent: FoodMealBase + id: FoodMealCubancarp + description: A grifftastic sandwich that burns your tongue and then leaves it numb! + components: + - type: Sprite + state: cubancarp +# Tastes like fish, batter, hot peppers. + +- type: entity + name: corned beef and cabbage + parent: FoodMealBase + id: FoodMealCornedbeef + description: Now you can feel like a real tourist vacationing in Ireland. + components: + - type: Sprite + state: cornedbeef +# Tastes like meat, cabbage. + +- type: entity + name: Filet migrawr + parent: FoodMealBase + id: FoodMealBearsteak + description: Because eating bear wasn't manly enough. + components: + - type: Sprite + state: bearsteak +# Tastes like meat, salmon. + +- type: entity + name: pig in a blanket + parent: FoodMealBase + id: FoodMealPigblanket + description: A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it. + components: + - type: Sprite + state: pigblanket +# Tastes like meat, butter. + +- type: entity + name: bbq ribs + parent: FoodMealBase + id: FoodMealRibs + description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist. + components: + - type: Sprite + state: ribs +# Tastes like meat, smokey sauce. + +- type: entity + name: eggs benedict + parent: FoodMealBase + id: FoodMealEggsbenedict + description: There is only one egg on this, how rude. + components: + - type: Sprite + state: benedict +# Tastes like eggs, bacon, bun. + +- type: entity # FUCK THE FRENCH + name: omelette du fromage + parent: FoodMealBase + id: FoodMealOmelette + description: That's all you can say! + components: + - type: Sprite + state: omelette +# Tastes like egg, cheese. + +- type: entity + name: fried egg + parent: FoodMealBase + id: FoodMealFriedegg + description: A fried egg, with a touch of salt and pepper. + components: + - type: Sprite + state: friedegg +# Tastes like egg, salt, pepper. + +- type: entity + name: milk ape + parent: FoodMealBase + id: FoodMealMilkape + description: The king of Jungle Thick. + components: + - type: Sprite + state: milkape +# Tastes like milk, chocolate, the jungle. + +- type: entity + name: memory leek + parent: FoodMealBase + id: FoodMealMemoryleek + description: This should refresh your memory. + components: + - type: Sprite + state: memoryLeek +# Tastes like pain. + +- type: entity + name: salty sweet miso cola soup + parent: FoodMealBase + id: DisgustingSweptSoup + description: Jesus christ. + components: + - type: Sprite + state: saltysweet +# Tastes awesome. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml new file mode 100644 index 0000000000..3d9c0e8462 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -0,0 +1,915 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodMeatBase + abstract: true + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/meat.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: chem.Toxin + Quantity: 1 + - type: Item + size: 5 + +- type: Tag + id: Raw + +- type: Tag + id: Cooked + +- type: Tag + id: Cutlet + +# Raw + +- type: entity + name: raw meat + parent: FoodMeatBase + id: FoodMeat + description: A slab of raw meat. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: plain + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + - type: SliceableFood + count: 3 + slice: FoodMeatCutlet + +- type: entity + name: raw bacon + parent: FoodMeatBase + id: FoodMeatBacon + description: A raw piece of bacon. + components: + - type: Tag + tags: + - Raw + - type: Sprite + netsync: true + state: bacon + - type: RandomSpriteState + spriteStates: + - bacon + - bacon2 + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw bear meat + parent: FoodMeatBase + id: FoodMeatBear + description: A very manly slab of raw bear meat. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: bear + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + - type: SliceableFood + count: 3 + slice: FoodMeatBearCutlet + +- type: entity + name: raw penguin meat + parent: FoodMeatBase + id: FoodMeatPenguin + description: A slab of raw penguin meat. Can be used as a substitute for fish in recipes. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: bird + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + - type: SliceableFood + count: 3 + slice: FoodMeatPenguinCutletSlice + +- type: entity + name: raw chicken meat + parent: FoodMeatBase + id: FoodMeatChicken + description: A slab of raw chicken. Remember to wash your hands! + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: bird + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + - type: SliceableFood + count: 3 + slice: FoodMeatChickenCutlet + +- type: entity + name: raw crab meat + parent: FoodMeatBase + id: FoodMeatCrab + description: A pile of raw crab meat. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: crab + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw goliath meat + parent: FoodMeatBase + id: FoodMeatGoliath + description: A slab of goliath meat. It's not very edible now, but it cooks great in lava. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: goliath + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 5 + +- type: entity + name: raw lizard meat + parent: FoodMeatBase + id: FoodMeatLizard + description: Delicious dino damage. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: lizard + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + - type: SliceableFood + count: 3 + slice: FoodMeatLizardCutlet + +- type: entity + name: raw plant meat + parent: FoodMeatBase + id: FoodMeatPlant + description: All the joys of healthy eating with all the fun of cannibalism. + components: + - type: Sprite + state: plant + +- type: entity + name: rotten meat + parent: FoodMeatBase + id: FoodMeatRotten + description: Halfway to becoming fertilizer for your garden. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: rotten + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 20 + +- type: entity + name: raw spider meat + parent: FoodMeatBase + id: FoodMeatSpider + description: A slab of spider meat. That's so Kafkaesque. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: spider + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 20 + - type: SliceableFood + count: 3 + slice: FoodMeatSpiderCutlet + +- type: entity + name: raw spider leg + parent: FoodMeatBase + id: FoodMeatSpiderLeg + description: A still twitching leg of a giant spider... you don't really want to eat this, do you? + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: spiderleg + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 10 + +- type: entity + name: meatwheat clump + parent: FoodMeatBase + id: FoodMeatWheat + description: This doesn't look like meat, but your standards aren't that high to begin with. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: clump + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw xeno meat + parent: FoodMeatBase + id: FoodMeatXeno + description: A slab of xeno meat, dripping with acid. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: xeno + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.SulfuricAcid + Quantity: 20 + - type: SliceableFood + count: 3 + slice: FoodMeatXenoCutlet + +- type: entity + name: killer tomato meat + parent: FoodMeatBase + id: FoodMeatTomato + description: A slice from a huge tomato. + components: + - type: Sprite + state: tomato + - type: SliceableFood + count: 3 + slice: FoodMeatTomatoCutlet + +- type: entity + name: salami + parent: FoodMeatBase + id: FoodMeatSalami + description: A large tube of salami. Best not to ask what went into it. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: salami + - type: SliceableFood + slice: FoodMeatSalamiSlice + +- type: entity + name: meat clown + parent: FoodMeatBase + id: FoodMeatClown + description: A delicious, round piece of meat clown. How horrifying. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: clown + - type: SliceableFood + slice: FoodMeatSalamiSlice + +- type: entity + name: meatball + parent: FoodMeatBase + id: FoodMeatMeatball + description: A raw ball of meat. Not a homosexual. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: meatball + +# Cooked + +- type: entity + name: steak + parent: FoodMeatBase + id: FoodMeatCooked + description: A cooked slab of meat. Smells primal. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: plain-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 20 + - type: SliceableFood + count: 3 + slice: FoodMeatCutletCooked + +- type: entity + name: bacon + parent: FoodMeatBase + id: FoodMeatBaconCooked + description: A delicious piece of cooked bacon. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + netsync: true + layers: + - state: plate-meat + - state: bacon-cooked + - type: RandomSpriteState + spriteLayer: 1 + spriteStates: + - bacon-cooked + - bacon2-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: cooked bear + parent: FoodMeatBase + id: FoodMeatBearCooked + description: A well-cooked slab of bear meat. Tough, but tasty with the right sides. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: product-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: SliceableFood + count: 3 + slice: FoodMeatBearCutletCooked + +- type: entity + name: penguin filet + parent: FoodMeatBase + id: FoodMeatPenguinCooked + description: A cooked filet of penguin. Can be used as a substitute for fish in recipes. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: bird-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - type: SliceableFood + count: 3 + slice: FoodMeatPenguinCutletCooked + +- type: entity + name: cooked chicken + parent: FoodMeatBase + id: FoodMeatChickenCooked + description: A cooked piece of chicken. Best used in other recipes. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: bird-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: SliceableFood + count: 3 + slice: FoodMeatChickenCutletCooked + +- type: entity + name: fried chicken + parent: FoodMeatBase + id: FoodMeatChickenFried + description: A juicy hunk of chicken meat, fried to perfection. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + netsync: true + state: chicken-fried + - type: RandomSpriteState + spriteStates: + - chicken-fried + - chicken2-fried + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: cooked crab + parent: FoodMeatBase + id: FoodMeatCrabCooked + description: Some deliciously cooked crab meat. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: crab-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: goliath steak + parent: FoodMeatBase + id: FoodMeatGoliathCooked + description: A delicious, lava cooked steak. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: goliath-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: lizard steak + parent: FoodMeatBase + id: FoodMeatLizardCooked + description: Cooked, tough lizard meat. + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: lizard-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: SliceableFood + count: 3 + slice: FoodMeatLizardCutletCooked + +- type: entity + name: boiled spider leg + parent: FoodMeatBase + id: FoodMeatSpiderlegCooked + description: A giant spider's leg that's still twitching after being cooked. Gross! + components: + - type: Tag + tags: + - Cooked + - type: Food + trash: FoodPlateSmall + - type: Sprite + layers: + - state: plate-meat + - state: spiderleg-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 15 + +- type: entity + name: meatball + parent: FoodMeatBase + id: FoodMeatMeatballCooked + description: A cooked meatball. Perfect to add to other dishes... except fruity ones. + components: + - type: Tag + tags: + - Cooked + - type: Sprite + state: meatball-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +# Cutlets + +# Raw + +- type: entity + name: raw cutlet + parent: FoodMeatBase + id: FoodMeatCutlet + description: A raw meat cutlet. + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + state: cutlet + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw bear cutlet + parent: FoodMeatBase + id: FoodMeatBearCutlet + description: A very manly cutlet of raw bear meat. + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + layers: + - state: cutlet + - state: cutlet-alpha + color: brown + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw penguin cutlet + parent: FoodMeatBase + id: FoodMeatPenguinCutlet + description: A cutlet of raw penguin meat. Can be used as a substitute for fish in recipes. + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + state: cutlet + color: white + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw chicken cutlet + parent: FoodMeatBase + id: FoodMeatChickenCutlet + description: A cutlet of raw chicken. Remember to wash your hands! + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + state: cutlet + color: white + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw lizard cutlet + parent: FoodMeatBase + id: FoodMeatLizardCutlet + description: Delicious dino cutlet. + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + layers: + - state: cutlet + color: green + - state: cutlet-alpha + color: pink + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 1 + +- type: entity + name: raw spider cutlet + parent: FoodMeatBase + id: FoodMeatSpiderCutlet + description: A cutlet of raw spider meat. So Kafkaesque. + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + layers: + - state: cutlet + color: black + - state: cutlet-alpha + color: red + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Toxin + Quantity: 20 + +- type: entity + name: raw xeno cutlet + parent: FoodMeatBase + id: FoodMeatXenoCutlet + description: A slab of raw xeno meat, dripping with acid. + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + layers: + - state: cutlet + color: black + - state: cutlet-alpha + color: green + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.SulfuricAcid + Quantity: 20 + +- type: entity + name: raw killer tomato cutlet + parent: FoodMeatBase + id: FoodMeatTomatoCutlet + description: A cutlet from a slab of tomato. + components: + - type: Tag + tags: + - Cutlet + - type: Sprite + state: salami-slice + color: red + +- type: entity + name: salami slice + parent: FoodMeatBase + id: FoodMeatSalamiSlice + description: A slice of cured salami. + components: + - type: Tag + tags: + - Raw + - Cutlet + - type: Sprite + state: salami-slice + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 2 + +# Cooked + +- type: entity + name: cutlet + parent: FoodMeatBase + id: FoodMeatCutletCooked + description: A cooked meat cutlet. Needs some seasoning. + components: + - type: Tag + tags: + - Cooked + - Cutlet + - type: Sprite + state: cutlet-cooked + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: bear cutlet + parent: FoodMeatBase + id: FoodMeatBearCutletCooked + description: A very manly cutlet of cooked bear meat. + components: + - type: Tag + tags: + - Cooked + - Cutlet + - type: Sprite + layers: + - state: cutlet-cooked + - state: cutlet-alpha + color: brown + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: penguin cutlet + parent: FoodMeatBase + id: FoodMeatPenguinCutletCooked + description: A cutlet of cooked penguin meat. + components: + - type: Tag + tags: + - Cooked + - Cutlet + - type: Sprite + state: cutlet-cooked + color: white + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: chicken cutlet + parent: FoodMeatBase + id: FoodMeatChickenCutletCooked + description: A cutlet of cooked chicken. Remember to wash your hands! + components: + - type: Tag + tags: + - Cooked + - Cutlet + - type: Sprite + state: cutlet-cooked + color: white + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: lizard cutlet + parent: FoodMeatBase + id: FoodMeatLizardCutletCooked + description: Delicious cooked dino cutlet. + components: + - type: Tag + tags: + - Cooked + - Cutlet + - type: Sprite + layers: + - state: cutlet-cooked + color: green + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: spider cutlet + parent: FoodMeatBase + id: FoodMeatSpiderCutletCooked + description: A cutlet of cooked spider meat. Finally edible. + components: + - type: Tag + tags: + - Cooked + - Cutlet + - type: Sprite + layers: + - state: cutlet-cooked + color: black + - state: cutlet-alpha + color: red + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + +- type: entity + name: xeno cutlet + parent: FoodMeatBase + id: FoodMeatXenoCutletCooked + description: A cutlet of cooked xeno, dripping with... tastiness? + components: + - type: Tag + tags: + - Cooked + - Cutlet + - type: Sprite + layers: + - state: cutlet-cooked + color: black + - state: cutlet-alpha + color: green + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml new file mode 100644 index 0000000000..5c0f7ebce4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml @@ -0,0 +1,104 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodNoodlesBase + abstract: true + description: Now that's a nice pasta! + components: + - type: Food + trash: FoodPlate + - type: Sprite + sprite: Objects/Consumable/Food/noodles.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 20 + +# Noodles + +- type: entity + name: boiled spaghetti + parent: FoodNoodlesBase + id: FoodNoodlesBoiled + description: A plain dish of noodles, this needs more ingredients. + components: + - type: Sprite + layers: + - state: plate + - state: boiled +# Tastes like pasta. + +- type: entity + name: spaghetti + parent: FoodNoodlesBase + id: FoodNoodles + description: Spaghetti and crushed tomatoes. Just like your abusive father used to make! + components: + - type: Sprite + layers: + - state: plate + - state: tomato +# Tastes like pasta, tomato. + +- type: entity + name: copypasta + parent: FoodNoodlesBase + id: FoodNoodlesCopy + description: You probably shouldn't try this, you always hear people talking about how bad it is... + components: + - type: Sprite + state: copypasta +# Tastes like pasta, bad humor. + +- type: entity + name: spaghetti and meatballs + parent: FoodNoodlesBase + id: FoodNoodlesMeatball + description: Now that's a nica meatball! + components: + - type: Sprite + layers: + - state: plate + - state: meatball +# Tastes like pasta, meat. + +- type: entity + name: spesslaw + parent: FoodNoodlesBase + id: FoodNoodlesSpesslaw + description: A lawyer's favourite. + components: + - type: Sprite + layers: + - state: plate + - state: spesslaw +# Tastes like pasta, meat. + +- type: entity + name: chow mein + parent: FoodNoodlesBase + id: FoodNoodlesChowmein + description: A nice mix of noodles and fried vegetables. + components: + - type: Sprite + layers: + - state: plate + - state: chowmein +# Tastes like pasta, tomato. + +- type: entity + name: butter noodles + parent: FoodNoodlesBase + id: FoodNoodlesButter + description: Noodles covered in savory butter. Simple and slippery, but delicious. + components: + - type: Sprite + layers: + - state: plate + - state: butter +# Tastes like pasta, butter. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml new file mode 100644 index 0000000000..eaa914b0c0 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -0,0 +1,382 @@ +- type: entity + parent: BaseItem + id: ProduceBase + abstract: true + components: + - type: SolutionContainer + caps: None + - type: Sprite + netsync: false + state: produce + - type: Produce + - type: Tag + tags: + - Grindable + +- type: entity + name: wheat bushel + description: Sigh... wheat... a-grain? + id: WheatBushel + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/wheat.rsi + - type: SolutionContainer + caps: None + contents: + reagents: + - ReagentId: Flour + Quantity: 10 + - type: Produce + seed: wheat + +- type: entity + name: oat bushel + description: Eat oats, do squats. + id: OatBushel + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/oat.rsi + - type: SolutionContainer + caps: None + contents: + reagents: + - ReagentId: Oats + Quantity: 10 + - type: Produce + seed: oat + - type: Juiceable + result: + reagents: + - ReagentId: MilkOat + Quantity: 5 + +- type: entity + name: sugarcane + description: Sickly sweet. + id: Sugarcane + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/sugarcane.rsi + - type: SolutionContainer + caps: None + contents: + reagents: + - ReagentId: Glucose + Quantity: 10 + - type: Produce + seed: sugarcane + +- type: entity + name: tower-cap log + description: It's better than bad, it's good! + id: Log + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/towercap.rsi + - type: SolutionContainer + caps: None + - type: MeleeWeapon + - type: Produce + seed: towercap + - type: Log + +- type: entity + name: banana + parent: ProduceBase + id: FoodBanana + description: Rich in potassium. + components: + - type: Food + trash: TrashBananaPeel + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/banana.rsi + - type: Produce + seed: banana + - type: Juiceable + result: + reagents: + - ReagentId: JuiceBanana + Quantity: 10 + +- type: entity + name: carrot + parent: ProduceBase + id: FoodCarrot + description: It's good for the eyes! + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/carrot.rsi + - type: Produce + seed: carrots + - type: Juiceable + result: + reagents: + - ReagentId: JuiceCarrot + Quantity: 10 + +- type: entity + name: lemon + parent: ProduceBase + id: FoodLemon + description: When life gives you lemons, be grateful they aren't limes. + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/lemon.rsi + - type: Produce + seed: lemon + - type: Juiceable + result: + reagents: + - ReagentId: JuiceLime + Quantity: 10 + +- type: entity + name: pineapple + parent: ProduceBase + id: FoodPineapple + description: Mmm, tropical. + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/pineapple.rsi + - type: Produce + seed: pineapple + - type: Juiceable + result: + reagents: + - ReagentId: JuicePineapple + Quantity: 10 + - type: SliceableFood + count: 5 + slice: FoodPineappleSlice + +- type: entity + name: potato + parent: ProduceBase + id: FoodPotato + description: The space Irish starved to death after their potato crops died. Sadly they were unable to fish for space carp due to it being the queen's space. Bringing this up to any space IRA member will drive them insane with anger. + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/potato.rsi + - type: Produce + seed: potato + +- type: entity + name: tomato + parent: ProduceBase + id: FoodTomato + description: I say to-mah-to, you say tom-mae-to. + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/tomato.rsi + - type: Produce + seed: tomato + - type: Juiceable + result: + reagents: + - ReagentId: JuiceTomato + Quantity: 10 + +- type: entity + name: eggplant + parent: ProduceBase + id: FoodEggplant + description: Maybe there's a chicken inside? + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/eggplant.rsi + - type: Produce + seed: eggplant + +- type: entity + name: apple + parent: ProduceBase + id: FoodApple + description: It's a little piece of Eden. + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/apple.rsi + - type: Produce + seed: apple + - type: Juiceable + result: + reagents: + - ReagentId: JuiceApple + Quantity: 10 + +- type: entity + name: ear of corn + parent: ProduceBase + id: FoodCorn + description: Needs some butter! And some cooking... + components: + - type: Food + trash: TrashCornCob + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/corn.rsi + - type: Produce + seed: corn + +- type: entity + name: onion + parent: ProduceBase + id: FoodOnion + description: Nothing to cry over. + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/onion.rsi + - type: Produce + seed: onion + - type: SliceableFood + count: 5 + slice: FoodOnionSlice + +- type: entity + name: red onion + parent: ProduceBase + id: FoodOnionRed + description: Purple despite the name. + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/onion_red.rsi + - type: Produce + seed: onionred + - type: SliceableFood + count: 4 + slice: FoodOnionRedSlice + +- type: entity + name: chanterelle cluster + parent: ProduceBase + id: FoodMushroom + description: "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!" + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/chanterelle.rsi + - type: Produce + seed: chanterelle + +# Slices + +- type: entity + parent: BaseItem + id: ProduceSliceBase + abstract: true + components: + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 2 + - type: Sprite + netsync: false + state: slice + - type: Tag + tags: + - Grindable + +- type: entity + name: pineapple slice + parent: ProduceSliceBase + id: FoodPineappleSlice + description: Mmm, tropical. + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/pineapple.rsi + - type: Juiceable + result: + reagents: + - ReagentId: JuicePineapple + Quantity: 2 + +- type: entity + name: onion slice + parent: ProduceSliceBase + id: FoodOnionSlice + description: Nothing to cry over. + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/onion.rsi + +- type: entity + name: red onion slice + parent: ProduceSliceBase + id: FoodOnionRedSlice + description: Purple despite the name. + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/onion_red.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml new file mode 100644 index 0000000000..704e8a7376 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -0,0 +1,142 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodSkewerBase + abstract: true + components: + - type: Food + trash: FoodKebabSkewer + - type: Sprite + sprite: Objects/Consumable/Food/skewer.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 20 + - type: Item + size: 5 + +# Kebabs + +# Thoughts on custom kebab system. Kebab items are separated into layers. Only +# cutlets and specific items should be put on skewers, which is why i've tagged the cutlets +# among other reasons. The system would specify between large and small skewer items, since +# there is only so much space the sprite can hold. There are four "spots" on the skewer for +# items, which means only 2 large items at a time can be on one. For examplehe thought it +# you can put two lizard tails on a skewer with two cutlets inbetween. +# This system of layers and spots also means that skewers can be progressively "eaten", meaning +# that layers are made invisible as it gets eaten. + +# NOTE: Rats take up spots 2 and 4 and tails take up 1 and 3. This is important for sprite layering. + +- type: entity + name: skewer + parent: BaseItem + id: FoodKebabSkewer + description: A thin rod of metal used to skewer just about anything and cook it. + components: + - type: Sprite + sprite: Objects/Consumable/Food/skewer.rsi + state: skewer + +# Custom Kebab Example + +- type: entity + name: Hawaiian kebab + parent: FoodSkewerBase + id: FoodMeatHawaiianKebab + description: A delicious kebab made of pineapple, ham and green peppers. + components: + - type: Sprite + layers: + - state: skewer + - state: skewer-meat-alpha1 + color: yellow + - state: skewer-meat-alpha2 + color: brown + - state: skewer-meat-alpha3 + color: green + - state: skewer-meat-alpha4 + color: brown + +- type: entity + name: meat kebab + parent: FoodSkewerBase + id: FoodMeatKebab + description: Delicious meat, on a stick. + components: + - type: Sprite + layers: + - state: skewer + - state: skewer-meat1 + - state: skewer-meat2 + - state: skewer-meat3 + - state: skewer-meat4 + +- type: entity + name: human kebab + parent: FoodMeatKebab + id: FoodMeatHumanKebab + description: Human meat. On a stick! + +- type: entity + name: lizard-tail kebab + parent: FoodSkewerBase + id: FoodMeatLizardtailKebab + description: Severed lizard tail on a stick. + components: + - type: Sprite + layers: + - state: skewer + - state: skewer-tail1 + +- type: entity + name: rat kebab + parent: FoodSkewerBase + id: FoodMeatRatKebab + description: Not so delicious rat meat, on a stick. + components: + - type: Sprite + layers: + - state: skewer + - state: skewer-rat1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 5 + +- type: entity + name: double rat kebab + parent: FoodSkewerBase + id: FoodMeatRatdoubleKebab + description: A double serving of not so delicious rat meat, on a stick. + components: + - type: Sprite + layers: + - state: skewer + - state: skewer-rat1 + - state: skewer-rat2 + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + name: fiesta kebab + parent: FoodSkewerBase + id: FoodMeatFiestaKebab + description: Always a cruise ship party somewhere in the world, right? + components: + - type: Sprite + layers: + - state: skewer + - state: skewer-pepper4 + - state: skewer-corn2 + - state: skewer-mushroom2 + - state: skewer-tomato1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml new file mode 100644 index 0000000000..b3fe15a37c --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -0,0 +1,281 @@ +# Base + +- type: entity + parent: BaseItem + id: FoodSnackBase + abstract: true + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + netsync: false + - type: LoopingSound + - type: SolutionContainer + maxVol: 30 # Room for extra condiments + contents: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + HeldPrefix: packet + +# Snacks + +# "Snacks" means food in a packet. Down the line this stuff can have multiple +# reagents and shit for healing or different effects. + +- type: entity + name: boritos + parent: FoodSnackBase + id: FoodSnackBoritos + description: Crunchy, salty tortilla chips. You could probably make nachos with these. + components: + - type: Sprite + state: boritos + - type: Item + color: blue + - type: Food + trash: FoodPacketBoritosTrash + +- type: entity + name: cheesie honkers + parent: FoodSnackBase + id: FoodSnackCheesie + description: Bite sized cheesie snacks that will honk all over your mouth. + components: + - type: Sprite + state: cheesiehonkers + - type: Item + color: orange + - type: Food + trash: FoodPacketCheesieTrash + +- type: entity + name: chips + parent: FoodSnackBase + id: FoodSnackChips + description: Commander Riker's What-The-Crisps. + components: + - type: Sprite + state: chips + - type: Item + color: green + - type: Food + trash: FoodPacketChipsTrash + +- type: entity + name: chocolate bar + parent: FoodSnackBase + id: FoodSnackChocolate + description: Tastes like cardboard. + components: + - type: Sprite + layers: + - state: chocolatebar-open + - state: chocolatebar + - type: Item + color: red + - type: Food + trash: FoodPacketChocolateTrash + +- type: entity + name: energy bar + parent: FoodSnackBase + id: FoodSnackEnergybar + description: An energy bar with a lot of punch. + components: + - type: Sprite + state: energybar + - type: Item + color: green + - type: Food + trash: FoodPacketEnergyTrash + +- type: entity + name: popcorn + parent: FoodSnackBase + id: FoodSnackPopcorn + description: Grown on an unknown planet, by an unknown farmer, popped by some jerk on a space station. + components: + - type: Sprite + state: popcorn + - type: Item + color: blue + - type: Food + trash: FoodPacketPopcornTrash + +- type: entity + name: 4no raisins + parent: FoodSnackBase + id: FoodSnackRaisins + description: Best raisins in the universe. Not sure why. + components: + - type: Sprite + state: raisins + - type: Item + color: red + - type: Food + trash: FoodPacketRaisinsTrash + +- type: entity + name: Sus Jerky + parent: FoodSnackBase + id: FoodSnackSus + description: Something about this packet makes you feel incredibly uneasy. Jerky's good though. + components: + - type: Sprite + state: susjerky + - type: Item + color: red + - type: Food + trash: FoodPacketSusTrash + +- type: entity + name: syndi-cakes + parent: FoodSnackBase + id: FoodSnackSyndi + description: An extremely moist snack cake that tastes just as good after being nuked. + components: + - type: Sprite + state: syndicakes + - type: Item + color: white + - type: Food + trash: FoodPacketSyndiTrash + +# Trash + +- type: entity + abstract: true + parent: BaseItem + id: FoodPacketTrash + description: This is rubbish. + components: + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + netsync: false + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + HeldPrefix: packet + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketBoritosTrash + name: boritos bag + components: + - type: Sprite + state: boritos-trash + - type: Item + color: blue + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketCheesieTrash + name: cheesie honkers + components: + - type: Sprite + state: cheesiehonkers-trash + - type: Item + color: orange + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketChipsTrash + name: chips + components: + - type: Sprite + state: chips-trash + - type: Item + color: green + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketChocolateTrash + name: chocolate wrapper + components: + - type: Sprite + state: chocolatebar-trash + - type: Item + color: red + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketEnergyTrash + name: energybar wrapper + components: + - type: Sprite + state: energybar-trash + - type: Item + color: green + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketPistachioTrash + name: pistachios packet + components: + - type: Sprite + state: pistachio-trash + - type: Item + color: green + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketPopcornTrash + name: popcorn box + components: + - type: Sprite + state: popcorn-trash + - type: Item + state: blue + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketRaisinsTrash + name: 4no raisins + components: + - type: Sprite + state: raisins-trash + - type: Item + color: red + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketSemkiTrash + name: semki packet + components: + - type: Sprite + state: semki-trash + - type: Item + color: orange + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketSusTrash + name: sus jerky + components: + - type: Sprite + state: susjerky-trash + - type: Item + color: red + +- type: entity + abstract: true + parent: FoodPacketTrash + id: FoodPacketSyndiTrash + name: syndi-cakes box + components: + - type: Sprite + state: syndicakes-trash + - type: Item + color: white diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml new file mode 100644 index 0000000000..95d8810b6b --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -0,0 +1,521 @@ +- type: entity + parent: BaseItem + id: FoodBowlBase + abstract: true + components: + - type: Food + trash: FoodBowlBig + - type: LoopingSound + - type: SolutionContainer + maxVol: 20 + contents: + reagents: + - ReagentId: Nutriment + Quantity: 20 + trash: BowlBigTrash + - type: Sprite + sprite: Objects/Consumable/Food/bowl.rsi + netsync: false + - type: DamageOnLand + amount: 5 + - type: DamageOtherOnHit + amount: 5 + - type: Spillable + - type: Damageable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundCollectionBehavior + soundCollection: GlassBreak + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + BowlBigTrash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +# Custom Soup Example + +- type: entity + name: pea soup + parent: FoodBowlBase + id: FoodSoupPea + description: A humble split pea soup. + components: + - type: Sprite + sprite: Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: alpha-filling + color: green +# Tastes like creamy peas. + +# Salad + +- type: entity + name: aesir salad + parent: FoodBowlBase + id: FoodSaladAesir + description: Probably too incredible for mortals to fully enjoy. + components: + - type: Sprite + layers: + - state: bowl + - state: aesir +# Tastes like leaves + +- type: entity + name: herb salad + parent: FoodBowlBase + id: FoodSaladHerb + description: A tasty salad with apples on top. + components: + - type: Sprite + layers: + - state: bowl + - state: herb +# Tastes like leaves, apples. + +- type: entity + name: valid salad + parent: FoodBowlBase + id: FoodSaladValid + description: It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it. + components: + - type: Sprite + layers: + - state: bowl + - state: valid +# Tastes like leaves, potato, meat, valids. + +- type: entity + name: fruit salad + parent: FoodBowlBase + id: FoodSaladFruit + description: Your standard fruit salad. + components: + - type: Sprite + layers: + - state: bowl + - state: fruit +# Tastes like fruit. + +- type: entity + name: jungle salad + parent: FoodBowlBase + id: FoodSaladJungle + description: Exotic fruits in a bowl. + components: + - type: Sprite + layers: + - state: bowl + - state: fruit +# Tastes like fruit, the jungle. + +- type: entity + name: citrus salad + parent: FoodBowlBase + id: FoodSaladCitrus + description: Citrus overload! + components: + - type: Sprite + layers: + - state: bowl + - state: citrusdelight +# Tastes like sourness, leaves. + +- type: entity + name: salad of eden + parent: FoodBowlBase + id: FoodSaladEden + description: A salad brimming with untapped potential. + components: + - type: Sprite + layers: + - state: bowl + - state: eden +# Tastes like extreme bitterness, hope. + +# Rice + +- type: entity + name: boiled rice + parent: FoodBowlBase + id: FoodRiceBoiled + description: A warm bowl of rice. + components: + - type: Sprite + layers: + - state: bowl + - state: rice +# Tastes like rice. + +- type: entity + name: egg-fried rice + parent: FoodBowlBase + id: FoodRiceEgg + description: A bowl of rice with a fried egg. + components: + - type: Sprite + layers: + - state: bowl + - state: rice-egg +# Tastes like rice, egg. Egg =/= Meat -Swept 2020 +- type: entity + name: rice and pork + parent: FoodBowlBase + id: FoodRicePork + description: Well, it looks like pork... + components: + - type: Sprite + layers: + - state: bowl + - state: rice-pork +# Tastes like rice, meat. + +- type: entity + name: rice pudding + parent: FoodBowlBase + id: FoodRicePudding + description: Everybody loves rice pudding! + components: + - type: Sprite + layers: + - state: bowl + - state: rice-pudding +# Tastes like rice, sweetness. + +- type: entity + name: black-eyed gumbo + parent: FoodBowlBase + id: FoodRiceGumbo + description: A spicy and savory meat and rice dish. + components: + - type: Sprite + layers: + - state: bowl + - state: gumbo +# Tastes like building heat, savory meat, savory vegetables, suppressed rice. + +# Misc + +- type: entity + name: oatmeal + parent: FoodBowlBase + id: FoodOatmeal + description: A nice bowl of oatmeal. + components: + - type: Sprite + layers: + - state: bowl + - state: oatmeal +# Tastes like oats, milk. + +- type: entity + name: space liberty duff + parent: FoodBowlBase + id: FoodJellyDuff + description: Jello gelatin, from Alfred Hubbard's cookbook. + components: + - type: Sprite + layers: + - state: bowl + - state: spacelibertyduff +# Tastes like jelly, mushroom. + +# Soup + +- type: entity + name: meatball soup + parent: FoodBowlBase + id: FoodSoupMeatball + description: You've got balls kid, BALLS! + components: + - type: Sprite + layers: + - state: bowl + - state: meatball +# Tastes like meatballs. + +- type: entity + name: slime soup + parent: FoodBowlBase + id: FoodSoupSlime + description: If no water is available, you may substitute tears. + components: + - type: Sprite + layers: + - state: bowl + - state: slime +# Tastes like slime. + +- type: entity + name: tomato soup + parent: FoodBowlBase + id: FoodSoupTomatoBlood + description: Smells like copper... is that a bone? + components: + - type: Sprite + layers: + - state: bowl + - state: tomato +# Tastes like iron. + +- type: entity + name: wing fang chu + parent: FoodBowlBase + id: FoodSoupWingFangChu + description: A savory dish of alien wing wang in soy. + components: + - type: Sprite + layers: + - state: bowl + - state: wingfangchu +# Tastes like soy. + +- type: entity + name: clown's tears + parent: FoodBowlBase + id: FoodSoupClown + description: Not very funny. + components: + - type: Sprite + layers: + - state: bowl + - state: clowntears +# Tastes like a bad joke. + +- type: entity + name: vegetable soup + parent: FoodBowlBase + id: FoodSoupVegetable + description: A true vegan meal. + components: + - type: Sprite + layers: + - state: bowl + - state: vegetable +# Tastes like vegetables, sadness. + +- type: entity + name: nettle soup + parent: FoodBowlBase + id: FoodSoupNettle + description: To think, the botanist would've beat you to death with one of these. + components: + - type: Sprite + layers: + - state: bowl + - state: nettle +# Tastes like nettles. + +- type: entity + name: mystery soup + parent: FoodBowlBase + id: FoodSoupMystery + description: The mystery is, why aren't you eating it? + components: + - type: Sprite + layers: + - state: bowl + - state: mystery +# Tastes like chaos. + +- type: entity + name: hot chili + parent: FoodBowlBase + id: FoodSoupChiliHot + description: A Texan five-alarm chili! + components: + - type: Sprite + layers: + - state: bowl + - state: chili-hot +# Tastes like hot peppers. + +- type: entity + name: cold chili + parent: FoodBowlBase + id: FoodSoupChiliCold + description: This slush is barely a liquid! + components: + - type: Sprite + layers: + - state: bowl + - state: chili-cold +# Tastes like tomato, mint. + +- type: entity + name: chili con carnival + parent: FoodBowlBase + id: FoodSoupChiliClown + description: A delicious stew of meat, chilies, and salty, salty clown tears. + components: + - type: Sprite + layers: + - state: bowl + - state: chili-clown +# Tastes like tomato, hot peppers, clown feet, kind of funny, someone's parents. + +- type: entity + name: monkey's delight + parent: FoodBowlBase + id: FoodSoupMonkey + description: A delicious soup with hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas. + components: + - type: Sprite + layers: + - state: bowl + - state: monkeydelight +# Tastes like the jungle, banana. + +- type: entity + name: tomato soup + parent: FoodBowlBase + id: FoodSoupTomato + description: Drinking this feels like being a vampire! A tomato vampire... + components: + - type: Sprite + layers: + - state: bowl + - state: tomato +# Tastes like tomato. + +- type: entity + name: eyeball soup + parent: FoodBowlBase + id: FoodSoupEyeball + description: It's looking back at you... + components: + - type: Sprite + layers: + - state: bowl + - state: eyeball +# Tastes like tomato, squirming. + +- type: entity + name: miso soup + parent: FoodBowlBase + id: FoodSoupMiso + description: Salty, fishy soup, best had with ramen. + components: + - type: Sprite + layers: + - state: bowl2 + - state: milo + - type: SolutionContainer + trash: FoodBowlFancy +# Tastes like miso. + +- type: entity + name: mushroom soup + parent: FoodBowlBase + id: FoodSoupMushroom + description: A delicious and hearty mushroom soup. + components: + - type: Sprite + layers: + - state: bowl + - state: mushroom +# Tastes like mushroom. + +- type: entity + name: beet soup + parent: FoodBowlBase + id: FoodSoupBeet + description: Wait, how do you spell it again..? + components: + - type: Sprite + layers: + - state: bowl + - state: beet +# Tastes like borsch, bortsch, borstch, borsh, borshch, borscht. + +- type: entity + name: red beet soup + parent: FoodBowlBase + id: FoodSoupBeetRed + description: Quite a delicacy. + components: + - type: Sprite + layers: + - state: bowl + - state: redbeet +# Tastes like + +- type: entity + name: stew + parent: FoodBowlBase + id: FoodSoupStew + description: A nice and warm stew. Healthy and strong. + components: + - type: Sprite + layers: + - state: bowl + - state: stew +# Tastes like tomato, carrot. + +- type: entity + name: sweet potato soup + parent: FoodBowlBase + id: FoodSoupPotato + description: Delicious sweet potato in soup form. + components: + - type: Sprite + layers: + - state: bowl + - state: sweetpotato +# Tastes like sweet potato. + +- type: entity + name: french onion soup + parent: FoodBowlBase + id: FoodSoupOnion + description: Good enough to make a grown mime cry. + components: + - type: Sprite + layers: + - state: bowl + - state: onion +# Tastes like onion, france. + +- type: entity + name: bisque + parent: FoodBowlBase + id: FoodSoupBisque + description: A classic entrée from Space France. + components: + - type: Sprite + layers: + - state: bowl + - state: bisque +# Tastes like cream, crab. + +- type: entity + name: electron soup + parent: FoodBowlBase + id: FoodSoupElectron + description: A gastronomic curiosity of ethereal origin. + components: + - type: Sprite + layers: + - state: bowl + - state: electron +# Tastes like mushroom, electrons. + +- type: entity + name: bungo curry + parent: FoodBowlBase + id: FoodSoupBungo + description: A spicy vegetable curry made with the humble bungo fruit, Exotic! + components: + - type: Sprite + layers: + - state: bowl + - state: bungo +# Tastes like bungo, hot curry, tropical sweetness. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/banana-trash.yml b/Resources/Prototypes/Entities/Objects/Consumable/banana-trash.yml new file mode 100644 index 0000000000..7df49b09fc --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/banana-trash.yml @@ -0,0 +1,28 @@ +- type: entity + name: banana peel + parent: TrashBase + id: TrashBananaPeel + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/banana.rsi + state: peel + - type: Slippery + intersectPercentage: 0.2 + - type: CollisionWake + enabled: false + - type: Physics + bodyType: Dynamic + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + name: "slips" + hard: false + layer: + - SmallImpassable + - shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + mass: 5 + mask: + - SmallImpassable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food.yml b/Resources/Prototypes/Entities/Objects/Consumable/food.yml deleted file mode 100644 index 564a45e8bd..0000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/food.yml +++ /dev/null @@ -1,3241 +0,0 @@ -# TODO: Add description (many) -- type: entity - parent: BaseItem - id: FoodBase - abstract: true - components: - - type: Tag - tags: - - Grindable - - type: Food - - type: LoopingSound - - type: SolutionContainer - caps: None - - type: Sprite - state: icon - netsync: false - - # Only use visualizer if there's multiple steps available -# - type: Appearance -# visuals: -# - type: FoodVisualizer -# base_state: icon -# steps: 1 - -# Some of the conversions here have definitely been screwed up -# Glorious food -- type: entity - name: 4no raisins - parent: FoodBase - id: Food4NoRaisins - description: Dried raisins. - components: - - type: Food - trash: TrashRaisins - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/4no_raisins.rsi - - type: Item - sprite: Objects/Consumable/Food/4no_raisins.rsi - -- type: entity - name: aesir salad - parent: FoodBase - id: FoodAesirSalad - description: Probably too incredible for mortal men to fully enjoy. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/aesirsalad.rsi - - -- type: entity - name: amanita pie - parent: FoodBase - id: FoodAmanitaPie - description: Sweet and tasty poison pie. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/amanita_pie.rsi - - -- type: entity - name: amanita jelly - parent: FoodBase - id: FoodAmanitaJelly - description: Looks curiously toxic. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/amanitajelly.rsi - - -#- type: entity -# name: ambrosia vulgar is crushed -# parent: FoodBase -# id: FoodAmbrosiaVulgarIsCrushed -# description: -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/ambrosiavulgariscrushed.rsi - - -- type: entity - name: apple cake (slice) - parent: FoodBase - id: FoodAppleCakeSlice - description: A slice of heavenly cake. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/apple_cake_slice.rsi - - -- type: entity - name: apple pie - parent: FoodBase - id: FoodApplePie - description: A pie containing sweet sweet love... or apple. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/apple_pie.rsi - - -# TODO: BREADSLICE? -#- type: entity -# name: bacon -# parent: FoodBase -# id: FoodBacon -# description: -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/bacon.rsi - - -- type: entity - name: bad recipe - parent: FoodBase - id: FoodBadRecipe - description: Someone should be demoted from chef for this. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/badrecipe.rsi - - -- type: entity - name: baguette - parent: FoodBase - id: FoodBaguette - description: Bon appetit! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/baguette.rsi - - -- type: entity - name: bread (slice) - parent: FoodBase - id: FoodBreadSlice - description: A slice of bread. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/breadslice.rsi - - -- type: entity - name: banana bread (slice) - parent: FoodBase - id: FoodBananaBreadSlice - description: A slice of delicious banana bread. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/bananabreadslice.rsi - - -- type: entity - parent: FoodBase - id: FoodBananaCreamPie - name: banana cream pie - description: Just like back home, on clown planet! HONK! - components: - - type: Food - trash: TrashPlate - - type: CreamPie - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/pie.rsi - - type: Ammo - caliber: CreamPie - caseless: true - projectile: BulletCreampie - - -#- type: entity -# name: bear meat -# parent: FoodBase -# id: FoodBearMeat -# description: -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/bearmeat.rsi - - -- type: entity - name: beet soup - parent: FoodBase - id: FoodBeetSoup # Bears, beets, battlestar galactica - description: Wait, how do you spell it again..? - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/beetsoup.rsi - - -- type: entity - name: berry clafoutis - parent: FoodBase - id: FoodBerryClafoutis - description: No black birds, this is a good sign. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/berryclafoutis.rsi - - -- type: entity - name: birthday cake (slice) - parent: FoodBase - id: FoodBirthdayCakeSlice - description: A slice of your birthday. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/birthday_cake_slice.rsi - - -- type: entity - parent: FoodBase - id: FoodSpaghettiBoiled - name: boiled spaghetti - description: A plain dish of noodles, this sucks. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/spaghettiboiled.rsi - - -- type: entity - name: brain cake (slice) - parent: FoodBase - id: FoodBrainCakeSlice - description: Braaains. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/brain_cake_slice.rsi - - -- type: entity - name: candy - parent: FoodBase - id: FoodCandy - description: Nougat, love it or hate it. - components: - - type: Food - trash: TrashCandy - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/candy.rsi - - type: Item - sprite: Objects/Consumable/Food/candy.rsi - -- type: entity - name: candy corn - parent: FoodBase - id: FoodCandyCorn - description: It's a handful of candy corn. Cannot be stored in a detective's hat, alas. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/candy_corn.rsi - - -- type: entity - name: carrot cake (slice) - parent: FoodBase - id: FoodCarrotCakeSlice - description: Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/carrotcake_slice.rsi - - -- type: entity - name: carrot fries - parent: FoodBase - id: FoodCarrotFries - description: Tasty fries from fresh Carrots. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/carrotfries.rsi - - -- type: entity - name: chawan mushi - parent: FoodBase - id: FoodChawanMushi - description: A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/chawanmushi.rsi - - -- type: entity - name: cheeseburger - parent: FoodBase - id: FoodCheeseburger - description: The cheese adds a good flavor. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/cheeseburger.rsi - - type: Item - sprite: Objects/Consumable/Food/cheeseburger.rsi - -- type: entity - name: cheesecake (slice) - parent: FoodBase - id: FoodCheeseCakeSlice - description: Slice of pure cheestisfaction. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/cheesecake_slice.rsi - - -- type: entity - name: cheese wedge - parent: FoodBase - id: FoodCheeseWedge - description: A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/cheesewedge.rsi - - -- type: entity - name: cheesie honkers - parent: FoodBase - id: FoodCheesieHonkers - description: Bite sized cheesie snacks that will honk all over your mouth. - components: - - type: Food - trash: TrashCheesieHonkers - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/cheesie_honkers.rsi - - -- type: entity - name: cheesy fries - parent: FoodBase - id: FoodCheesyFries - description: Fries. Covered in cheese. Duh. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/cheesyfries.rsi - - -- type: entity - name: cherry pie - parent: FoodBase - id: FoodCherryPie - description: Taste so good, make a grown man cry. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/cherrypie.rsi - - -- type: entity - name: chips - parent: FoodBase - id: FoodChips - description: Commander Riker's What-The-Crisps. - components: - - type: Food - trash: TrashChips - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/chips.rsi - - type: Item - sprite: Objects/Consumable/Food/chips.rsi - -- type: entity - name: chocolate bar - parent: FoodBase - id: FoodChocolateBar - description: Such sweet, fattening food. - components: - - type: Item - size: 10 - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/chocolatebar.rsi - - -- type: entity - name: chocolate cake (slice) - parent: FoodBase - id: FoodChocolateCakeSlice - description: A cake with added chocolate. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/chocolatecake_slice.rsi - - -- type: entity - name: chocolate egg - parent: FoodBase - id: FoodChocolateEgg - description: Such sweet, fattening food. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/chocolateegg.rsi - - -- type: entity - name: clown burger - parent: FoodBase - id: FoodClownBurger - description: This tastes funny... - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/clownburger.rsi - - type: Item - sprite: Objects/Consumable/Food/clownburger.rsi - -- type: entity - name: clown's tears - parent: FoodBase - id: FoodClownsTears - description: Not very funny. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/clownstears.rsi - - -#- type: entity -# name: cocoa -# parent: FoodBase -# id: FoodCocoa -# description: -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 3 -# - type: Sprite -# sprite: Objects/Consumable/Food/cocoa.rsi - - -- type: entity - parent: FoodBase - id: FoodColdchili - name: cold chili - description: This slush is barely a liquid! - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/coldchili.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodColdsauce -# name: coldsauce -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/coldsauce.rsi - - -- type: entity - parent: FoodBase - id: FoodCookie - name: cookie!!! - description: COOKIE!!! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/cookie!!!.rsi - - -- type: entity - parent: FoodBase - id: FoodCracker - name: cracker - description: It's a salted cracker. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/cracker.rsi - - -- type: entity - parent: FoodBase - id: FoodCreamCheeseBreadSlice - name: cream cheese bread (slice) - description: A slice of yum! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/creamcheesebreadslice.rsi - - -- type: entity - parent: FoodBase - id: FoodCubanCarp - name: cuban carp - description: A sandwich that burns your tongue and then leaves it numb! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/cubancarp.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodDionaRoast -# name: diona roast -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/dionaroast.rsi - - -- type: entity - parent: FoodBase - id: FoodDonkPocket - name: donk-pocket - description: The food of choice for the seasoned traitor. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/donkpocket.rsi - - -- type: entity - parent: FoodBase - id: FoodDonut - name: donut - description: Goes great with Robust Coffee. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/donut1.rsi - - type: Item - sprite: Objects/Consumable/Food/donut1.rsi - -- type: entity - parent: FoodBase - id: FoodFrostedDonut - name: frosted donut - description: Goes great with Robust Coffee. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/donut2.rsi - - type: Item - sprite: Objects/Consumable/Food/donut2.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-blue - name: egg-blue - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-blue.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-blue.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-green - name: egg-green - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-green.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-green.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-mime - name: egg-mime - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-mime.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-mime.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-orange - name: egg-orange - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-orange.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-orange.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-purple - name: egg-purple - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-purple.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-purple.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-rainbow - name: egg-rainbow - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-rainbow.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-rainbow.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-red - name: egg-red - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-red.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-red.rsi - -- type: entity - parent: FoodBase - id: FoodEgg-yellow - name: egg-yellow - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg-yellow.rsi - - type: Item - sprite: Objects/Consumable/Food/egg-yellow.rsi - -- type: entity - parent: FoodBase - id: FoodEgg - name: egg - description: An egg! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/egg.rsi - - type: Produce - seed: eggy - - type: Item - sprite: Objects/Consumable/Food/egg.rsi - -- type: entity - parent: FoodBase - id: FoodEggplantparm - name: eggplant parmigiana - description: The only good recipe for eggplant. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/eggplantparm.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodEmptycondiment -# name: empty condiment -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/emptycondiment.rsi - - -- type: entity - parent: FoodBase - id: FoodEnchiladas - name: enchiladas - description: Viva La Mexico! - components: - - type: Food - trash: TrashTray - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/enchiladas.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodEnchiladasold -# name: enchiladas (old) -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/enchiladasold.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodEnzyme -# name: enzyme -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/enzyme.rsi - - -- type: entity - parent: FoodBase - id: FoodFishAndChips - name: fish and chips - description: I do say so myself chap. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/fishandchips.rsi - - -- type: entity - parent: FoodBase - id: FoodFishBurger - name: fillet -o- carp sandwich - description: Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/fishburger.rsi - - type: Item - sprite: Objects/Consumable/Food/fishburger.rsi - -#- type: entity -# parent: FoodBase -# id: FoodFishfillet -# name: fishfillet -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/fishfillet.rsi - - -- type: entity - parent: FoodBase - id: FoodFishfingers - name: fish fingers - description: A finger of fish. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/fishfingers.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodFlour -# name: flour -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/flour.rsi - - -- type: entity - parent: FoodBase - id: FoodFortuneCookie - name: fortune cookie - description: A true prophecy in each cookie! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/fortune_cookie.rsi - - -- type: entity - parent: FoodBase - id: FoodFriedegg - name: fried egg - description: A fried egg, with a touch of salt and pepper. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/friedegg.rsi - - -- type: entity - parent: FoodBase - id: FoodFries - name: space fries - description: "AKA: French Fries, Freedom Fries, etc." - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/fries.rsi - - -- type: entity - parent: FoodBase - id: FoodGappleTart - name: golden apple streusel tart - description: A tasty dessert that won't make it through a metal detector. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/gappletart.rsi - - -- type: entity - parent: FoodBase - id: FoodGrilledCheese - name: grilled cheese sandwich - description: Goes great with Tomato soup! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/toastedsandwich.rsi - - -- type: entity - parent: FoodBase - id: FoodHumanBurger - name: human-burger - description: A bloody burger. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/hburger.rsi - - type: Item - sprite: Objects/Consumable/Food/hburger.rsi - -- type: entity - parent: FoodBase - id: FoodHerbSalad - name: tossed salad - description: A proper salad, basic and simple, with little bits of carrot, tomato and apple intermingled. Vegan! - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/herbsalad.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodHoneycomb -# name: honeycomb -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/honeycomb.rsi - - -- type: entity - parent: FoodBase - id: FoodHotchili - name: hot chili - description: A five alarm Texan Chili! - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/hotchili.rsi - - -- type: entity - parent: FoodBase - id: FoodHotdog - name: hotdog - description: Unrelated to dogs, maybe. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/hotdog.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodHotsauce -# name: hotsauce -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/hotsauce.rsi - - -- type: entity - parent: FoodBase - id: FoodHugeMushroomSlice - name: huge mushroom (slice) - description: A slice from a huge mushroom. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/hugemushroomslice.rsi - - -- type: entity - parent: FoodBase - id: FoodKabobHuman - name: human-kabob - description: A human meat, on a stick. - components: - - type: Food - # trash: TODO - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/kabob.rsi - - -- type: entity - parent: FoodBase - id: FoodJellyDonut - name: jelly donut - description: You jelly? - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/jdonut1.rsi - - -- type: entity - parent: FoodBase - id: FoodFrostedJellyDonut - name: frosted jelly donut - description: You jelly? - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/jdonut2.rsi - - -- type: entity - parent: FoodBase - id: FoodJellyBurger - name: jelly burger - description: Culinary delight..? - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/jellyburger.rsi - - type: Item - sprite: Objects/Consumable/Food/jellyburger.rsi - -- type: entity - parent: FoodBase - id: FoodJellySandwich - name: jelly sandwich - description: You wish you had some peanut butter to go with this... - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/jellysandwich.rsi - - -- type: entity - parent: FoodBase - id: FoodJellyToast - name: jellied toast - description: A slice of bread covered with delicious jam. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/jellytoast.rsi - - -# TODO: Add more pies. Anything that shares a sprite -- type: entity - parent: FoodBase - id: FoodKabobMeat - name: meat-kabob - description: Delicious meat, on a stick. - components: - - type: Food - # trash: TODO - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/kabob.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodKetchup -# name: ketchup -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/ketchup.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodKetchupold -# name: ketchup (old) -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/ketchupold.rsi - - -- type: entity - parent: FoodBase - id: FoodLemonCakeSlice - name: lemon cake (slice) - description: Just a slice of cake, it is enough for everyone. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/lemoncake_slice.rsi - - -- type: entity - parent: FoodBase - id: FoodLimeCakeSlice - name: lime cake (slice) - description: Just a slice of cake, it is enough for everyone. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/limecake_slice.rsi - - -- type: entity - parent: FoodBase - id: FoodLiquidFood - name: liquidfood ration #\improper? - description: A prepackaged grey slurry of all the essential nutrients for a spacefarer on the go. Should this be crunchy? - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/liquidfood.rsi - - -- type: entity - parent: FoodBase - id: FoodLoadedBakedPotato - name: loaded baked potato - description: Totally baked. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/loadedbakedpotato.rsi - - -- type: entity - parent: FoodBase - id: FoodMeat - name: meat - description: A slab of meat. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 5 - - type: Sprite - sprite: Objects/Consumable/Food/meat.rsi - - -- type: entity - parent: FoodBase - id: FoodMeatball - name: meatball - description: A great meal all round. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/meatball.rsi - - type: Item - sprite: Objects/Consumable/Food/meatball.rsi - -- type: entity - parent: FoodBase - id: FoodMeatballSoup - name: meatball soup - description: You've got balls kid, BALLS! - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/meatballsoup.rsi - - -- type: entity - parent: FoodBase - id: FoodMeatballSpaghetti - name: spaghetti & meatballs - description: Now thats a nic'e meatball! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/meatballspaghetti.rsi - - -- type: entity - parent: FoodBase - id: FoodMeatBreadSlice - name: meat bread (slice) - description: A slice of delicious meatbread. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/meatbreadslice.rsi - - -- type: entity - parent: FoodBase - id: FoodMeatpie - name: meat pie - description: An old barber recipe, very delicious! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/meatpie.rsi - - -- type: entity - parent: FoodBase - id: FoodMeatPizzaSlice - name: meat pizza (slice) - description: A slice of a meaty pizza. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/meatpizzaslice.rsi - - -- type: entity - parent: FoodBase - id: FoodMeatSteak - name: meat steak - description: A piece of hot spicy meat. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/meatsteak.rsi - - -- type: entity - parent: FoodBase - id: FoodMiloSoup - name: milo soup - description: The universes best soup! Yum!!! - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/milosoup.rsi - - -- type: entity - parent: FoodBase - id: FoodMimeBurger - name: mime burger - description: Its taste defies language. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/mimeburger.rsi - - -- type: entity - parent: FoodBase - id: FoodMint - name: mint - description: It is only wafer thin. - components: - - type: SolutionContainer - contents: - reagents: # TODO: mint toxin - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/mint.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodMixedcondiments -# name: mixedcondiments -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/mixedcondiments.rsi - - -- type: entity - parent: FoodBase - id: FoodMonkeyBurger - name: monkey-burger - description: The cornerstone of every nutritious breakfast. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/hburger.rsi - - type: Item - sprite: Objects/Consumable/Food/hburger.rsi - -- type: entity - parent: FoodBase - id: FoodMonkeysDelight - name: monkey's delight - description: Eeee Eee! - components: - - type: Food - trash: TrashTray - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 30 - - type: Sprite - sprite: Objects/Consumable/Food/monkeysdelight.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodMtearp -# name: mtearp -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/mtearp.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodMuffin -# name: muffin -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/muffin.rsi - - -- type: entity - parent: FoodBase - id: FoodMushroomPizzaSlice - name: mushroom pizza slice - description: Maybe it is the last slice of pizza in your life. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/mushroompizzaslice.rsi - - -- type: entity - parent: FoodBase - id: FoodMushroomSoup - name: mushroom soup - description: A delicious and hearty mushroom soup. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/mushroomsoup.rsi - - -# TODO: More in this one -- type: entity - parent: FoodBase - id: FoodMysterySoup - name: mystery soup - description: The mystery is, why aren't you eating it? - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 1 - - type: Sprite - sprite: Objects/Consumable/Food/mysterysoup.rsi - - -- type: entity - parent: FoodBase - id: FoodNettlesoup - name: nettlesoup - description: To think, the botanist would've beat you to death with one of these. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/nettlesoup.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodOliveoil -# name: oliveoil -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/oliveoil.rsi - - -- type: entity - parent: FoodBase - id: FoodOmelette - name: omelette du fromage - description: That's all you can say! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/omelette.rsi - - -- type: entity - parent: FoodBase - id: FoodOrangeCakeSlice - name: orange cake (slice) - description: Just a slice of cake, it is enough for everyone. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/orangecake_slice.rsi - - -- type: entity - parent: FoodBase - id: FoodPastaTomato - name: spaghetti - description: Spaghetti and crushed tomatoes. Just like your abusive father used to make! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/pastatomato.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodPeppermillsmall -# name: peppermillsmall -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/peppermillsmall.rsi - - -- type: entity - parent: FoodBase - id: FoodPhelmbiscuit - name: plump helm biscuit - description: This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/phelmbiscuit.rsi - - -- type: entity - parent: FoodBase - id: FoodMargheritaPizzaSlice - name: margherita pizza (slice) - description: A slice of the classic pizza. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/pizzamargheritaslice.rsi - - -- type: entity - parent: FoodBase - id: FoodPlainCakeSlice - name: plain cake (slice) - description: Just a slice of cake, it is enough for everyone. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/plaincake_slice.rsi - - -- type: entity - parent: FoodBase - id: FoodPlumpPie - name: plump pie - description: I bet you love stuff made out of plump helmets! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/plump_pie.rsi - - -- type: entity - parent: FoodBase - id: FoodPopcorn - name: popcorn - description: Now let's find some cinema. - components: - - type: Food - trash: TrashPopcorn - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/popcorn.rsi - - -- type: entity - parent: FoodBase - id: FoodPoppyPretzel - name: poppy pretzel - description: It's all twisted up! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 10 - - type: Sprite - sprite: Objects/Consumable/Food/poppypretzel.rsi - - -- type: entity - parent: FoodBase - id: FoodPumpkinPieSlice - name: pumpkin pie (slice) - description: A slice of pumpkin pie, with whipped cream on top. Perfection. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/pumpkinpieslice.rsi - - -# TODO: Boiled rice? -#- type: entity -# parent: FoodBase -# id: FoodRice -# name: rice -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/rice.rsi - - -- type: entity - parent: FoodBase - id: FoodRoburger - name: roburger - description: The lettuce is the only organic component. Beep. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/roburger.rsi - - -- type: entity - parent: FoodBase - id: FoodRoffleWaffles - name: roffle waffles - description: Waffles from Roffle. Co. - components: - - type: Food - trash: TrashWaffles - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/rofflewaffles.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodRoroSoup -# name: roro soup -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/rorosoup.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodRottenmeat -# name: rottenmeat -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/rottenmeat.rsi - - -- type: entity - parent: FoodBase - id: FoodRicePudding - name: rice pudding - description: Where's the jam? - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/rpudding.rsi - - -- type: entity - parent: FoodBase - id: FoodSandwich - name: sandwich - description: A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/sandwich.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodSandwichFilling -# name: sandwich filling -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/sandwich_filling.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodSandwichTop -# name: sandwich top -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/sandwich_top.rsi - - -- type: entity - parent: FoodBase - id: FoodSausage - name: sausage # sanga - description: It's best not to see how this was made. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/sausage.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodShandp -# name: shandp -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/shandp.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodSkrellsnacks -# name: skrellsnacks -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/skrellsnacks.rsi - - -- type: entity - parent: FoodBase - id: FoodSosJerky - name: scaredy's private reserve beef jerky - description: Beef jerky made from the finest space cows. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/sosjerky.rsi - - type: Item - sprite: Objects/Consumable/Food/sosjerky.rsi - -- type: entity - parent: FoodBase - id: FoodSoyDope - name: soy dope - description: Dope from a soy. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/soydope.rsi - - -- type: entity - parent: FoodBase - id: FoodSoylentGreen - name: soylent green - description: Not made of people. Honest. - components: - - type: Food - trash: TrashWaffles - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/soylent_green.rsi - - -# why these were named different i have no idea -- type: entity - parent: FoodBase - id: FoodSoylentYellow - name: soylent viridians - description: Not made of people. Honest. - components: - - type: Food - trash: TrashWaffles - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/soylent_yellow.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodSoysauce -# name: soysauce -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/soysauce.rsi - - -- type: entity - parent: FoodBase - id: FoodSpaceTwinkie - name: space twinkie - description: Guaranteed to survive longer then you will. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/space_twinkie.rsi - - -- type: entity - parent: FoodBase - id: FoodSpacylibertyDuff - name: spacy liberty duff - description: Jello gelatin, from Alfred Hubbard's cookbook - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/spacylibertyduff.rsi - - -- type: entity - parent: FoodBase - id: FoodSpaghetti - name: spaghetti - description: A bundle of raw spaghetti. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/spaghetti.rsi - - -- type: entity - parent: FoodBase - id: FoodSpellBurger - name: spell burger - description: This is absolutely Ei Nath. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/spellburger.rsi - - type: Item - sprite: Objects/Consumable/Food/spellburger.rsi - -- type: entity - parent: FoodBase - id: FoodSpesslaw - name: spesslaw - description: A lawyers favourite - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/spesslaw.rsi - - -- type: entity - parent: FoodBase - id: FoodStew - name: stew - description: A nice and warm stew. Healthy and strong. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/stew.rsi - - -- type: entity - parent: FoodBase - id: FoodStewedsoymeat - name: stewed soy meat - description: Even non-vegetarians will LOVE this! - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/stewedsoymeat.rsi - - -- type: entity - parent: FoodBase - id: FoodStuffing - name: stuffing - description: Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/stuffing.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodSugar -# name: sugar -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/sugar.rsi - - -#- type: entity -# parent: FoodBase -# id: FoodSugarsmall -# name: sugarsmall -# description: '' -# components: -# - type: Food -# - type: SolutionContainer -# uses: 1 -# restore_amount: 1 -# - type: Sprite -# sprite: Objects/Consumable/Food/sugarsmall.rsi - - -- type: entity - parent: FoodBase - id: FoodSuperBiteBurger - name: Super Bite Burger - description: This is a mountain of a burger. FOOD! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/superbiteburger.rsi - - -- type: entity - parent: FoodBase - id: FoodSyndiCakes - name: syndi-cakes - description: An extremely moist snack cake that tastes just as good after being nuked. - components: - - type: Food - trash: TrashSyndiCakes - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/syndi_cakes.rsi - - -- type: entity - parent: FoodBase - id: FoodTaco - name: taco - description: Take a bite! - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 8 - - type: Sprite - sprite: Objects/Consumable/Food/taco.rsi - - -- type: entity - parent: FoodBase - id: FoodTastyBread - name: tasty bread - description: Bread in a tube. Chewy...and surprisingly tasty. - components: - - type: Food - trash: TrashTastyBread - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/tastybread.rsi - - -- type: entity - parent: FoodBase - id: FoodToastedSandwich - name: toasted sandwich - description: Now if you only had a pepper bar. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/toastedsandwich.rsi - - -- type: entity - parent: FoodBase - id: FoodTofu - name: tofu - description: We all love tofu. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/tofu.rsi - - -- type: entity - parent: FoodBase - id: FoodTofuBreadSlice - name: tofu bread (slice) - description: A slice of delicious tofubread. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/tofubreadslice.rsi - - -- type: entity - parent: FoodBase - id: FoodTofuBurger - name: tofu burger - description: What.. is that meat? - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/tofuburger.rsi - - type: Item - sprite: Objects/Consumable/Food/tofuburger.rsi - -- type: entity - parent: FoodBase - id: FoodKabobTofu - name: tofu-kabob - description: Vegan meat, on a stick. - components: - - type: Food - # trash: TODO - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/kabob.rsi - - -- type: entity - parent: FoodBase - id: FoodTofurkey - name: tofurkey - description: A fake turkey made from tofu. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 24 - - type: Sprite - sprite: Objects/Consumable/Food/tofurkey.rsi - - -- type: entity - parent: FoodBase - id: FoodTomatoSlice - name: tomato slice - description: A slice from a huge tomato - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Consumable/Food/tomatomeat.rsi - - -- type: entity - parent: FoodBase - id: FoodTomatoSoup - name: tomato soup - description: Smells like copper. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/tomatosoup.rsi - - -- type: entity - parent: FoodBase - id: FoodTwoBread - name: two bread - description: It is very bitter and winy. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 4 - - type: Sprite - sprite: Objects/Consumable/Food/twobread.rsi - - -- type: entity - parent: FoodBase - id: FoodValidSalad - name: valid salad - description: It's just a salad of questionable 'herbs' with meatballs and fried potato slices. Nothing suspicious about it. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/validsalad.rsi - - -- type: entity - parent: FoodBase - id: FoodVegetablePizzaSlice - name: vegetable pizza (slice) - description: A slice of the most green pizza of all pizzas not containing green ingredients - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/vegetablepizzaslice.rsi - - -- type: entity - parent: FoodBase - id: FoodVegetableSoup - name: vegetable soup - description: A true vegan meal - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/vegetablesoup.rsi - - -- type: entity - parent: FoodBase - id: FoodWaffles - name: waffles - description: Mmm, waffles - components: - - type: Food - trash: TrashWaffles - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/waffles.rsi - - -- type: entity - parent: FoodBase - id: FoodWatermelonSlice - name: watermelon (slice) - description: A slice of watery goodness. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/watermelonslice.rsi - - -- type: entity - parent: FoodBase - id: FoodWingFangChu - name: wing fang chu - description: A savory dish of alien wing wang in soy. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - type: Sprite - sprite: Objects/Consumable/Food/wingfangchu.rsi - - -- type: entity - parent: FoodBase - id: FoodWishSoup - name: wish soup - description: I wish this was soup. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 2 - - type: Sprite - sprite: Objects/Consumable/Food/wishsoup.rsi - - -- type: entity - parent: FoodBase - id: FoodXenoburger - name: xenoburger - description: Smells caustic. Tastes like heresy. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 16 - - type: Sprite - sprite: Objects/Consumable/Food/xburger.rsi - - type: Item - sprite: Objects/Consumable/Food/xburger.rsi - -- type: entity - parent: FoodBase - id: FoodXenoMeatbreadslice - name: xenomeat bread (slice) - description: A slice of delicious meatbread. Extra Heretical. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/xenobreadslice.rsi - - -- type: entity - parent: FoodBase - id: FoodXenomeat - name: xenomeat - description: Yum. - components: - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/xenomeat.rsi - - -- type: entity - parent: FoodBase - id: FoodXenomeatPie - name: xeno-pie - description: A delicious meatpie. Probably heretical. - components: - - type: Food - trash: TrashPlate - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/xenomeatpie.rsi - - -- type: entity - parent: FoodBase - id: DisgustingSweptSoup - name: salty sweet miso cola soup - description: Jesus christ. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Bleach - Quantity: 15 - - type: Sprite - sprite: Objects/Consumable/Food/stew.rsi - - -- type: entity - parent: FoodBase - id: MilkApe - name: Milk Ape -# Milk Ape's a proper noun you fuck - description: He sighed for your grins. - components: - - type: Food - trash: TrashSnackBowl - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/milkape.rsi - - -- type: entity - name: memory leek - parent: FoodBase - id: FoodMemoryLeek - description: It makes you irrationally angry just looking at it. - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 9999999999 - - type: Sprite - sprite: Objects/Consumable/Food/memoryleek.rsi - state: memoryLeek - - -- type: entity - parent: FoodBase - name: apple cake - id: FoodAppleCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodAppleCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/apple_cake.rsi - - -- type: entity - parent: FoodBase - name: banana bread - id: FoodBananaBread - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodBananaBreadSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/bananabread.rsi - - -- type: entity - parent: FoodBase - name: birthday cake - id: FoodBirthdayCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodBirthdayCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/birthdaycake.rsi - - -- type: entity - parent: FoodBase - name: brain cake - id: FoodBrainCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodBrainCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/braincake.rsi - - -- type: entity - parent: FoodBase - name: bread - id: FoodBread - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodBreadSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/bread.rsi - - -- type: entity - parent: FoodBase - name: carrot cake - id: FoodCarrotCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodCarrotCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/carrotcake.rsi - - -- type: entity - parent: FoodBase - name: cheesecake - id: FoodCheeseCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodCheeseCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/cheesecake.rsi - - -- type: entity - parent: FoodBase - name: cheese wheel - id: FoodCheeseWheel - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodCheeseWedge - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/apple_cake.rsi - - -- type: entity - parent: FoodBase - name: chocolate cake - id: FoodChocolateCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodChocolateCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/chocolatecake.rsi - - -- type: entity - parent: FoodBase - name: cream cheese bread - id: FoodCreamCheeseBread - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodCreamCheeseBreadSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/creamcheesebread.rsi - - -- type: entity - parent: FoodBase - name: lemon cake - id: FoodLemonCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodLemonCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/lemoncake.rsi - - -- type: entity - parent: FoodBase - name: lime cake - id: FoodLimeCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodLimeCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/limecake.rsi - - -- type: entity - parent: FoodBase - name: meat bread - id: FoodMeatBread - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodMeatBreadSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/meatbread.rsi - - -- type: entity - parent: FoodBase - name: meat pizza - id: FoodMeatPizza - components: - - type: Food - trash: TrashTray - - type: SliceableFood - count: 6 - slice: FoodMeatPizzaSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 48 - - type: Sprite - sprite: Objects/Consumable/Food/meatpizza.rsi - - -- type: entity - parent: FoodBase - name: mushroom pizza - id: FoodMushroomPizza - components: - - type: Food - trash: TrashTray - - type: SliceableFood - count: 6 - slice: FoodMushroomPizzaSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 48 - - type: Sprite - sprite: Objects/Consumable/Food/mushroompizza.rsi - - -- type: entity - parent: FoodBase - name: orange cake - id: FoodOrangeCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodOrangeCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/orangecake.rsi - - -- type: entity - parent: FoodBase - name: margherita pizza - id: FoodMargheritaPizza - components: - - type: Food - trash: TrashTray - - type: SliceableFood - count: 6 - slice: FoodMargheritaPizzaSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 48 - - type: Sprite - sprite: Objects/Consumable/Food/pizzamargherita.rsi - - -- type: entity - parent: FoodBase - name: plain cake - id: FoodPlainCake - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodPlainCakeSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/plaincake.rsi - - -- type: entity - parent: FoodBase - name: pumpkin pie - id: FoodPumpkinPie - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodPumpkinPieSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/pumpkinpie.rsi - - - type: Item - sprite: Objects/Consumable/Food/pumpkinpie.rsi - - -- type: entity - parent: FoodBase - name: tofu bread - id: FoodTofuBread - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodTofuBreadSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/tofubread.rsi - - -- type: entity - parent: FoodBase - name: vegetable pizza - id: FoodVegetablePizza - components: - - type: Food - trash: TrashTray - - type: SliceableFood - count: 6 - slice: FoodVegetablePizzaSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 48 - - type: Sprite - sprite: Objects/Consumable/Food/vegetablepizza.rsi - - -- type: entity - parent: FoodBase - name: xenomeat bread - id: FoodXenomeatBread - components: - - type: Food - trash: TrashTray - - type: SliceableFood - slice: FoodXenomeatBreadSlice - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 40 - - type: Sprite - sprite: Objects/Consumable/Food/xenomeatbread.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml deleted file mode 100644 index 2d3e4dc62a..0000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml +++ /dev/null @@ -1,135 +0,0 @@ -# TODO: Add descriptions (2) -- type: entity - parent: BaseItem - id: FoodContainerBase - abstract: true - components: - - type: FoodContainer - - type: Sprite - state: icon - netsync: false - -# Containers - -- type: entity - parent: FoodContainerBase - name: donut box - id: FoodContainerDonutBox - description: Mmm. Donuts. - components: - - type: FoodContainer - capacity: 6 - prototypes: - FoodDonut: 70 - FoodFrostedDonut: 30 - - type: Sprite - sprite: Objects/Consumable/FoodContainers/donutbox.rsi - - - type: Appearance - visuals: - - type: FoodContainerVisualizer - mode: Discrete - base_state: donutbox - steps: 7 - -- type: entity - parent: FoodContainerBase - name: egg box (shut) - id: FoodContainerEggBoxShut - description: A carton for containing eggs. It's closed right now. - components: - - type: FoodContainer - capacity: 1 - prototypes: - FoodContainerEggBox: 100 - - type: Sprite - sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi - - - type: Item - sprite: Objects/Consumable/FoodContainers/eggbox_shut.rsi - -- type: entity - parent: FoodContainerBase - name: egg box - id: FoodContainerEggBox - description: A carton for containing eggs. - components: - - type: FoodContainer - capacity: 12 - prototypes: - FoodEgg: 100 - - type: Sprite - sprite: Objects/Consumable/FoodContainers/eggbox.rsi - state: eggbox-12 - - - type: Item - sprite: Objects/Consumable/FoodContainers/eggbox.rsi - - type: Appearance - visuals: - - type: FoodContainerVisualizer - mode: Discrete - base_state: eggbox - steps: 13 - -# These two will probably get moved one day -- type: entity - parent: FoodContainerBase - name: monkey cube box - id: FoodContainerMonkeyCubeBox - description: Drymate brand monkey cubes. Just add water! - components: - - type: FoodContainer - prototypes: - FoodContainerMonkeyCubeWrap: 100 - - type: Sprite - sprite: Objects/Consumable/FoodContainers/monkeycubebox.rsi - -- type: entity - parent: FoodContainerBase - name: monkey cube wrap - id: FoodContainerMonkeyCubeWrap - description: Unwrap this to get a monkey cube. - components: - - type: FoodContainer - capacity: 1 - prototypes: - MonkeyCube: 100 - - type: Sprite - sprite: Objects/Consumable/FoodContainers/monkeycubewrap.rsi - -# TODO: Probably replace it with a stacking thing -- type: entity - parent: FoodContainerBase - name: pizza box stack - id: FoodContainerPizzaBoxStack - components: - - type: FoodContainer - prototypes: - FoodContainerPizzaBox: 100 - - type: Sprite - sprite: Objects/Consumable/FoodContainers/pizzaboxstack.rsi - - - type: Appearance - visuals: - - type: FoodContainerVisualizer - mode: Discrete - base_state: pizzaboxstack - steps: 5 - -- type: entity - parent: FoodContainerBase - name: pizza box - id: FoodContainerPizzaBox - components: - - type: FoodContainer - capacity: 1 - prototypes: - FoodMeatPizza: 25 - FoodMargheritaPizza: 25 - FoodMushroomPizza: 25 - FoodVegetablePizza: 25 - - type: Sprite - sprite: Objects/Consumable/FoodContainers/pizzabox.rsi - - - type: Item - sprite: Objects/Consumable/FoodContainers/pizzabox.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml deleted file mode 100644 index 3eb459f1ab..0000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: entity - parent: BaseItem - id: ReagentContainerFlour - name: flour - description: Not to be confused with flower. - components: - - type: SolutionContainer - maxVol: 50 - contents: - reagents: - - ReagentId: Flour - Quantity: 50 - - type: SolutionTransfer - transferAmount: 5 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Food/flour.rsi - state: icon - - - type: Spillable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml deleted file mode 100644 index abe7e50871..0000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml +++ /dev/null @@ -1,202 +0,0 @@ -- type: entity - parent: BaseItem - id: TrashBase - description: This is rubbish. - abstract: true - components: - - type: Sprite - state: icon - - -# Trash mountain -- type: entity - name: 4 no raisins (trash) - parent: TrashBase - id: TrashRaisins - components: - - type: Sprite - sprite: Objects/Consumable/Trash/4no_raisins.rsi - - -- type: entity - name: candy (trash) - parent: TrashBase - id: TrashCandy - components: - - type: Sprite - sprite: Objects/Consumable/Trash/candy.rsi - - -- type: entity - name: cheesie honkers (trash) - parent: TrashBase - id: TrashCheesieHonkers - components: - - type: Sprite - sprite: Objects/Consumable/Trash/cheesie_honkers.rsi - - -- type: entity - name: chips (trash) - parent: TrashBase - id: TrashChips - components: - - type: Sprite - sprite: Objects/Consumable/Trash/chips.rsi - - -- type: entity - name: corn cob - description: A reminder of meals gone by. - parent: TrashBase - id: TrashCornCob - components: - - type: Sprite - sprite: Objects/Consumable/Trash/corncob.rsi - - -- type: entity - name: liquid food (trash) - parent: TrashBase - id: TrashLiquidFood - components: - - type: Sprite - sprite: Objects/Consumable/Trash/liquidfood.rsi - - -- type: entity - name: pistachos pack (trash) - parent: TrashBase - id: TrashPistachiosPack - components: - - type: Sprite - sprite: Objects/Consumable/Trash/pistachios_pack.rsi - - -- type: entity - name: messy pizza box (trash) - parent: TrashBase - id: TrashPizzaBoxMessy - components: - - type: Sprite - sprite: Objects/Consumable/Trash/pizzabox_messy.rsi - - -- type: entity - name: plastic bag (trash) - parent: TrashBase - id: TrashPlasticBag - components: - - type: Sprite - sprite: Objects/Consumable/Trash/plasticbag.rsi - - -- type: entity - name: plate (trash) - parent: TrashBase - id: TrashPlate - components: - - type: Sprite - sprite: Objects/Consumable/Trash/plate.rsi - - -- type: entity - name: popcorn (trash) - parent: TrashBase - id: TrashPopcorn - components: - - type: Sprite - sprite: Objects/Consumable/Trash/popcorn.rsi - - -- type: entity - name: semki pack (trash) - parent: TrashBase - id: TrashSemkiPack - components: - - type: Sprite - sprite: Objects/Consumable/Trash/semki_pack.rsi - - -- type: entity - name: snack bowl (trash) - parent: TrashBase - id: TrashSnackBowl - components: - - type: Sprite - sprite: Objects/Consumable/Trash/snack_bowl.rsi - - -- type: entity - name: SOS jerky (trash) - parent: TrashBase - id: TrashSOSJerky - components: - - type: Sprite - sprite: Objects/Consumable/Trash/sosjerky.rsi - - -- type: entity - name: syndi cakes (trash) - parent: TrashBase - id: TrashSyndiCakes - components: - - type: Sprite - sprite: Objects/Consumable/Trash/syndi_cakes.rsi - - -- type: entity - name: tasty bread (trash) - parent: TrashBase - id: TrashTastyBread - components: - - type: Sprite - sprite: Objects/Consumable/Trash/tastybread.rsi - - -- type: entity - name: tray (trash) - parent: TrashBase - id: TrashTray - components: - - type: Sprite - sprite: Objects/Consumable/Trash/tray.rsi - - -- type: entity - name: waffles (trash) - parent: TrashBase - id: TrashWaffles - components: - - type: Sprite - sprite: Objects/Consumable/Trash/waffles.rsi - - -- type: entity - name: banana peel - parent: TrashBase - id: TrashBananaPeel - components: - - type: Sprite - sprite: Objects/Specific/Hydroponics/banana.rsi - state: peel - - type: Slippery - intersectPercentage: 0.2 - - type: CollisionWake - enabled: false - - type: Physics - bodyType: Dynamic - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" - name: "slips" - hard: false - layer: - - SmallImpassable - - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" - mass: 5 - mask: - - SmallImpassable diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml new file mode 100644 index 0000000000..b0afa06642 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml @@ -0,0 +1,26 @@ +- type: entity + parent: FoodContainerBase + name: monkey cube box + id: MonkeyCubeBox + description: Drymate brand monkey cubes. Just add water! + components: + - type: FoodContainer + prototypes: + MonkeyCubeWrapper: 100 + - type: Sprite + sprite: Objects/Misc/monkeycube.rsi + state: box + +- type: entity + parent: FoodContainerBase + name: monkey cube + id: MonkeyCubeWrapper + description: Unwrap this to get a monkey cube. + components: + - type: FoodContainer + capacity: 1 + prototypes: + MonkeyCube: 100 + - type: Sprite + sprite: Objects/Misc/monkeycube.rsi + state: wrapper diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml new file mode 100644 index 0000000000..d177ef2de8 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -0,0 +1,113 @@ +# Leaves + +- type: entity + name: cannabis leaves + parent: ProduceBase + id: LeavesCannabis + description: "Recently legalized in most galaxies." + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/cannabis.rsi + - type: Produce + seed: cannabis + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: THCOil + Quantity: 5 + +- type: entity + name: dried cannabis leaves + parent: BaseItem + id: LeavesCannabisDried + description: "Dried cannabis leaves, ready to be ground." + components: + - type: Stack + stackType: LeavesCannabisDried + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: THC + Quantity: 2 + - type: Sprite + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried + +- type: entity + name: ground cannabis + parent: BaseItem + id: GroundCannabis + description: "Ground cannabis, ready to take you on a trip." + components: + - type: Stack + stackType: GroundCannabis + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: THC + Quantity: 10 + - type: Sprite + sprite: Objects/Misc/reageant_fillings.rsi + state: powderpile + color: darkgreen + - type: Construction + graph: smokeableGroundCannabis + node: ground + +- type: entity + name: tobacco leaves + parent: ProduceBase + id: LeavesTobacco + description: "Dry them out to make some smokes." + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/tobacco.rsi + - type: Produce + seed: tobacco + +- type: entity + name: dried tobacco leaves + parent: BaseItem + id: LeavesTobaccoDried + description: "Dried tobacco leaves, ready to be ground." + components: + - type: Stack + stackType: LeavesTobaccoDried + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nicotine + Quantity: 2 + - type: Sprite + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried + +- type: entity + name: ground tobacco + parent: BaseItem + id: GroundTobacco + description: "Ground tobacco, perfect for hand-rolled cigarettes." + components: + - type: Stack + stackType: GroundTobacco + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nicotine + Quantity: 10 + - type: Sprite + sprite: Objects/Misc/reageant_fillings.rsi + state: powderpile + color: brown + - type: Construction + graph: smokeableGroundTobacco + node: ground diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml deleted file mode 100644 index f3a7fa07e0..0000000000 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml +++ /dev/null @@ -1,365 +0,0 @@ -- type: entity - parent: BaseItem - id: ProduceBase - abstract: true - components: - - type: SolutionContainer - caps: None - - type: Sprite - state: produce - - type: Produce - - type: Tag - tags: - - Grindable - -- type: entity - name: wheat - description: Sigh... wheat... a-grain? - id: Wheat - parent: ProduceBase - components: - - type: Sprite - sprite: Objects/Specific/Hydroponics/wheat.rsi - - type: SolutionContainer - caps: None - contents: - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Flour - Quantity: 5 - - type: Produce - seed: wheat - -- type: entity - name: sugarcane - description: Sickly sweet. - id: Sugarcane - parent: ProduceBase - components: - - type: Sprite - sprite: Objects/Specific/Hydroponics/sugarcane.rsi - - type: SolutionContainer - caps: None - contents: - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Glucose - Quantity: 5 - - type: Produce - seed: sugarcane - -- type: entity - name: tower-cap log - description: It's better than bad, it's good! - id: Log - parent: ProduceBase - components: - - type: Sprite - sprite: Objects/Specific/Hydroponics/towercap.rsi - - type: SolutionContainer - caps: None - - type: MeleeWeapon - - type: Produce - seed: towercap - - type: Log - -- type: entity - name: banana - parent: ProduceBase - id: FoodBanana - description: Rich in potassium. - components: - - type: Food - trash: TrashBananaPeel - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/banana.rsi - - type: Produce - seed: banana - - type: Juiceable - result: - reagents: - - ReagentId: BananaJuice - Quantity: 10 - -- type: entity - name: carrot - parent: ProduceBase - id: FoodCarrot - description: It's good for the eyes! - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/carrot.rsi - - type: Produce - seed: carrots - - type: Juiceable - result: - reagents: - - ReagentId: CarrotJuice - Quantity: 10 - -- type: entity - name: lemon - parent: ProduceBase - id: FoodLemon - description: When life gives you lemons, be grateful they aren't limes. - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/lemon.rsi - - type: Produce - seed: lemon - - type: Juiceable - result: - reagents: - - ReagentId: LimeJuice - Quantity: 10 - -- type: entity - name: potato - parent: ProduceBase - id: FoodPotato - description: The space Irish starved to death after their potato crops died. Sadly they were unable to fish for space carp due to it being the queen's space. Bringing this up to any space IRA member will drive them insane with anger. - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/potato.rsi - - type: Produce - seed: potato - - type: Juiceable - result: - reagents: - - ReagentId: PotatoJuice - Quantity: 10 - -- type: entity - name: tomato - parent: ProduceBase - id: FoodTomato - description: I say to-mah-to, you say tom-mae-to. - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/tomato.rsi - - type: Produce - seed: tomato - - type: Juiceable - result: - reagents: - - ReagentId: TomatoJuice - Quantity: 10 - -- type: entity - name: eggplant - parent: ProduceBase - id: FoodEggplant - description: Maybe there's a chicken inside? - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/eggplant.rsi - - type: Produce - seed: eggplant - -- type: entity - name: apple - parent: ProduceBase - id: FoodApple - description: It's a little piece of Eden. - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/apple.rsi - - type: Produce - seed: apple - - type: Juiceable - result: - reagents: - - ReagentId: AppleJuice - Quantity: 10 - -- type: entity - name: ear of corn - parent: ProduceBase - id: FoodCorn - description: Needs some butter! - components: - - type: Food - trash: TrashCornCob - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/corn.rsi - - type: Produce - seed: corn - -- type: entity - name: chanterelle cluster - parent: ProduceBase - id: FoodMushroom - description: "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!" - components: - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - type: Sprite - sprite: Objects/Specific/Hydroponics/chanterelle.rsi - - type: Produce - seed: chanterelle - -# Leaves - -- type: entity - name: cannabis leaves - parent: ProduceBase - id: LeavesCannabis - description: "Recently legalized in most galaxies." - components: - - type: Sprite - sprite: Objects/Specific/Hydroponics/cannabis.rsi - - type: Produce - seed: cannabis - - type: Food - - type: SolutionContainer - contents: - reagents: - - ReagentId: THCOil - Quantity: 5 - -- type: entity - name: dried cannabis leaves - parent: BaseItem - id: LeavesCannabisDried - description: "Dried cannabis leaves, ready to be ground." - components: - - type: Stack - stackType: LeavesCannabisDried - max: 5 - count: 1 - - type: SolutionContainer - contents: - reagents: - - ReagentId: THC - Quantity: 2 - - type: Sprite - sprite: Objects/Specific/Hydroponics/tobacco.rsi - state: dried - -- type: entity - name: ground cannabis - parent: BaseItem - id: GroundCannabis - description: "Ground cannabis, ready to take you on a trip." - components: - - type: Stack - stackType: GroundCannabis - max: 5 - count: 1 - - type: SolutionContainer - contents: - reagents: - - ReagentId: THC - Quantity: 10 - - type: Sprite - sprite: Objects/Misc/reageant_fillings.rsi - state: powderpile - color: darkgreen - - type: Construction - graph: smokeableGroundCannabis - node: ground - -- type: entity - name: tobacco leaves - parent: ProduceBase - id: LeavesTobacco - description: "Dry them out to make some smokes." - components: - - type: Sprite - sprite: Objects/Specific/Hydroponics/tobacco.rsi - - type: Produce - seed: tobacco - -- type: entity - name: dried tobacco leaves - parent: BaseItem - id: LeavesTobaccoDried - description: "Dried tobacco leaves, ready to be ground." - components: - - type: Stack - stackType: LeavesTobaccoDried - max: 5 - count: 1 - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nicotine - Quantity: 2 - - type: Sprite - sprite: Objects/Specific/Hydroponics/tobacco.rsi - state: dried - -- type: entity - name: ground tobacco - parent: BaseItem - id: GroundTobacco - description: "Ground tobacco, perfect for hand-rolled cigarettes." - components: - - type: Stack - stackType: GroundTobacco - max: 5 - count: 1 - - type: SolutionContainer - contents: - reagents: - - ReagentId: Nicotine - Quantity: 10 - - type: Sprite - sprite: Objects/Misc/reageant_fillings.rsi - state: powderpile - color: brown - - type: Construction - graph: smokeableGroundTobacco - node: ground diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 6c78f40235..fb1b48220a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -21,6 +21,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/wheat.rsi +- type: entity + parent: SeedBase + name: packet of oat seeds + id: OatSeeds + components: + - type: Seed + seed: oat + - type: Sprite + sprite: Objects/Specific/Hydroponics/oat.rsi + - type: entity parent: SeedBase name: packet of banana seeds @@ -51,6 +61,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/lemon.rsi +- type: entity + parent: SeedBase + name: packet of pineapple seeds + id: PineappleSeeds + components: + - type: Seed + seed: pineapple + - type: Sprite + sprite: Objects/Specific/Hydroponics/pineapple.rsi + - type: entity parent: SeedBase name: packet of potato seeds diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 026ed9cded..a6d63ea250 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -54,12 +54,12 @@ # snap: Center - type: entity + parent: BaseItem id: Ash name: ash description: This used to be something, but now it's not. - parent: BaseItem components: - type: Sprite netsync: false - sprite: Objects/Consumable/Trash/ash.rsi - state: icon + sprite: Objects/Materials/materials.rsi + state: ash diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index ab1dbac063..9866b2c45d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -1,5 +1,5 @@ - type: entity - parent: FoodBase + parent: BaseItem id: MonkeyCube name: monkey cube description: Just add water! @@ -12,7 +12,8 @@ maxVol: 11 # needs room for water caps: Refillable - type: Sprite - sprite: Objects/Consumable/Food/monkeycube.rsi + sprite: Objects/Misc/monkeycube.rsi + state: cube - type: Reactive reactions: - !type:AddToSolutionReaction diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 14debfa41f..2a8652cfaf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -96,7 +96,7 @@ currentSelector: Single allSelectors: - Single - fillPrototype: FoodBananaCreamPie + fillPrototype: FoodPieBananaCream fireRate: 5 capacity: 5 soundEmpty: /Audio/Weapons/Guns/Empty/empty.ogg diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 6ec9bf1102..6a748b5dbf 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -5,7 +5,7 @@ displayName: wheat stalks plantRsi: Objects/Specific/Hydroponics/wheat.rsi productPrototypes: - - Wheat + - WheatBushel lifespan: 25 maturation: 6 production: 1 @@ -23,6 +23,31 @@ Max: 20 PotencyDivisor: 20 +- type: seed + id: oat + name: oat + seedName: oat + displayName: oat stalks + plantRsi: Objects/Specific/Hydroponics/oat.rsi + productPrototypes: + - OatBushel + lifespan: 25 + maturation: 6 + production: 1 + yield: 4 + potency: 5 + idealLight: 8 + nutrientConsumption: 0.15 + chemicals: + Nutriment: + Min: 1 + Max: 20 + PotencyDivisor: 20 + Oats: + Min: 5 + Max: 20 + PotencyDivisor: 20 + - type: seed id: banana name: banana @@ -87,6 +112,27 @@ Max: 20 PotencyDivisor: 20 +- type: seed + id: pineapple + name: pineapple + seedName: pineapple + displayName: pineapple plant + plantRsi: Objects/Specific/Hydroponics/pineapple.rsi + productPrototypes: + - FoodPineapple + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 4 + potency: 10 + idealLight: 8 + chemicals: + Nutriment: + Min: 1 + Max: 20 + PotencyDivisor: 20 + - type: seed id: potato name: potato @@ -241,6 +287,52 @@ Max: 10 PotencyDivisor: 10 +- type: seed + id: onion + name: onion + seedName: onion + displayName: onions + plantRsi: Objects/Specific/Hydroponics/onion.rsi + productPrototypes: + - FoodOnion + lifespan: 25 + maturation: 8 + production: 6 + yield: 3 + potency: 20 + growthStages: 3 + idealLight: 8 + waterConsumption: 6 + idealHeat: 298 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + +- type: seed + id: onionred + name: red onion + seedName: red onion + displayName: red onions + plantRsi: Objects/Specific/Hydroponics/onion_red.rsi + productPrototypes: + - FoodOnionRed + lifespan: 25 + maturation: 8 + production: 6 + yield: 3 + potency: 20 + growthStages: 3 + idealLight: 8 + waterConsumption: 6 + idealHeat: 298 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + - type: seed id: chanterelle name: chanterelle diff --git a/Resources/Prototypes/Reagents/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml similarity index 51% rename from Resources/Prototypes/Reagents/drinks.yml rename to Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index e9a57d2537..b31d59a19d 100644 --- a/Resources/Prototypes/Reagents/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -177,78 +177,6 @@ color: "#ff7d63" spritePath: antifreeze.rsi -- type: reagent - id: Cola - name: cola - desc: A sweet, carbonated soft drink. Caffeine free. - physicalDesc: fizzy - color: "#422912" - metabolism: - - !type:DefaultDrink - rate: 1 - plantMetabolism: - - !type:AdjustNutrition - amount: 0.1 - - !type:AdjustWater - amount: 1 - - !type:AdjustHealth - amount: 0.1 - -- type: reagent - id: Coffee - name: coffee - desc: A drink made from brewed coffee beans. Contains a moderate amount of caffeine. - physicalDesc: aromatic - color: "#664300" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: Tea - name: tea - desc: A drink made by boiling leaves of the tea tree, Camellia sinensis. - physicalDesc: aromatic - color: "#8a5a3a" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: Cream - name: cream - desc: The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh? - physicalDesc: creamy - color: "#DFD7AF" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: Milk - name: milk - desc: An opaque white liquid produced by the mammary glands of mammals. - physicalDesc: opaque - color: "#DFDFDF" - metabolism: - - !type:DefaultDrink - rate: 1 - plantMetabolism: - - !type:AdjustNutrition - amount: 0.1 - - !type:AdjustWater - amount: 0.9 - -- type: reagent - id: SpoiledMilk - name: spoiled milk - desc: This milk has gone rancid. - physicalDesc: putrid - color: "#faffba" - metabolism: - - !type:DefaultDrink - rate: 1 - - type: reagent id: CreamyDelight name: creamy delight @@ -279,151 +207,4 @@ - !type:DefaultDrink rate: 1 - -#Juices -- type: reagent - id: AppleJuice - name: apple juice - desc: It's a little piece of Eden. - physicalDesc: crisp - color: "#FDAD01" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: BerryJuice - name: berry juice - desc: A delicious blend of several different kinds of berries. - physicalDesc: sweet - color: "#660099" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: BananaJuice - name: banana juice - desc: The raw essence of a banana. HONK. - physicalDesc: crisp - color: "#FFE777" - metabolism: - - !type:DefaultDrink - rate: 1 - -#TODO: port on_mob_life: restore eyesight -#if(..()) -#return 1 -# M.eye_blurry = max(M.eye_blurry - 1 , 0) -# M.eye_blind = max(M.eye_blind - 1 , 0) -# switch(data) -# if(21 to INFINITY) -# if(prob(data - 10)) -# M.disabilities &= ~NEARSIGHTED -# data++ - -- type: reagent - id: CarrotJuice - name: carrot juice - desc: It's like a carrot, but less crunchy. - physicalDesc: crisp - color: "#FF8820" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: LimeJuice - name: lime juice - desc: The sweet-sour juice of limes. - physicalDesc: citric - color: "#99bb43" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: LemonJuice - name: lemon juice - desc: This juice is VERY sour. - physicalDesc: citric - color: "#fff690" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: GrapeJuice - name: grape juice - desc: Freshly squeezed juice from red grapes. Quite sweet. - physicalDesc: crisp - color: "#512284" - metabolism: - - !type:DefaultDrink - rate: 1 - - -# /datum/reagent/drink/orangejuice/on_mob_life(var/mob/living/M) - -# if(..()) -# return 1 - -# if(M.getToxLoss() && prob(20)) -# M.adjustToxLoss(-REM) - -- type: reagent - id: OrangeJuice - name: orange juice - desc: Both delicious AND rich in Vitamin C. What more do you need? - physicalDesc: citric - color: "#E78108" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: TomatoJuice - name: tomato juice - desc: Tomatoes made into juice. What a waste of good tomatoes, huh? - physicalDesc: saucey - color: "#731008" - metabolism: - - !type:DefaultDrink - rate: 1 - -# /datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M) - -# if(..()) -# return 1 - -# M.adjustToxLoss(1) - -- type: reagent - id: PoisonBerryJuice - name: poison berry juice - desc: A surprisingly tasty juice blended from various kinds of very deadly and toxic berries. - physicalDesc: aromatic #maybe should be 'sickly'? - color: "#6600CC" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: WatermelonJuice - name: water melon juice - desc: The delicious juice of a watermelon. - physicalDesc: sweet - color: "#EF3520" - metabolism: - - !type:DefaultDrink - rate: 1 - -- type: reagent - id: PotatoJuice - name: potato juice - desc: Juice of the potato. Bleh. - physicalDesc: starchy - color: "#302000" - metabolism: - - !type:DefaultDrink - rate: 1 + diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml new file mode 100644 index 0000000000..a3eaff3037 --- /dev/null +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -0,0 +1,64 @@ +- type: reagent + id: Coffee + name: coffee + desc: A drink made from brewed coffee beans. Contains a moderate amount of caffeine. + physicalDesc: aromatic + color: "#664300" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: Tea + name: tea + desc: A drink made by boiling leaves of the tea tree, Camellia sinensis. + physicalDesc: aromatic + color: "#8a5a3a" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: Cream + name: cream + desc: The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh? + physicalDesc: creamy + color: "#DFD7AF" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: Milk + name: milk + desc: An opaque white liquid produced by the mammary glands of mammals. + physicalDesc: opaque + color: "#DFDFDF" + metabolism: + - !type:DefaultDrink + rate: 1 + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 0.9 + +- type: reagent + id: SpoiledMilk + name: spoiled milk + desc: This milk has gone rancid. + physicalDesc: putrid + color: "#faffba" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: MilkOat + name: oat milk + desc: Surprisingly tasty. + physicalDesc: refreshing + color: "#302000" + metabolism: + - !type:DefaultDrink + rate: 1 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml new file mode 100644 index 0000000000..44a75bbd1d --- /dev/null +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -0,0 +1,155 @@ +- type: reagent + id: JuiceApple + name: apple juice + desc: It's a little piece of Eden. + physicalDesc: crisp + color: "#FDAD01" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuiceBerry + name: berry juice + desc: A delicious blend of several different kinds of berries. + physicalDesc: sweet + color: "#660099" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuiceBanana + name: banana juice + desc: The raw essence of a banana. HONK. + physicalDesc: crisp + color: "#FFE777" + metabolism: + - !type:DefaultDrink + rate: 1 + +#TODO: port on_mob_life: restore eyesight +#if(..()) +#return 1 +# M.eye_blurry = max(M.eye_blurry - 1 , 0) +# M.eye_blind = max(M.eye_blind - 1 , 0) +# switch(data) +# if(21 to INFINITY) +# if(prob(data - 10)) +# M.disabilities &= ~NEARSIGHTED +# data++ + +- type: reagent + id: JuiceCarrot + name: carrot juice + desc: It's like a carrot, but less crunchy. + physicalDesc: crisp + color: "#FF8820" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuiceLime + name: lime juice + desc: The sweet-sour juice of limes. + physicalDesc: citric + color: "#99bb43" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuiceLemon + name: lemon juice + desc: This juice is VERY sour. + physicalDesc: citric + color: "#fff690" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuiceGrape + name: grape juice + desc: Freshly squeezed juice from red grapes. Quite sweet. + physicalDesc: crisp + color: "#512284" + metabolism: + - !type:DefaultDrink + rate: 1 + +# /datum/reagent/drink/orangejuice/on_mob_life(var/mob/living/M) + +# if(..()) +# return 1 + +# if(M.getToxLoss() && prob(20)) +# M.adjustToxLoss(-REM) + +- type: reagent + id: JuiceOrange + name: orange juice + desc: Both delicious AND rich in Vitamin C. What more do you need? + physicalDesc: citric + color: "#E78108" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuiceTomato + name: tomato juice + desc: Tomatoes made into juice. What a waste of good tomatoes, huh? + physicalDesc: saucey + color: "#731008" + metabolism: + - !type:DefaultDrink + rate: 1 + +# /datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M) + +# if(..()) +# return 1 + +# M.adjustToxLoss(1) + +- type: reagent + id: JuiceBerryPoison + name: poison berry juice + desc: A surprisingly tasty juice blended from various kinds of very deadly and toxic berries. + physicalDesc: aromatic #maybe should be 'sickly'? + color: "#6600CC" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuiceWatermelon + name: water melon juice + desc: The delicious juice of a watermelon. + physicalDesc: sweet + color: "#EF3520" + metabolism: + - !type:DefaultDrink + rate: 1 + +- type: reagent + id: JuicePineapple + name: pineapple juice + desc: The delicious juice of a pineapple. + physicalDesc: tropical + color: yellow + metabolism: + - !type:DefaultDrink + rate: 1 + +# - type: reagent +# id: PotatoJuice +# name: potato juice +# desc: Juice of the potato. Bleh. +# physicalDesc: starchy +# color: "#302000" +# metabolism: +# - !type:DefaultDrink +# rate: 1 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml new file mode 100644 index 0000000000..d91a96dd18 --- /dev/null +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -0,0 +1,16 @@ +- type: reagent + id: Cola + name: cola + desc: A sweet, carbonated soft drink. Caffeine free. + physicalDesc: fizzy + color: "#422912" + metabolism: + - !type:DefaultDrink + rate: 1 + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml new file mode 100644 index 0000000000..88183dbfb6 --- /dev/null +++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml @@ -0,0 +1,79 @@ +- type: reagent + id: Astrotame + name: Astrotame + desc: The sweetness of a thousand sugars but none of the calories. +# physicalDesc: + color: aquamarine + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: BbqSauce + name: BBQ sauce + desc: Hand wipes not included. + physicalDesc: Gloopy. + color: darkred + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Cornoil + name: corn oil + desc: Corn oil, A delicious oil used in cooking. Made from corn. +# physicalDesc: + color: yellow + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Frostoil + name: frostoil + desc: Leaves the tongue numb in its passage. +# physicalDesc: + color: skyblue + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: HorseradishSauce + name: horseradish sauce + desc: Smelly horseradish sauce. + physicalDesc: Overpowering. + color: gray + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Hotsauce + name: hotsauce + desc: Burns so good. +# physicalDesc: + color: red + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Ketchup + name: ketchup + desc: Made from pureed tomatoes and flavored with spices. +# physicalDesc: + color: red + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Soysauce + name: soy sauce + desc: A salty soy-based flavoring. +# physicalDesc: + color: saddlebrown + metabolism: + - !type:DefaultFood + rate: 1 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml new file mode 100644 index 0000000000..ee13427ec1 --- /dev/null +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -0,0 +1,95 @@ +- type: reagent + id: Flour + name: flour + desc: Used for baking. + physicalDesc: powdery + color: white + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Oats + name: oats + desc: Used for a variety of tasty purposes. + physicalDesc: coarse + color: tan + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Enzyme + name: universal enzyme + desc: Used in cooking various dishes. + color: "#009900" + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Egg + name: egg + desc: Used for baking. + physicalDesc: mucus-like + color: white + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Sugar + name: sugar + desc: Tasty spacey sugar! + physicalDesc: + color: white + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Salt + name: salt + desc: Salt. From space oceans, presumably. + physicalDesc: Coarse. + color: white + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Blackpepper + name: black pepper + desc: Often used to flavor food or make people sneeze. + physicalDesc: Grainy. + color: black + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Vinegar + name: vinegar + desc: Often used to flavor food. + color: tan + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: Rice + name: rice + desc: Hard, small white grains. + color: white + metabolism: + - !type:DefaultFood + rate: 1 + +- type: reagent + id: OilOlive + name: olive oil + desc: Viscous and fragrant. + color: olive + metabolism: + - !type:DefaultFood + rate: 1 diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml index fe188fb654..5da5928f4a 100644 --- a/Resources/Prototypes/Reagents/chemicals.yml +++ b/Resources/Prototypes/Reagents/chemicals.yml @@ -178,21 +178,9 @@ plantMetabolism: - !type:AdjustToxins amount: 10 - -- type: reagent - id: Sugar - name: sugar - desc: Sweet. - color: "#ffffff" - physicalDesc: opaque - plantMetabolism: - - !type:AdjustNutrition - amount: 0.1 - - !type:AdjustWeeds - amount: 2 - - !type:AdjustPests - amount: 2 - + - !type:AdjustHealth + amount: -5 + - type: reagent id: SulfuricAcid name: sulfuric acid @@ -207,7 +195,7 @@ - !type:AdjustWeeds amount: -2 - !type:AdjustHealth - amount: -4 + amount: -5 - type: reagent id: UnstableMutagen @@ -259,4 +247,3 @@ color: "#9e6b38" boilingPoint: 190.0 # Perfluorooctanoic Acid. meltingPoint: 45.0 - diff --git a/Resources/Prototypes/Reagents/food_reagents.yml b/Resources/Prototypes/Reagents/food_reagents.yml deleted file mode 100644 index f126f4a0c1..0000000000 --- a/Resources/Prototypes/Reagents/food_reagents.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: reagent - id: Flour - name: flour - desc: Used for baking. - physicalDesc: powdery - color: "#FFFFFF" - metabolism: - - !type:DefaultFood - rate: 1 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index eb7b54fbce..c25eb39e35 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -2,7 +2,7 @@ - type: microwaveMealRecipe id: RecipeCheeseburger name: cheeseburger recipe - result: FoodCheeseburger + result: FoodBurgerCheese time: 5 reagents: Flour: 5 @@ -12,32 +12,32 @@ - type: microwaveMealRecipe id: RecipeClownBurger name: clownburger recipe - result: FoodClownBurger + result: FoodBurgerClown time: 5 reagents: Flour: 5 solids: ClothingMaskClown: 1 -- type: microwaveMealRecipe - id: RecipeTofuBurger - name: tofu burger recipe - result: FoodTofuBurger - time: 5 - reagents: - Flour: 15 - solids: - FoodTofu: 1 +# - type: microwaveMealRecipe +# id: RecipeTofuBurger +# name: tofu burger recipe +# result: FoodBurgerTofu +# time: 5 +# reagents: +# Flour: 15 +# solids: +# FoodTofu: 1 - type: microwaveMealRecipe id: RecipeXenoburger name: xenoburger recipe - result: FoodXenoburger + result: FoodBurgerXeno time: 5 reagents: Flour: 5 solids: - FoodXenomeat: 1 + FoodMeatXeno: 1 #- type: microwaveMealRecipe # id: RecipeSuperBiteBurger @@ -50,7 +50,7 @@ # chem.Pepper: 5 # solids: # FoodMeat: 5 -# FoodCheeseWedge: 3 +# FoodCheeseSlice: 3 # FoodTomato: 4 # FoodEgg: 2 @@ -58,37 +58,37 @@ - type: microwaveMealRecipe id: RecipeBread name: bread recipe - result: FoodBread + result: FoodBreadPlain time: 15 reagents: Flour: 15 -- type: microwaveMealRecipe - id: RecipeSandwich - name: sandwich recipe - result: FoodSandwich - time: 10 - solids: - FoodBreadSlice: 2 - FoodMeatSteak: 1 - FoodCheeseWedge: 1 +# - type: microwaveMealRecipe +# id: RecipeSandwich +# name: sandwich recipe +# result: FoodSandwich +# time: 10 +# solids: +# FoodBreadSlice: 2 +# FoodMeatSteak: 1 +# FoodCheeseSlice: 1 -- type: microwaveMealRecipe - id: RecipeToastedSandwich - name: toasted sandwich recipe - result: FoodToastedSandwich - time: 5 - solids: - FoodSandwich: 1 +# - type: microwaveMealRecipe +# id: RecipeToastedSandwich +# name: toasted sandwich recipe +# result: FoodToastedSandwich +# time: 5 +# solids: +# FoodSandwich: 1 -- type: microwaveMealRecipe - id: RecipeGrilledCheese - name: grilled cheese recipe - result: FoodGrilledCheese - time: 5 - solids: - FoodBreadSlice: 2 - FoodCheeseWedge: 1 +# - type: microwaveMealRecipe +# id: RecipeGrilledCheese +# name: grilled cheese recipe +# result: FoodGrilledCheese +# time: 5 +# solids: +# FoodBreadSlice: 2 +# FoodCheeseSlice: 1 #- type: microwaveMealRecipe # id: RecipeBaguette @@ -103,17 +103,17 @@ - type: microwaveMealRecipe id: RecipeCreamCheeseBread name: cream cheese bread recipe - result: FoodCreamCheeseBread + result: FoodBreadCreamcheese time: 20 reagents: Flour: 15 solids: - FoodCheeseWedge: 2 + FoodCheeseSlice: 2 - type: microwaveMealRecipe id: RecipeBananaBread name: banana bread recipe - result: FoodBananaBread + result: FoodBreadBanana time: 25 reagents: Flour: 15 @@ -126,18 +126,18 @@ - type: microwaveMealRecipe id: RecipeMargheritaPizza name: margherita pizza recipe - result: FoodMargheritaPizza + result: FoodPizzaMargherita time: 30 reagents: Flour: 10 solids: - FoodCheeseWedge: 4 + FoodCheeseSlice: 4 FoodTomato: 1 - type: microwaveMealRecipe id: RecipeMushroomPizza name: mushroom pizza recipe - result: FoodMushroomPizza + result: FoodPizzaMushroom time: 25 reagents: Flour: 10 @@ -147,19 +147,19 @@ - type: microwaveMealRecipe id: RecipeMeatPizza name: meat pizza recipe - result: FoodMeatPizza + result: FoodPizzaMeat time: 30 reagents: Flour: 10 solids: FoodMeat: 3 - FoodCheeseWedge: 1 + FoodCheeseSlice: 1 FoodTomato: 1 - type: microwaveMealRecipe id: RecipeVegetablePizza name: vegetable pizza recipe - result: FoodVegetablePizza + result: FoodPizzaVegetable time: 30 reagents: Flour: 10 @@ -170,45 +170,45 @@ FoodTomato: 1 #Italian -- type: microwaveMealRecipe - id: RecipeSpaghetti - name: spaghetti recipe - result: FoodSpaghetti - time: 1 - reagents: - Flour: 5 +# - type: microwaveMealRecipe +# id: RecipeSpaghetti +# name: spaghetti recipe +# result: FoodSpaghetti +# time: 1 +# reagents: +# Flour: 5 -- type: microwaveMealRecipe - id: RecipeBoiledSpaghetti - name: boiled spaghetti recipe - result: FoodSpaghettiBoiled - time: 5 - reagents: - Water: 5 - solids: - FoodSpaghetti: 1 +# - type: microwaveMealRecipe +# id: RecipeBoiledSpaghetti +# name: boiled spaghetti recipe +# result: FoodSpaghettiBoiled +# time: 5 +# reagents: +# Water: 5 +# solids: +# FoodSpaghetti: 1 - type: microwaveMealRecipe id: RecipePastaTomato name: pasta tomato recipe - result: FoodPastaTomato + result: FoodNoodles time: 10 reagents: Water: 5 solids: - FoodSpaghetti: 1 + FoodNoodlesBoiled: 1 FoodTomato: 2 - type: microwaveMealRecipe id: RecipeMeatballSpaghetti name: spaghetti & meatballs recipe - result: FoodMeatballSpaghetti + result: FoodNoodlesMeatball time: 10 reagents: Water: 5 solids: - FoodSpaghetti: 1 - FoodMeatball: 2 + FoodNoodlesBoiled: 1 + FoodMeatMeatball: 2 #- type: microwaveMealRecipe # id: RecipeCrabSpaghetti @@ -246,7 +246,7 @@ # chem.Flour: 10 #This should be 10 units of rice. # chem.Wine: 5 # solids: -# FoodCheeseWedge: 1 +# FoodCheeseSlice: 1 #- type: microwaveMealRecipe # id: RecipeBruschetta @@ -258,7 +258,7 @@ # chem.Salt: 2 # solids: # FoodGarlic: 1 -# FoodCheeseWedge: 1 +# FoodCheeseSlice: 1 # FoodTomato: 1 #- type: microwaveMealRecipe @@ -270,7 +270,7 @@ # FoodBlueTomato: 1 # FoodGarlic: 1 # FoodEgg: 1 -# FoodCheeseWedge: 1 +# FoodCheeseSlice: 1 #- type: microwaveMealRecipe # id: RecipeLasagna @@ -283,18 +283,18 @@ # FoodFlatDough: 2 # FoodMeat: 2 # FoodEggplant: 1 -# FoodCheeseWedge: 1 +# FoodCheeseSlice: 1 #Soups & Stew - type: microwaveMealRecipe id: RecipeMeatballSoup name: meatball soup recipe - result: FoodMeatballSoup + result: FoodSoupMeatball time: 10 reagents: Water: 10 solids: - FoodMeatball: 1 + FoodMeatMeatball: 1 FoodCarrot: 1 FoodPotato: 1 @@ -330,25 +330,16 @@ reagents: Cola: 5 solids: - FoodMiloSoup: 1 + FoodSoupMiso: 1 - type: microwaveMealRecipe id: RecipeLoadedBakedPotato name: loaded baked potato recipe - result: FoodLoadedBakedPotato + result: FoodMealPotatoLoaded time: 10 solids: FoodPotato: 1 - FoodCheeseWedge: 1 - -- type: microwaveMealRecipe - id: RecipeCandyCorn - name: candy corn recipe - result: FoodCandyCorn - time: 5 - solids: - FoodCorn: 1 - Sugarcane: 1 + FoodCheeseSlice: 1 # Reagent version (Reagents are broken) #- type: microwaveMealRecipe @@ -364,7 +355,7 @@ - type: microwaveMealRecipe id: RecipePopcorn name: popcorn recipe - result: FoodPopcorn + result: FoodSnackPopcorn time: 5 solids: FoodCorn: 1 @@ -372,7 +363,7 @@ - type: microwaveMealRecipe id: RecipeBananaCreamPie name: banana cream pie - result: FoodBananaCreamPie + result: FoodPieBananaCream time: 15 reagents: Flour: 10 diff --git a/Resources/Prototypes/SoundCollections/drink_open_sounds.yml b/Resources/Prototypes/SoundCollections/drink_open_sounds.yml index 04e2a8641e..fea78d0464 100644 --- a/Resources/Prototypes/SoundCollections/drink_open_sounds.yml +++ b/Resources/Prototypes/SoundCollections/drink_open_sounds.yml @@ -9,3 +9,13 @@ id: bottleOpenSounds files: - /Audio/Items/bottle_open1.ogg + +- type: soundCollection + id: packetOpenSounds + files: + - /Audio/Effects/packetrip.ogg + +- type: soundCollection + id: pop + files: + - /Audio/Items/pop.ogg diff --git a/Resources/Prototypes/SoundCollections/food.yml b/Resources/Prototypes/SoundCollections/food.yml new file mode 100644 index 0000000000..606714b796 --- /dev/null +++ b/Resources/Prototypes/SoundCollections/food.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: eating + files: + - /Audio/Items/eating_1.ogg + - /Audio/Items/eating_2.ogg + - /Audio/Items/eating_3.ogg diff --git a/Resources/Prototypes/Stacks/tobacco_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml similarity index 61% rename from Resources/Prototypes/Stacks/tobacco_stacks.yml rename to Resources/Prototypes/Stacks/consumable_stacks.yml index 1c48fd1d2c..d821badc86 100644 --- a/Resources/Prototypes/Stacks/tobacco_stacks.yml +++ b/Resources/Prototypes/Stacks/consumable_stacks.yml @@ -1,4 +1,20 @@ -- type: stack +# Food + +- type: stack + id: Pancake + name: pancake + +# Food Containers + +- type: stack + id: PizzaBox + name: pizza box + icon: Objects/Consumable/Food/Baked/pizza.rsi/box.png + spawn: FoodPizzaBox + +# Smokeables + +- type: stack id: PaperRolling name: paper rolling diff --git a/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/icon.png deleted file mode 100644 index 733e5790c1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png new file mode 100644 index 0000000000..66dcb6019a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png new file mode 100644 index 0000000000..318668da8d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-filling2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png new file mode 100644 index 0000000000..ef6beb0f70 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png new file mode 100644 index 0000000000..842805c409 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png new file mode 100644 index 0000000000..418ed990b3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png new file mode 100644 index 0000000000..00131ad176 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha-slice2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png new file mode 100644 index 0000000000..a8379ac4a1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png new file mode 100644 index 0000000000..53bb4fb8d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/alpha2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png new file mode 100644 index 0000000000..de137b2a62 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png new file mode 100644 index 0000000000..e0eb82d082 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png new file mode 100644 index 0000000000..f5f78c4680 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/banana.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png new file mode 100644 index 0000000000..ca7104c27f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/buttered-toast.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png new file mode 100644 index 0000000000..c9b809b2a3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png new file mode 100644 index 0000000000..a7e3aaa94f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/creamcheese.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png new file mode 100644 index 0000000000..c9fff6ad11 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/garlic-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png new file mode 100644 index 0000000000..ae5d718765 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/jelly-toast.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png new file mode 100644 index 0000000000..a67b0d0540 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png new file mode 100644 index 0000000000..ec47c76d52 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json new file mode 100644 index 0000000000..0b0c5c1688 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -0,0 +1,104 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alpha" + }, + { + "name": "alpha2" + }, + { + "name": "alpha-filling" + }, + { + "name": "alpha-filling2" + }, + { + "name": "alpha-slice" + }, + { + "name": "alpha-slice2" + }, + { + "name": "alpha-slice-filling" + }, + { + "name": "alpha-slice2-filling" + }, + { + "name": "baguette" + }, + { + "name": "banana" + }, + { + "name": "banana-slice" + }, + { + "name": "buttered-toast" + }, + { + "name": "creamcheese" + }, + { + "name": "creamcheese-slice" + }, + { + "name": "garlic-slice" + }, + { + "name": "jelly-toast" + }, + { + "name": "meat" + }, + { + "name": "meat-slice" + }, + { + "name": "mimana" + }, + { + "name": "mimana-slice" + }, + { + "name": "moldy-slice" + }, + { + "name": "plain" + }, + { + "name": "plain-slice" + }, + { + "name": "plate" + }, + { + "name": "spidermeat" + }, + { + "name": "spidermeat-slice" + }, + { + "name": "tofu" + }, + { + "name": "tofu-slice" + }, + { + "name": "two-slice" + }, + { + "name": "xenomeat" + }, + { + "name": "xenomeat-slice" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png new file mode 100644 index 0000000000..e45c8a9c71 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png new file mode 100644 index 0000000000..7de8a3920a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/mimana.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png new file mode 100644 index 0000000000..e63a9f0b17 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/moldy-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png new file mode 100644 index 0000000000..855c8fb230 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png new file mode 100644 index 0000000000..d592e73c94 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plate.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plate.png new file mode 100644 index 0000000000..9fa2b33db3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/plate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png new file mode 100644 index 0000000000..d9af8868cf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png new file mode 100644 index 0000000000..3945e48afc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/spidermeat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png new file mode 100644 index 0000000000..f7feab6594 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png new file mode 100644 index 0000000000..90432f280f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/tofu.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png new file mode 100644 index 0000000000..fd4617092e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/two-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png new file mode 100644 index 0000000000..73c0e5447f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png new file mode 100644 index 0000000000..47cdef15f8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/xenomeat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling.png new file mode 100644 index 0000000000..0ceef6ecef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling.png new file mode 100644 index 0000000000..89ee2a7958 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice.png new file mode 100644 index 0000000000..e0a6863859 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha.png new file mode 100644 index 0000000000..6679d2b2db Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple-slice.png new file mode 100644 index 0000000000..04f13a1c9f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple.png new file mode 100644 index 0000000000..39790cfcab Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice.png new file mode 100644 index 0000000000..74deb01fe1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday.png new file mode 100644 index 0000000000..22b465dd07 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/braincake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/braincake.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-slice.png new file mode 100644 index 0000000000..a7ddc2c7c1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain.png new file mode 100644 index 0000000000..af9c1c2acf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/carrot-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/carrot-slice.png new file mode 100644 index 0000000000..801f3e6806 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/carrot-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/carrot.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/carrot.png new file mode 100644 index 0000000000..95993f0b06 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/carrot.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cheese-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cheese-slice.png new file mode 100644 index 0000000000..6ba076deec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cheese-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cheese.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cheese.png new file mode 100644 index 0000000000..4bc72619a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cheese.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice.png new file mode 100644 index 0000000000..fe49fe489c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate.png new file mode 100644 index 0000000000..29886cf821 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/christmas-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/christmas-slice.png new file mode 100644 index 0000000000..deb008326c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/christmas-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/christmas.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/christmas.png new file mode 100644 index 0000000000..7ca73f5efd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/christmas.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice.png new file mode 100644 index 0000000000..9595c74695 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown.png new file mode 100644 index 0000000000..8cd9da49c0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon-slice.png new file mode 100644 index 0000000000..b58d461062 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon.png new file mode 100644 index 0000000000..446b34451f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime-slice.png new file mode 100644 index 0000000000..1b9b6b162f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime.png new file mode 100644 index 0000000000..41d70cdab3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json new file mode 100644 index 0000000000..50525ce7f2 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json @@ -0,0 +1,137 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alpha" + }, + { + "name": "alpha-filling" + }, + { + "name": "alpha-slice" + }, + { + "name": "alpha-slice-filling" + }, + { + "name": "apple" + }, + { + "name": "apple-slice" + }, + { + "name": "birthday" + }, + { + "name": "birthday-slice" + }, + { + "name": "brain" + }, + { + "name": "brain-large" + }, + { + "name": "brain-slice" + }, + { + "name": "carrot" + }, + { + "name": "carrot-slice" + }, + { + "name": "cheese" + }, + { + "name": "cheese-slice" + }, + { + "name": "chocolate" + }, + { + "name": "chocolate-slice" + }, + { + "name": "lemon" + }, + { + "name": "lemon-slice" + }, + { + "name": "lime" + }, + { + "name": "lime-slice" + }, + { + "name": "orange" + }, + { + "name": "orange-slice" + }, + { + "name": "plain" + }, + { + "name": "plain-slice" + }, + { + "name": "clown" + }, + { + "name": "clown-slice" + }, + { + "name": "plate" + }, + { + "name": "plate-small" + }, + { + "name": "plate-plastic" + }, + { + "name": "plate-small-plastic" + }, + { + "name": "plate-slice-shading" + }, + { + "name": "pumpkinspice" + }, + { + "name": "pumpkinspice-slice" + }, + { + "name": "slime" + }, + { + "name": "slime-slice" + }, + { + "name": "christmas" + }, + { + "name": "christmas-slice" + }, + { + "name": "vanilla" + }, + { + "name": "vanilla-slice" + }, + { + "name": "trumpet" + }, + { + "name": "trumpet-slice" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange-slice.png new file mode 100644 index 0000000000..2305db6ff9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange.png new file mode 100644 index 0000000000..f7c2b1c78b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice.png new file mode 100644 index 0000000000..c33feb260d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain.png new file mode 100644 index 0000000000..0a26d2c834 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-plastic.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-plastic.png new file mode 100644 index 0000000000..fbd1ae3165 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-plastic.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-slice-shading.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-slice-shading.png new file mode 100644 index 0000000000..8874e90454 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-slice-shading.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-small-plastic.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-small-plastic.png new file mode 100644 index 0000000000..0eb537824b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-small-plastic.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-small.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-small.png new file mode 100644 index 0000000000..3afc00ebb4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-small.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate.png new file mode 100644 index 0000000000..9fa2b33db3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/pumpkinspice-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/pumpkinspice-slice.png new file mode 100644 index 0000000000..67af7c0de3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/pumpkinspice-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/pumpkinspice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/pumpkinspice.png new file mode 100644 index 0000000000..fd446a60c3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/pumpkinspice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/slime-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/slime-slice.png new file mode 100644 index 0000000000..29cb32a4d3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/slime-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/slime.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/slime.png new file mode 100644 index 0000000000..8fbd5245f3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/slime.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice.png new file mode 100644 index 0000000000..1c6e38fc1b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet.png new file mode 100644 index 0000000000..5ccc833d78 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-slice.png new file mode 100644 index 0000000000..a0fd4ec740 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla.png new file mode 100644 index 0000000000..23ea9557ba Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png new file mode 100644 index 0000000000..f8064c8a1e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana.png new file mode 100644 index 0000000000..ae3e6de821 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png new file mode 100644 index 0000000000..c2c7c7a503 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry.png new file mode 100644 index 0000000000..a48088694f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png new file mode 100644 index 0000000000..c84d483006 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dank.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dank.png new file mode 100644 index 0000000000..08df7f8c00 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dank.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png new file mode 100644 index 0000000000..5bda53839e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png new file mode 100644 index 0000000000..700805e518 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/inhand-left.png new file mode 100644 index 0000000000..cb46ad4887 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/inhand-right.png new file mode 100644 index 0000000000..81dc3f53a8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json new file mode 100644 index 0000000000..7b6a77fc7a --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json @@ -0,0 +1,64 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "banana" + }, + { + "name": "banana-box" + }, + { + "name": "berry" + }, + { + "name": "berry-box" + }, + { + "name": "dank" + }, + { + "name": "gondola" + }, + { + "name": "gondola-box" + }, + { + "name": "pizza" + }, + { + "name": "pizza-box" + }, + { + "name": "plain" + }, + { + "name": "box" + }, + { + "name": "spicy" + }, + { + "name": "spicy-box" + }, + { + "name": "teriyaki" + }, + { + "name": "teriyaki-box" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png new file mode 100644 index 0000000000..422474a670 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza.png new file mode 100644 index 0000000000..e9e89bd5d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/plain.png new file mode 100644 index 0000000000..88f7e6ecc6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png new file mode 100644 index 0000000000..fc539e9bf4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy.png new file mode 100644 index 0000000000..cd4578b78d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png new file mode 100644 index 0000000000..3585f3f569 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki.png new file mode 100644 index 0000000000..9a0c3e7280 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/alpha-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/alpha-inhand-left.png new file mode 100644 index 0000000000..ce5ed9e23d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/alpha-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/alpha-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/alpha-inhand-right.png new file mode 100644 index 0000000000..1a7bab7d8f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/alpha-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/beige.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/beige.png new file mode 100644 index 0000000000..ebcc494d64 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/beige.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/blue.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/blue.png new file mode 100644 index 0000000000..b31eb29f16 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/blue.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-inhand-left.png new file mode 100644 index 0000000000..cb46ad4887 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-inhand-right.png new file mode 100644 index 0000000000..81dc3f53a8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png new file mode 100644 index 0000000000..c6f6d44f17 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png new file mode 100644 index 0000000000..f1a41cf55b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png new file mode 100644 index 0000000000..025fe8e3da Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png new file mode 100644 index 0000000000..16121a0c87 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png new file mode 100644 index 0000000000..f8a1e823d1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png new file mode 100644 index 0000000000..aa4b401e32 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png new file mode 100644 index 0000000000..3e56e8cdcb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png new file mode 100644 index 0000000000..54cee84ddd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/chaos.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/chaos.png new file mode 100644 index 0000000000..b756f08b46 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/chaos.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/choc.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/choc.png new file mode 100644 index 0000000000..655fd85f43 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/choc.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/green.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/green.png new file mode 100644 index 0000000000..294409fc08 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/green.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/homer.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/homer.png new file mode 100644 index 0000000000..95215f0be6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/homer.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/donut1.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/donut1.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/donut1.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/donut1.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-beige.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-beige.png new file mode 100644 index 0000000000..11e7d59cc4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-beige.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-blue.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-blue.png new file mode 100644 index 0000000000..765f8cb335 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-blue.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-choc.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-choc.png new file mode 100644 index 0000000000..2a4daedea8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-choc.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-green.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-green.png new file mode 100644 index 0000000000..9d3265b377 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-green.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-homer.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-homer.png new file mode 100644 index 0000000000..9889fbbd1b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-homer.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-laugh.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-laugh.png new file mode 100644 index 0000000000..528a9af67c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-laugh.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-olive.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-olive.png new file mode 100644 index 0000000000..fa9d01025e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-olive.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-pink.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-pink.png new file mode 100644 index 0000000000..844b5a52eb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-pink.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-plain.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-plain.png new file mode 100644 index 0000000000..234123bd5c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-purple.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-purple.png new file mode 100644 index 0000000000..303738f516 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-purple.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-slug.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-slug.png new file mode 100644 index 0000000000..bcbbddc95b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-slug.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-sprinkles-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-sprinkles-overlay.png new file mode 100644 index 0000000000..e50cb2b63b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-sprinkles-overlay.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-yellow.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-yellow.png new file mode 100644 index 0000000000..1f2dcfa995 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-yellow.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/laugh.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/laugh.png new file mode 100644 index 0000000000..3d49527430 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/laugh.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meat.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meat.png new file mode 100644 index 0000000000..c3fd71c574 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json new file mode 100644 index 0000000000..6bf91e3f54 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json @@ -0,0 +1,166 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beige" + }, + { + "name": "blue" + }, + { + "name": "box" + }, + { + "name": "box-open" + }, + { + "name": "box1" + }, + { + "name": "box2" + }, + { + "name": "box3" + }, + { + "name": "box4" + }, + { + "name": "box5" + }, + { + "name": "box6" + }, + { + "name": "chaos" + }, + { + "name": "choc" + }, + { + "name": "green" + }, + { + "name": "homer" + }, + { + "name": "laugh" + }, + { + "name": "meat" + }, + { + "name": "olive" + }, + { + "name": "pink" + }, + { + "name": "plain" + }, + { + "name": "purple" + }, + { + "name": "yellow" + }, + { + "name": "pink-box1" + }, + { + "name": "pink-box2" + }, + { + "name": "pink-box3" + }, + { + "name": "pink-box4" + }, + { + "name": "pink-box5" + }, + { + "name": "pink-box6" + }, + { + "name": "alpha-inhand-left", + "directions": 4 + }, + { + "name": "alpha-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "box-inhand-left", + "directions": 4 + }, + { + "name": "box-inhand-right", + "directions": 4 + }, + { + "name": "pink-inhand-left", + "directions": 4 + }, + { + "name": "pink-inhand-right", + "directions": 4 + }, + { + "name": "jelly-beige" + }, + { + "name": "jelly-blue" + }, + { + "name": "jelly-choc" + }, + { + "name": "jelly-green" + }, + { + "name": "jelly-homer" + }, + { + "name": "jelly-laugh" + }, + { + "name": "jelly-olive" + }, + { + "name": "jelly-pink" + }, + { + "name": "jelly-plain" + }, + { + "name": "jelly-purple" + }, + { + "name": "jelly-yellow" + }, + { + "name": "jelly-slug" + }, + { + "name": "sprinkles-overlay" + }, + { + "name": "jelly-sprinkles-overlay" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-lining.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-lining.png new file mode 100644 index 0000000000..7013e61434 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-lining.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-open.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-open.png new file mode 100644 index 0000000000..3d9d4a4cae Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox.png new file mode 100644 index 0000000000..ca9dd9926b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox1.png new file mode 100644 index 0000000000..70ea0a4c29 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/olive.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/olive.png new file mode 100644 index 0000000000..992172bb0f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/olive.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png new file mode 100644 index 0000000000..2b414ee5c6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png new file mode 100644 index 0000000000..1357348e8e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png new file mode 100644 index 0000000000..53175f9263 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png new file mode 100644 index 0000000000..e3b5cebcf5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png new file mode 100644 index 0000000000..c1a63e01ed Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png new file mode 100644 index 0000000000..b9e81b894d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/donut2.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/donut2.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/donut2.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/donut2.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink.png new file mode 100644 index 0000000000..2808ae6b75 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/plain.png new file mode 100644 index 0000000000..2aa160aece Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/purple.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/purple.png new file mode 100644 index 0000000000..b3eed19be3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/purple.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/sprinkles-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/sprinkles-overlay.png new file mode 100644 index 0000000000..1ce26ce00d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/sprinkles-overlay.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/yellow.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/yellow.png new file mode 100644 index 0000000000..4f4f9fcc36 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/yellow.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/COOKIE!!!.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/COOKIE!!!.png new file mode 100644 index 0000000000..aa387cfc88 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/COOKIE!!!.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-honey.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-honey.png new file mode 100644 index 0000000000..d046318ebe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-honey.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-hotcross.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-hotcross.png new file mode 100644 index 0000000000..d8fa8e97b4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-hotcross.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-meat.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-meat.png new file mode 100644 index 0000000000..5043e2410c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/bun-meat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cannoli.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cannoli.png new file mode 100644 index 0000000000..bc650c48fe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cannoli.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-fortune.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-fortune.png new file mode 100644 index 0000000000..48b26152ba Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-fortune.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-oatmeal.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-oatmeal.png new file mode 100644 index 0000000000..52b9545d28 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-oatmeal.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-raisin.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-raisin.png new file mode 100644 index 0000000000..0584f5924e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-raisin.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-sugar.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-sugar.png new file mode 100644 index 0000000000..91afbf51d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/cookie-sugar.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/honeybar.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/honeybar.png new file mode 100644 index 0000000000..35349d9266 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/honeybar.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json new file mode 100644 index 0000000000..a8108199d2 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json @@ -0,0 +1,122 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cannoli" + }, + { + "name": "honeybar" + }, + { + "name": "onionrings" + }, + { + "name": "pretzel" + }, + { + "name": "muffin-bluecherry" + }, + { + "name": "muffin-cherry" + }, + { + "name": "bun-honey" + }, + { + "name": "bun-hotcross" + }, + { + "name": "bun-meat" + }, + { + "name": "muffin" + }, + { + "name": "muffin-berry" + }, + { + "name": "COOKIE!!!" + }, + { + "name": "cookie-fortune" + }, + { + "name": "cookie-oatmeal" + }, + { + "name": "cookie-raisin" + }, + { + "name": "cookie-sugar" + }, + { + "name": "pancakes1" + }, + { + "name": "pancakes2" + }, + { + "name": "pancakes3" + }, + { + "name": "pancakes4" + }, + { + "name": "pancakes5" + }, + { + "name": "pancakes6" + }, + { + "name": "pancakes7" + }, + { + "name": "pancakes8" + }, + { + "name": "pancakes9" + }, + { + "name": "pancakesbb1" + }, + { + "name": "pancakesbb2" + }, + { + "name": "pancakesbb3" + }, + { + "name": "pancakescc1" + }, + { + "name": "pancakescc2" + }, + { + "name": "pancakescc3" + }, + { + "name": "plate-small" + }, + { + "name": "waffles" + }, + { + "name": "waffles-roffle" + }, + { + "name": "waffles-soy" + }, + { + "name": "waffles-soylent" + }, + { + "name": "tray" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png new file mode 100644 index 0000000000..9e0165e812 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-bluecherry.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-bluecherry.png new file mode 100644 index 0000000000..4228f4b7f0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-bluecherry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png new file mode 100644 index 0000000000..47df322368 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin.png new file mode 100644 index 0000000000..d8662512dd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/onionrings.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/onionrings.png new file mode 100644 index 0000000000..32693d3e4f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/onionrings.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes1.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes1.png new file mode 100644 index 0000000000..ee59393a5d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes2.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes2.png new file mode 100644 index 0000000000..083a893d41 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes3.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes3.png new file mode 100644 index 0000000000..a57d50762a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes4.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes4.png new file mode 100644 index 0000000000..de80c2ef9c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes5.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes5.png new file mode 100644 index 0000000000..75da7aec74 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes6.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes6.png new file mode 100644 index 0000000000..6a56370670 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes7.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes7.png new file mode 100644 index 0000000000..30bc78e52a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes7.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes8.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes8.png new file mode 100644 index 0000000000..00964d3fff Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes8.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes9.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes9.png new file mode 100644 index 0000000000..31155d7588 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakes9.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png new file mode 100644 index 0000000000..d1a7d1debc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png new file mode 100644 index 0000000000..97d780eb37 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png new file mode 100644 index 0000000000..c5af76d886 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc1.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc1.png new file mode 100644 index 0000000000..c090789289 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png new file mode 100644 index 0000000000..ef414720a6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png new file mode 100644 index 0000000000..a91cbea80f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pigblanket.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pigblanket.png new file mode 100644 index 0000000000..110c69d650 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pigblanket.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/plate-small.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/plate-small.png new file mode 100644 index 0000000000..3afc00ebb4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/plate-small.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pretzel.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pretzel.png new file mode 100644 index 0000000000..4956c9a906 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pretzel.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/tray.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/tray.png new file mode 100644 index 0000000000..dfc6ffe418 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/tray.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-roffle.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-roffle.png new file mode 100644 index 0000000000..4209c1ddb5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-roffle.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-soy.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-soy.png new file mode 100644 index 0000000000..6ac63c48f9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-soy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-soylent.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-soylent.png new file mode 100644 index 0000000000..aeb7c49ba2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles-soylent.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles.png new file mode 100644 index 0000000000..45ba7170bf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/waffles.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box-open.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box-open.png new file mode 100644 index 0000000000..aaeddef316 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box.png new file mode 100644 index 0000000000..9bf966fec1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box1.png new file mode 100644 index 0000000000..7c5a23e854 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box2.png new file mode 100644 index 0000000000..1a6deaabc5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box3.png new file mode 100644 index 0000000000..b0ee30ea35 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box4.png new file mode 100644 index 0000000000..382020bd28 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box5.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box5.png new file mode 100644 index 0000000000..6f2f79d24e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box6.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box6.png new file mode 100644 index 0000000000..c9ed55a015 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/box6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/corgi.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/corgi.png new file mode 100644 index 0000000000..0e5811450d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/corgi.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/lizard.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/lizard.png new file mode 100644 index 0000000000..038af1be5f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/lizard.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/meta.json new file mode 100644 index 0000000000..aa656b5d28 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box1" + }, + { + "name": "box2" + }, + { + "name": "box3" + }, + { + "name": "box4" + }, + { + "name": "box5" + }, + { + "name": "box6" + }, + { + "name": "box" + }, + { + "name": "box-open" + }, + { + "name": "corgi" + }, + { + "name": "lizard" + }, + { + "name": "star" + }, + { + "name": "tendie" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/star.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/star.png new file mode 100644 index 0000000000..dca2d3caf6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/star.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/tendie.png b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/tendie.png new file mode 100644 index 0000000000..77fb8d6edd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/nuggets.rsi/tendie.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-slice-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-slice-filling.png new file mode 100644 index 0000000000..78b3dd12a7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-slice-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-tart.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-tart.png new file mode 100644 index 0000000000..a5e2508c2e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-tart.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/amanita.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/amanita.png new file mode 100644 index 0000000000..a2140b867a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/amanita.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/apple.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/apple.png new file mode 100644 index 0000000000..ec9249c2dd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/apple.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/baklava-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/baklava-slice.png new file mode 100644 index 0000000000..ea69fe1052 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/baklava-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/baklava.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/baklava.png new file mode 100644 index 0000000000..1fdd88dd70 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/baklava.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/berryclafoutis.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/berryclafoutis.png new file mode 100644 index 0000000000..ac58b55fb7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/berryclafoutis.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/cherry.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/cherry.png new file mode 100644 index 0000000000..a680abd52f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/cherry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/cocolava.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/cocolava.png new file mode 100644 index 0000000000..4a6ba1c392 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/cocolava.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/frosty.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/frosty.png new file mode 100644 index 0000000000..a2a6070be5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/frosty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/gapple.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/gapple.png new file mode 100644 index 0000000000..65cc371970 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/gapple.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/grape.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/grape.png new file mode 100644 index 0000000000..50630e3fe5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/grape.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/happy.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/happy.png new file mode 100644 index 0000000000..a6626a9612 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/happy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/pie.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/pie.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/pie.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/pie.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meat.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meat.png new file mode 100644 index 0000000000..f0210c101d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json new file mode 100644 index 0000000000..3d0e47f870 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json @@ -0,0 +1,94 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alpha-slice-filling" + }, + { + "name": "alpha-tart" + }, + { + "name": "amanita" + }, + { + "name": "apple" + }, + { + "name": "baklava" + }, + { + "name": "baklava-slice" + }, + { + "name": "berryclafoutis" + }, + { + "name": "cherry" + }, + { + "name": "cocolava" + }, + { + "name": "frosty" + }, + { + "name": "gapple" + }, + { + "name": "grape" + }, + { + "name": "happy" + }, + { + "name": "meat" + }, + { + "name": "mime" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "plain" + }, + { + "name": "plain-slice" + }, + { + "name": "plate" + }, + { + "name": "plate-slice-shading" + }, + { + "name": "plate-small" + }, + { + "name": "plate-tart" + }, + { + "name": "plump" + }, + { + "name": "tin" + }, + { + "name": "whippedcream" + }, + { + "name": "xeno" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime.png new file mode 100644 index 0000000000..87232173d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/mime.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plain-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plain-slice.png new file mode 100644 index 0000000000..ec1dc0db07 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plain-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plain.png new file mode 100644 index 0000000000..77f8026900 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-slice-shading.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-slice-shading.png new file mode 100644 index 0000000000..8874e90454 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-slice-shading.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-small.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-small.png new file mode 100644 index 0000000000..3afc00ebb4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-small.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-tart.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-tart.png new file mode 100644 index 0000000000..1e86936f27 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-tart.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate.png new file mode 100644 index 0000000000..9fa2b33db3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plump.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plump.png new file mode 100644 index 0000000000..9a224c8599 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plump.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/tin.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/tin.png new file mode 100644 index 0000000000..5bdbc10a93 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/tin.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/whippedcream.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/whippedcream.png new file mode 100644 index 0000000000..087318d2e0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/whippedcream.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/xeno.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/xeno.png new file mode 100644 index 0000000000..cb225d1640 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/xeno.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/alpha-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/alpha-filling.png new file mode 100644 index 0000000000..402def38c2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/alpha-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/alpha-slice-filling.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/alpha-slice-filling.png new file mode 100644 index 0000000000..ede5a0b383 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/alpha-slice-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/arnold-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/arnold-slice.png new file mode 100644 index 0000000000..0780c61184 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/arnold-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/arnold.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/arnold.png new file mode 100644 index 0000000000..837652886c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/arnold.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-1.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-1.png new file mode 100644 index 0000000000..d27df74356 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-2.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-2.png new file mode 100644 index 0000000000..1f04601b75 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-3.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-3.png new file mode 100644 index 0000000000..44a9f8769f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-4.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-4.png new file mode 100644 index 0000000000..183178ce98 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-5.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-5.png new file mode 100644 index 0000000000..3ee2668bb3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-6.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-6.png new file mode 100644 index 0000000000..619b5fb634 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-7.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-7.png new file mode 100644 index 0000000000..d380b9284c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-7.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-8.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-8.png new file mode 100644 index 0000000000..4e0d44955e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/base-8.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay-active.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay-active.png new file mode 100644 index 0000000000..38ae75f67a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay-active.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay.png new file mode 100644 index 0000000000..b6556f482d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay.png differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-messy-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-messy-overlay.png new file mode 100644 index 0000000000..7c8b686a4f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-messy-overlay.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-open.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-open.png new file mode 100644 index 0000000000..57a12997ce Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-tag-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-tag-overlay.png new file mode 100644 index 0000000000..51a1a10471 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-tag-overlay.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box.png new file mode 100644 index 0000000000..6dbde1766d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box1.png new file mode 100644 index 0000000000..3165870b87 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box2.png new file mode 100644 index 0000000000..d515fdb725 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box3.png new file mode 100644 index 0000000000..a70a18c870 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box4.png new file mode 100644 index 0000000000..0d3b032aae Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/dank-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/dank-slice.png new file mode 100644 index 0000000000..c656734150 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/dank-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/dank.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/dank.png new file mode 100644 index 0000000000..5b09d4c4f6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/dank.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/donkpocket-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/donkpocket-slice.png new file mode 100644 index 0000000000..1ab0627308 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/donkpocket-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/donkpocket.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/donkpocket.png new file mode 100644 index 0000000000..63438ef936 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/donkpocket.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/margherita-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/margherita-slice.png new file mode 100644 index 0000000000..0d873efa51 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/margherita-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/margherita.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/margherita.png new file mode 100644 index 0000000000..7560b27bc3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/margherita.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meat-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meat-slice.png new file mode 100644 index 0000000000..d95fcc376d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meat-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meat.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meat.png new file mode 100644 index 0000000000..1c78aa6229 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json new file mode 100644 index 0000000000..8c24d694c3 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json @@ -0,0 +1,134 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alpha-filling" + }, + { + "name": "alpha-slice-filling" + }, + { + "name": "arnold" + }, + { + "name": "arnold-slice" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + }, + { + "name": "base-7" + }, + { + "name": "base-8" + }, + { + "name": "dank" + }, + { + "name": "dank-slice" + }, + { + "name": "donkpocket" + }, + { + "name": "donkpocket-slice" + }, + { + "name": "meat" + }, + { + "name": "meat-slice" + }, + { + "name": "moldy-slice" + }, + { + "name": "mushroom" + }, + { + "name": "mushroom-slice" + }, + { + "name": "pineapple" + }, + { + "name": "pineapple-slice" + }, + { + "name": "box" + }, + { + "name": "box1" + }, + { + "name": "box2" + }, + { + "name": "box3" + }, + { + "name": "box4" + }, + { + "name": "box-messy-overlay" + }, + { + "name": "box-open" + }, + { + "name": "box-bomb-overlay" + }, + { + "name": "box-bomb-overlay-active" + }, + { + "name": "box-tag-overlay" + }, + { + "name": "plate-pizza" + }, + { + "name": "plate-slice" + }, + { + "name": "margherita" + }, + { + "name": "margherita-slice" + }, + { + "name": "sassysage" + }, + { + "name": "sassysage-slice" + }, + { + "name": "vegetable" + }, + { + "name": "vegetable-slice" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/moldy-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/moldy-slice.png new file mode 100644 index 0000000000..eb5c2461ae Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/moldy-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/mushroom-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/mushroom-slice.png new file mode 100644 index 0000000000..9afdc583db Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/mushroom-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/mushroom.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/mushroom.png new file mode 100644 index 0000000000..ac713f267a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/mushroom.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/pineapple-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/pineapple-slice.png new file mode 100644 index 0000000000..cd08fe0275 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/pineapple-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/pineapple.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/pineapple.png new file mode 100644 index 0000000000..f8d35d22bd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/pineapple.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-pizza.png new file mode 100644 index 0000000000..5f95d86cb3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-pizza.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-slice.png new file mode 100644 index 0000000000..1e86936f27 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/sassysage-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/sassysage-slice.png new file mode 100644 index 0000000000..f69c29da00 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/sassysage-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/sassysage.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/sassysage.png new file mode 100644 index 0000000000..41fb43f5fd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/sassysage.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/vegetable-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/vegetable-slice.png new file mode 100644 index 0000000000..fe5cb8bc9d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/vegetable-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/vegetable.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/vegetable.png new file mode 100644 index 0000000000..4ad3ccd562 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/vegetable.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/aesirsalad.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/aesirsalad.rsi/icon.png deleted file mode 100644 index 37cefe211f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/aesirsalad.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/aesirsalad.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/aesirsalad.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/aesirsalad.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/alienrawmeat.png b/Resources/Textures/Objects/Consumable/Food/alienrawmeat.png deleted file mode 100644 index 12832ef5ed..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/alienrawmeat.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/amanita_pie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/amanita_pie.rsi/icon.png deleted file mode 100644 index 20f2183be7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/amanita_pie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/amanita_pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/amanita_pie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/amanita_pie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/amanitajelly.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/amanitajelly.rsi/icon.png deleted file mode 100644 index 330f3b6375..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/amanitajelly.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/amanitajelly.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/amanitajelly.rsi/meta.json deleted file mode 100644 index bd2d498291..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/amanitajelly.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "delays": [[50.0, 1.0, 1.0, 1.0, 1.0, 10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/ambrosiavulgariscrushed.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/ambrosiavulgariscrushed.rsi/icon.png deleted file mode 100644 index a7e4c6da93..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/ambrosiavulgariscrushed.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/ambrosiavulgariscrushed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ambrosiavulgariscrushed.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/ambrosiavulgariscrushed.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/icon.png deleted file mode 100644 index ed79bdae6c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/meta.json deleted file mode 100644 index 2d0d580e61..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/apple_cake.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/apple_cake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/apple_cake_slice.rsi/icon.png deleted file mode 100644 index 8caf9be48a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/apple_cake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/apple_cake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/apple_cake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/apple_cake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/apple_pie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/apple_pie.rsi/icon.png deleted file mode 100644 index b384e3d45f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/apple_pie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/apple_pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/apple_pie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/apple_pie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/bacon.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/bacon.rsi/icon.png deleted file mode 100644 index 13147fdc76..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bacon.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bacon.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bacon.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/bacon.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/badrecipe.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/badrecipe.rsi/icon.png deleted file mode 100644 index 3e8049a5ee..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/badrecipe.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/badrecipe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/badrecipe.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/badrecipe.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/baguette.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/baguette.rsi/icon.png deleted file mode 100644 index 10aa6ada6f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/baguette.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/baguette.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/baguette.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/baguette.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/bananabread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/bananabread.rsi/icon.png deleted file mode 100644 index 49696a7726..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bananabread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bananabread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bananabread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/bananabread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/bananabreadslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/bananabreadslice.rsi/icon.png deleted file mode 100644 index 2f1ed0f4f9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bananabreadslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bananabreadslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bananabreadslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/bananabreadslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/bearmeat.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/bearmeat.rsi/icon.png deleted file mode 100644 index eaeee0e363..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bearmeat.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bearmeat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bearmeat.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/bearmeat.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/beetsoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/beetsoup.rsi/icon.png deleted file mode 100644 index 30e48f0bf6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/beetsoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/beetsoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/beetsoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/beetsoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/berryclafoutis.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/berryclafoutis.rsi/icon.png deleted file mode 100644 index 2f6312e7ad..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/berryclafoutis.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/berryclafoutis.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/berryclafoutis.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/berryclafoutis.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/icon.png deleted file mode 100644 index a1cf1cdb4a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/bigbiteburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/birthday_cake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/birthday_cake_slice.rsi/icon.png deleted file mode 100644 index 50a231676a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/birthday_cake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/birthday_cake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/birthday_cake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/birthday_cake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/icon.png deleted file mode 100644 index 21b0095324..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/birthdaycake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/boiledrice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/boiledrice.rsi/icon.png deleted file mode 100644 index d9f3f903ac..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/boiledrice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/boiledrice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/boiledrice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/boiledrice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/boiledrorocore.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/boiledrorocore.rsi/icon.png deleted file mode 100644 index de35c9b4d8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/boiledrorocore.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/boiledrorocore.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/boiledrorocore.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/boiledrorocore.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png new file mode 100644 index 0000000000..86be79038b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/alpha-filling.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/alpha-filling.png new file mode 100644 index 0000000000..8c382649e1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/alpha-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/alpha2-filling.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/alpha2-filling.png new file mode 100644 index 0000000000..6f3d0c95f3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/alpha2-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/ambrosiavulgaris.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/ambrosiavulgaris.png new file mode 100644 index 0000000000..8bacd436d1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/ambrosiavulgaris.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/beet.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/beet.png new file mode 100644 index 0000000000..6f454f9235 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/beet.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bisque.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bisque.png new file mode 100644 index 0000000000..e83e41f4bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bisque.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl-trash.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl-trash.png new file mode 100644 index 0000000000..d5b19140d3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl.png new file mode 100644 index 0000000000..9f91f21ff4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl2.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl2.png new file mode 100644 index 0000000000..b4d27b508d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bowl2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bungo.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bungo.png new file mode 100644 index 0000000000..1d123cf075 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/bungo.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-clown.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-clown.png new file mode 100644 index 0000000000..fbf56cce53 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-clown.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-cold.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-cold.png new file mode 100644 index 0000000000..48aa739cc3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-cold.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-hot.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-hot.png new file mode 100644 index 0000000000..85bd3739f5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/chili-hot.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/citrusdelight.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/citrusdelight.png new file mode 100644 index 0000000000..92e8e8d6fa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/citrusdelight.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/clowntears.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/clowntears.png new file mode 100644 index 0000000000..c363ac0f79 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/clowntears.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/eden.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/eden.png new file mode 100644 index 0000000000..43c8dc2145 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/eden.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/electron.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/electron.png new file mode 100644 index 0000000000..2b7ef0e036 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/electron.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/eyeball.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/eyeball.png new file mode 100644 index 0000000000..bf95ac617a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/eyeball.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fruit.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fruit.png new file mode 100644 index 0000000000..8d4f1dd4c9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fruit.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/gumbo.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/gumbo.png new file mode 100644 index 0000000000..4b47c399bf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/gumbo.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/herb.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/herb.png new file mode 100644 index 0000000000..80c5259b19 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/herb.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/jungle.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/jungle.png new file mode 100644 index 0000000000..0a9c033887 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/jungle.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meatball.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meatball.png new file mode 100644 index 0000000000..a4affdf95a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meatball.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json new file mode 100644 index 0000000000..1950d67e76 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "aesir" + }, + { + "name": "alpha-filling" + }, + { + "name": "alpha2-filling" + }, + { + "name": "ambrosiavulgaris" + }, + { + "name": "beet" + }, + { + "name": "bisque" + }, + { + "name": "bowl" + }, + { + "name": "bowl2" + }, + { + "name": "bowl-trash" + }, + { + "name": "bungo" + }, + { + "name": "chili-clown" + }, + { + "name": "chili-cold" + }, + { + "name": "chili-hot" + }, + { + "name": "citrusdelight" + }, + { + "name": "clowntears" + }, + { + "name": "eden" + }, + { + "name": "electron", + "directions": 1, + "delays": [ + [ + 1.4, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eyeball" + }, + { + "name": "fruit" + }, + { + "name": "gumbo" + }, + { + "name": "herb" + }, + { + "name": "jungle" + }, + { + "name": "meatball" + }, + { + "name": "milo" + }, + { + "name": "monkeydelight" + }, + { + "name": "mushroom" + }, + { + "name": "mystery" + }, + { + "name": "nettle" + }, + { + "name": "oatmeal" + }, + { + "name": "onion" + }, + { + "name": "redbeet" + }, + { + "name": "rice" + }, + { + "name": "rice-egg" + }, + { + "name": "rice-pork" + }, + { + "name": "rice-pudding" + }, + { + "name": "slime" + }, + { + "name": "spacelibertyduff", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "stew" + }, + { + "name": "sweetpotato" + }, + { + "name": "tomato" + }, + { + "name": "valid" + }, + { + "name": "vegetable" + }, + { + "name": "wingfangchu" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/milo.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/milo.png new file mode 100644 index 0000000000..dadeffcbfb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/milo.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/monkeydelight.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/monkeydelight.png new file mode 100644 index 0000000000..cb09d9e6c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/monkeydelight.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/mushroom.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/mushroom.png new file mode 100644 index 0000000000..1bcc835ac9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/mushroom.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/mystery.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/mystery.png new file mode 100644 index 0000000000..4b8b27d649 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/mystery.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/nettle.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/nettle.png new file mode 100644 index 0000000000..790a5b39a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/nettle.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/oatmeal.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/oatmeal.png new file mode 100644 index 0000000000..de26842c14 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/oatmeal.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/onion.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/onion.png new file mode 100644 index 0000000000..75344067f5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/onion.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/redbeet.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/redbeet.png new file mode 100644 index 0000000000..4e131bcb17 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/redbeet.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-egg.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-egg.png new file mode 100644 index 0000000000..2893540830 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-egg.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-pork.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-pork.png new file mode 100644 index 0000000000..2b0bd0f19a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-pork.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-pudding.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-pudding.png new file mode 100644 index 0000000000..bb4b919345 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice-pudding.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice.png new file mode 100644 index 0000000000..07bf01c10c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/rice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/slime.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/slime.png new file mode 100644 index 0000000000..d1c142e7f8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/slime.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/spacelibertyduff.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/spacelibertyduff.png new file mode 100644 index 0000000000..8367cb2233 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/spacelibertyduff.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/stew.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/stew.png new file mode 100644 index 0000000000..21e1ecc96f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/stew.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/sweetpotato.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/sweetpotato.png new file mode 100644 index 0000000000..ad9493d1f8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/sweetpotato.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/tomato.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/tomato.png new file mode 100644 index 0000000000..62864d20fe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/tomato.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/valid.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/valid.png new file mode 100644 index 0000000000..f53a7de3ed Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/valid.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/vegetable.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/vegetable.png new file mode 100644 index 0000000000..c7b6897c59 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/vegetable.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/wingfangchu.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/wingfangchu.png new file mode 100644 index 0000000000..7141195d18 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/wingfangchu.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/brain_cake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/brain_cake_slice.rsi/icon.png deleted file mode 100644 index 808b10ba35..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/brain_cake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/brain_cake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/brain_cake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/brain_cake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/icon.png deleted file mode 100644 index a197ef7169..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/brainburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/braincake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/braincake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/braincake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/bread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/bread.rsi/icon.png deleted file mode 100644 index 9a8f900c00..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/bread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/bread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/braincakeslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/braincakeslice.rsi/icon.png deleted file mode 100644 index 808b10ba35..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/braincakeslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/braincakeslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/braincakeslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/braincakeslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/icon.png deleted file mode 100644 index ef167e364d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/breadslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/appendix.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/appendix.png new file mode 100644 index 0000000000..b8f2eaf6ca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/appendix.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bacon.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bacon.png new file mode 100644 index 0000000000..650fe06458 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bacon.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/baseball.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/baseball.png new file mode 100644 index 0000000000..14f3d3f7c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/baseball.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bearger.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bearger.png new file mode 100644 index 0000000000..9e9a8ad1af Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bearger.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bigbite.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bigbite.png new file mode 100644 index 0000000000..7f391cde48 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bigbite.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/brain.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/brain.png new file mode 100644 index 0000000000..754e5581c0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/brain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun.png new file mode 100644 index 0000000000..fcc1c634e4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/c.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/c.png new file mode 100644 index 0000000000..0ec7ff5190 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/c.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/cheese.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/cheese.png new file mode 100644 index 0000000000..1e72e5f54f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/cheese.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/cheesealt.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/cheesealt.png new file mode 100644 index 0000000000..f7156bf4c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/cheesealt.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/chicken.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/chicken.png new file mode 100644 index 0000000000..b80c1bbdbc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/chicken.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/clown.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/clown.png new file mode 100644 index 0000000000..d6e980a9f6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/crab.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/crab.png new file mode 100644 index 0000000000..12069ee04a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/crab.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/crazy.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/crazy.png new file mode 100644 index 0000000000..03be3d802b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/crazy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-bottom.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-bottom.png new file mode 100644 index 0000000000..58d19ea8c3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-bottom.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-filling.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-filling.png new file mode 100644 index 0000000000..d9b155ca59 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-top.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-top.png new file mode 100644 index 0000000000..6c3bee6180 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/custburg-top.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/empowered.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/empowered.png new file mode 100644 index 0000000000..647893ffe1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/empowered.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/fish.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/fish.png new file mode 100644 index 0000000000..be150be0d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/fish.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/fivealarm.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/fivealarm.png new file mode 100644 index 0000000000..9d52e354c7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/fivealarm.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/ghost.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/ghost.png new file mode 100644 index 0000000000..be28087293 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/ghost.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/icon.png deleted file mode 100644 index 23ec309118..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/burger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/mcguffin.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mcguffin.png new file mode 100644 index 0000000000..e2a25acda9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mcguffin.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/mcrib.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mcrib.png new file mode 100644 index 0000000000..47cac95b64 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mcrib.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json index 6b3193ec36..b9a1635636 100644 --- a/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json @@ -1,50 +1,176 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [ { - "name": "icon" + "name": "appendix" + }, + { + "name": "bacon" + }, + { + "name": "baseball" + }, + { + "name": "bearger" + }, + { + "name": "bigbite" + }, + { + "name": "brain" + }, + { + "name": "bun" + }, + { + "name": "c" + }, + { + "name": "cheese" + }, + { + "name": "cheesealt" + }, + { + "name": "chicken" + }, + { + "name": "clown" + }, + { + "name": "crab" + }, + { + "name": "crazy", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "custburg-bottom" + }, + { + "name": "custburg-filling" + }, + { + "name": "custburg-top" + }, + { + "name": "empowered", + "delays": [ + [ + 1.5, + 0.1 + ] + ] + }, + { + "name": "fish" + }, + { + "name": "fivealarm" + }, + { + "name": "ghost", + "delays": [ + [ + 0.01, + 0.08, + 0.06, + 0.05, + 0.04, + 0.04, + 0.06, + 0.01, + 0.01, + 0.01, + 0.09, + 0.06, + 0.05, + 0.06, + 0.06, + 0.08, + 0.01, + 0.02 + ] + ] + }, + { + "name": "plain" + }, + { + "name": "mcguffin" + }, + { + "name": "mcrib" + }, + { + "name": "mime" + }, + { + "name": "rat" + }, + { + "name": "ro", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.4, + 0.3, + 0.1, + 0.3, + 0.1, + 0.3, + 0.4, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.1 + ] + ] + }, + { + "name": "spell" + }, + { + "name": "superbite" + }, + { + "name": "plate" + }, + { + "name": "tofu" + }, + { + "name": "soylent" + }, + { + "name": "x" }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/mime.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mime.png new file mode 100644 index 0000000000..c29ef1202c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/mime.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/plain.png new file mode 100644 index 0000000000..50616c65e3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/plate.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/plate.png new file mode 100644 index 0000000000..3afc00ebb4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/plate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/rat.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/rat.png new file mode 100644 index 0000000000..a7b45d8038 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/rat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/ro.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/ro.png new file mode 100644 index 0000000000..179f71a635 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/ro.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/soylent.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/soylent.png new file mode 100644 index 0000000000..d750c5c29a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/soylent.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/spell.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/spell.png new file mode 100644 index 0000000000..9d6bc6e79a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/spell.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/superbite.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/superbite.png new file mode 100644 index 0000000000..970ffbb900 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/superbite.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/tofu.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/tofu.png new file mode 100644 index 0000000000..2d668df7ca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/tofu.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/superbiteburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/ultrabite.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/superbiteburger.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/burger.rsi/ultrabite.png diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/x.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/x.png new file mode 100644 index 0000000000..2815bfd725 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/burger.rsi/x.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candiedapple.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/candiedapple.rsi/icon.png deleted file mode 100644 index 7a62619f57..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/candiedapple.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/candiedapple.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/candiedapple.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/candiedapple.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/apple.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/apple.png new file mode 100644 index 0000000000..12419b7dcb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/apple.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/bubblegum.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/bubblegum.png new file mode 100644 index 0000000000..268c55bad4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/bubblegum.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/bunny.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/bunny.png new file mode 100644 index 0000000000..2a114d5744 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/bunny.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/chocolate-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/candy.rsi/chocolate-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/chocolate-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/4no_raisins.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/candy.rsi/chocolate-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/cocoa.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/cocoa.png new file mode 100644 index 0000000000..a63cc25652 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/cocoa.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/coin.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/coin.png new file mode 100644 index 0000000000..c6757ad527 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/coin.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/corn.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/corn.png new file mode 100644 index 0000000000..a4f7ff300a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/corn.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/dice.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/dice.png new file mode 100644 index 0000000000..193a7849e8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/dice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/egg.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/egg.png new file mode 100644 index 0000000000..1351dd81a0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/egg.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/icon.png deleted file mode 100644 index c4c1890bdf..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/candy.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json index 6b3193ec36..6a30a0956c 100644 --- a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json @@ -1,50 +1,46 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [ { - "name": "icon" + "name": "apple" }, { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "bunny" }, { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "bubblegum" + }, + { + "name": "chocolate-inhand-right", + "directions": 4 + }, + { + "name": "chocolate-inhand-left", + "directions": 4 + }, + { + "name": "cocoa" + }, + { + "name": "coin" + }, + { + "name": "corn" + }, + { + "name": "dice" + }, + { + "name": "egg" + }, + { + "name": "orange" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/orange.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/orange.png new file mode 100644 index 0000000000..c36973c906 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/orange.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy_corn.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/candy_corn.rsi/icon.png deleted file mode 100644 index ef45f06fa8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/candy_corn.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy_corn.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/candy_corn.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/candy_corn.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/icon.png deleted file mode 100644 index 038c78dd05..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/carrotcake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/carrotcake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/carrotcake_slice.rsi/icon.png deleted file mode 100644 index 4a82d550d3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/carrotcake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/carrotcake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/carrotcake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/carrotcake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/carrotfries.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/carrotfries.rsi/icon.png deleted file mode 100644 index abcfc906b6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/carrotfries.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/carrotfries.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/carrotfries.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/carrotfries.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/chawanmushi.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/chawanmushi.rsi/icon.png deleted file mode 100644 index 2ed25371c9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chawanmushi.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chawanmushi.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/chawanmushi.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/chawanmushi.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/icon.png deleted file mode 100644 index 8a249699c5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cheeseburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/icon.png deleted file mode 100644 index 870796109a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cheesecake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cheesecake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cheesecake_slice.rsi/icon.png deleted file mode 100644 index 1fcffd515a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesecake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesecake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cheesecake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cheesecake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cheesepizza.png b/Resources/Textures/Objects/Consumable/Food/cheesepizza.png deleted file mode 100644 index 15c02aa3d4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesepizza.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesepizzaslice.png b/Resources/Textures/Objects/Consumable/Food/cheesepizzaslice.png deleted file mode 100644 index 515d3aaba9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesepizzaslice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesewedge.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cheesewedge.rsi/icon.png deleted file mode 100644 index 23a00d5d54..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesewedge.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesewedge.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cheesewedge.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cheesewedge.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/icon.png deleted file mode 100644 index aba67bac2f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cheesewheel.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cheesie_honkers.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cheesie_honkers.rsi/icon.png deleted file mode 100644 index 053e762db7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesie_honkers.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesie_honkers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cheesie_honkers.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cheesie_honkers.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cheesyfries.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cheesyfries.rsi/icon.png deleted file mode 100644 index 3025c030cc..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cheesyfries.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cheesyfries.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cheesyfries.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cheesyfries.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cherrypie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cherrypie.rsi/icon.png deleted file mode 100644 index c4a8a80cd5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cherrypie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cherrypie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cherrypie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cherrypie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/chips.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/chips.rsi/icon.png deleted file mode 100644 index 0e3b901961..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chips.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chips.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/chips.rsi/inhand-left.png deleted file mode 100644 index 25375d1ee4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chips.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chips.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/chips.rsi/inhand-right.png deleted file mode 100644 index 2d95bfabe2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chips.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chips.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/chips.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/chips.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/chocolatebar.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/chocolatebar.rsi/icon.png deleted file mode 100644 index 02a357464c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chocolatebar.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chocolatebar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/chocolatebar.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/chocolatebar.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/icon.png deleted file mode 100644 index 2269b37b8d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/chocolatecake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/chocolatecake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/chocolatecake_slice.rsi/icon.png deleted file mode 100644 index 32e14d8f12..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chocolatecake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chocolatecake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/chocolatecake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/chocolatecake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/chocolateegg.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/chocolateegg.rsi/icon.png deleted file mode 100644 index 6be9d42205..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/chocolateegg.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/chocolateegg.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/chocolateegg.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/chocolateegg.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/icon.png deleted file mode 100644 index 76c64b7ec8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/clownburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/clownstears.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/clownstears.rsi/icon.png deleted file mode 100644 index 58c192e632..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/clownstears.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/clownstears.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/clownstears.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/clownstears.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cocoa.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cocoa.rsi/icon.png deleted file mode 100644 index 3071b2b5ce..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cocoa.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cocoa.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cocoa.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cocoa.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/coldchili.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/coldchili.rsi/icon.png deleted file mode 100644 index b3df4983b3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/coldchili.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/coldchili.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/coldchili.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/coldchili.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/coldsauce.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/coldsauce.rsi/icon.png deleted file mode 100644 index 28020925e0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/coldsauce.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/coldsauce.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/coldsauce.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/coldsauce.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-1.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-1.png new file mode 100644 index 0000000000..531159611d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-2.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-2.png new file mode 100644 index 0000000000..a86f0064c2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-3.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-3.png new file mode 100644 index 0000000000..44ca6bef49 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-4.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-4.png new file mode 100644 index 0000000000..037488aa8e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-5.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-5.png new file mode 100644 index 0000000000..14167793b3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-6.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-6.png new file mode 100644 index 0000000000..fe6358296a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-alpha-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-coldsauce.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-coldsauce.png new file mode 100644 index 0000000000..d940b74713 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-coldsauce.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-empty.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-empty.png new file mode 100644 index 0000000000..a13a85392a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-enzyme.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-enzyme.png new file mode 100644 index 0000000000..06066cd99b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-enzyme.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-hotsauce.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-hotsauce.png new file mode 100644 index 0000000000..6d58690693 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-hotsauce.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-ketchup.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-ketchup.png new file mode 100644 index 0000000000..30c58fa384 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-ketchup.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png new file mode 100644 index 0000000000..c92c93cdd4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-2.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-2.png new file mode 100644 index 0000000000..7256ecf197 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-3.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-3.png new file mode 100644 index 0000000000..09338067ff Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-coldsauce.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-coldsauce.png new file mode 100644 index 0000000000..5f7c6abb72 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-coldsauce.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-empty.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-empty.png new file mode 100644 index 0000000000..08ea20bab4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-hotsauce.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-hotsauce.png new file mode 100644 index 0000000000..d71d89ea12 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-hotsauce.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-ketchup.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-ketchup.png new file mode 100644 index 0000000000..bf805dbb9b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-ketchup.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-vinegar.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-vinegar.png new file mode 100644 index 0000000000..2775306d16 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-vinegar.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-b.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-b.png new file mode 100644 index 0000000000..fdd7d7d82f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-b.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-c.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-c.png new file mode 100644 index 0000000000..41943e525a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-c.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-e.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-e.png new file mode 100644 index 0000000000..52b44e979c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-e.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-h.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-h.png new file mode 100644 index 0000000000..8727720305 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-h.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-k.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-k.png new file mode 100644 index 0000000000..a974110bb6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-k.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-c.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-c.png new file mode 100644 index 0000000000..c1cf210a68 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-c.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-h.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-h.png new file mode 100644 index 0000000000..1173f56c00 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-h.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-k.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-k.png new file mode 100644 index 0000000000..f056783c03 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-k.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-v.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-v.png new file mode 100644 index 0000000000..4fc9f547e5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-v.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json new file mode 100644 index 0000000000..894c35f476 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bottle-ketchup" + }, + { + "name": "bottle-hotsauce" + }, + { + "name": "bottle-empty" + }, + { + "name": "bottle-enzyme" + }, + { + "name": "bottle-coldsauce" + }, + { + "name": "bottle-alpha-1" + }, + { + "name": "bottle-alpha-2" + }, + { + "name": "bottle-alpha-3" + }, + { + "name": "bottle-alpha-4" + }, + { + "name": "bottle-alpha-5" + }, + { + "name": "bottle-alpha-6" + }, + { + "name": "bottle-s-ketchup" + }, + { + "name": "bottle-s-hotsauce" + }, + { + "name": "bottle-s-empty" + }, + { + "name": "bottle-s-coldsauce" + }, + { + "name": "bottle-s-vinegar" + }, + { + "name": "bottle-s-alpha-1" + }, + { + "name": "bottle-s-alpha-2" + }, + { + "name": "bottle-s-alpha-3" + }, + { + "name": "label-b" + }, + { + "name": "label-c" + }, + { + "name": "label-e" + }, + { + "name": "label-h" + }, + { + "name": "label-k" + }, + { + "name": "label-s-c" + }, + { + "name": "label-s-h" + }, + { + "name": "label-s-k" + }, + { + "name": "label-s-v" + }, + { + "name": "packet-astrotame" + }, + { + "name": "packet-bbq" + }, + { + "name": "packet-cornoil" + }, + { + "name": "packet-empty" + }, + { + "name": "packet-trash" + }, + { + "name": "packet-frostoil" + }, + { + "name": "packet-greygoo" + }, + { + "name": "packet-hotsauce" + }, + { + "name": "packet-ketchup" + }, + { + "name": "packet-mixed" + }, + { + "name": "packet-pepper" + }, + { + "name": "packet-salt" + }, + { + "name": "shaker-empty" + }, + { + "name": "shaker-pepper" + }, + { + "name": "shaker-salt" + }, + { + "name": "packet-soysauce" + }, + { + "name": "packet-sugar" + }, + { + "name": "packet-layer" + }, + { + "name": "packet-label" + }, + { + "name": "packet-trans-1" + }, + { + "name": "packet-trans-2" + }, + { + "name": "packet-solid-1" + }, + { + "name": "packet-solid-2" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-astrotame.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-astrotame.png new file mode 100644 index 0000000000..abe6b1d6d3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-astrotame.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-bbq.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-bbq.png new file mode 100644 index 0000000000..c170e325dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-bbq.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-cornoil.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-cornoil.png new file mode 100644 index 0000000000..5eb904ac0c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-cornoil.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-empty.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-empty.png new file mode 100644 index 0000000000..0728d8afea Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-frostoil.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-frostoil.png new file mode 100644 index 0000000000..b32b29e1fe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-frostoil.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-greygoo.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-greygoo.png new file mode 100644 index 0000000000..6fa6eee8fc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-greygoo.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-hotsauce.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-hotsauce.png new file mode 100644 index 0000000000..ad60f650f6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-hotsauce.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-ketchup.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-ketchup.png new file mode 100644 index 0000000000..bdd17103cf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-ketchup.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-label.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-label.png new file mode 100644 index 0000000000..cea9155cc6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-label.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer - Copy.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer - Copy.png new file mode 100644 index 0000000000..220b402f25 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer - Copy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer.png new file mode 100644 index 0000000000..91fda9c706 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mixed.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mixed.png new file mode 100644 index 0000000000..8684eb7359 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mixed.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-pepper.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-pepper.png new file mode 100644 index 0000000000..5c6790f872 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-pepper.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-salt.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-salt.png new file mode 100644 index 0000000000..aa9c7f674a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-salt.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-solid-1.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-solid-1.png new file mode 100644 index 0000000000..5d78b69ec7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-solid-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-solid-2.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-solid-2.png new file mode 100644 index 0000000000..641a140e8d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-solid-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-soysauce.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-soysauce.png new file mode 100644 index 0000000000..7750d4f61d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-soysauce.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-sugar.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-sugar.png new file mode 100644 index 0000000000..75b5d526ab Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-sugar.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trans-1.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trans-1.png new file mode 100644 index 0000000000..82db9f827e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trans-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trans-2.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trans-2.png new file mode 100644 index 0000000000..834a1e3f16 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trans-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trash.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trash.png new file mode 100644 index 0000000000..00262668e8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-empty.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-empty.png new file mode 100644 index 0000000000..a120ece8c1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-pepper.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-pepper.png new file mode 100644 index 0000000000..2c11f860e3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-pepper.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-salt.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-salt.png new file mode 100644 index 0000000000..72dda4a246 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/shaker-salt.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/cookie!!!.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cookie!!!.rsi/icon.png deleted file mode 100644 index 9b51181a95..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cookie!!!.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cookie!!!.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cookie!!!.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cookie!!!.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/cracker.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cracker.rsi/icon.png deleted file mode 100644 index 5c5d84b4d4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cracker.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cracker.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cracker.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cracker.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/icon.png deleted file mode 100644 index 4f90c75a68..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/creamcheesebread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/creamcheesebreadslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/creamcheesebreadslice.rsi/icon.png deleted file mode 100644 index 25b96ea1c8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/creamcheesebreadslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/creamcheesebreadslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/creamcheesebreadslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/creamcheesebreadslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/creampie.png b/Resources/Textures/Objects/Consumable/Food/creampie.png deleted file mode 100644 index e6da814d4d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/creampie.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cubancarp.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/cubancarp.rsi/icon.png deleted file mode 100644 index 387d28d99e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/cubancarp.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/cubancarp.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/cubancarp.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/cubancarp.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/dionaroast.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/dionaroast.rsi/icon.png deleted file mode 100644 index aec6333a3a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/dionaroast.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/dionaroast.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/dionaroast.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/dionaroast.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/donkpocket.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/donkpocket.rsi/icon.png deleted file mode 100644 index 7eafe8f9a6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/donkpocket.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/donkpocket.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/donkpocket.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/donut1.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/donut1.rsi/icon.png deleted file mode 100644 index 232db8f4c2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/donut1.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/donut1.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/donut1.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/donut1.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/donut2.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/donut2.rsi/icon.png deleted file mode 100644 index 12052eea47..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/donut2.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/donut2.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/donut2.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/donut2.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-green.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-green.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/inhand-left.png deleted file mode 100644 index e8641f9bb7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/inhand-right.png deleted file mode 100644 index 1f728c63a0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-red.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-red.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/egg.png b/Resources/Textures/Objects/Consumable/Food/egg.png deleted file mode 100644 index 03829c56ff..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/egg.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/blue-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/blue-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/blue-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/blue-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/blue.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-blue.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/blue.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-closed.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-closed.png new file mode 100644 index 0000000000..0f0bb28a30 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-closed.png differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/box-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/box-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-open.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-open.png new file mode 100644 index 0000000000..3c3ab0e789 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box1.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box1.png new file mode 100644 index 0000000000..1cde5cc76f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box10.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box10.png new file mode 100644 index 0000000000..ce67060162 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box10.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box11.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box11.png new file mode 100644 index 0000000000..c5ff1edca6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box11.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box12.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box12.png new file mode 100644 index 0000000000..4d2190364f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box12.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box2.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box2.png new file mode 100644 index 0000000000..23c1d74d06 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box3.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box3.png new file mode 100644 index 0000000000..b63c85e038 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box4.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box4.png new file mode 100644 index 0000000000..bf11d5437e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box5.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box5.png new file mode 100644 index 0000000000..9d3cecb94e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box6.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box6.png new file mode 100644 index 0000000000..dac5f83027 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box7.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box7.png new file mode 100644 index 0000000000..31b566b564 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box7.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box8.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box8.png new file mode 100644 index 0000000000..9acb49d13e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box8.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/box9.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box9.png new file mode 100644 index 0000000000..1296dd8d23 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/box9.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-0.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-0.png new file mode 100644 index 0000000000..39dcf61442 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-0.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-1.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-1.png new file mode 100644 index 0000000000..1b6db27177 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-2.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-2.png new file mode 100644 index 0000000000..31451342b7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-3.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-3.png new file mode 100644 index 0000000000..39991a7be2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/egg-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/eggshells.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/eggshells.png new file mode 100644 index 0000000000..622b5a3de8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/egg.rsi/eggshells.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/egg-green.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/green-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-green.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/green-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-green.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/green-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-green.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/green-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-green.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/green.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-green.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/green.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/egg.rsi/meta.json index 6b3193ec36..f1101d1b1e 100644 --- a/Resources/Textures/Objects/Consumable/Food/egg.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/egg.rsi/meta.json @@ -1,50 +1,167 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [ + { + "name": "blue" + }, + { + "name": "blue-inhand-right", + "directions": 4 + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "box1" + }, + { + "name": "box2" + }, + { + "name": "box3" + }, + { + "name": "box4" + }, + { + "name": "box5" + }, + { + "name": "box6" + }, + { + "name": "box7" + }, + { + "name": "box8" + }, + { + "name": "box9" + }, + { + "name": "box10" + }, + { + "name": "box11" + }, + { + "name": "box12" + }, + { + "name": "box-closed" + }, + { + "name": "box-open" + }, + { + "name": "box-inhand-right", + "directions": 4 + }, + { + "name": "box-inhand-left", + "directions": 4 + }, + { + "name": "eggshells" + }, + { + "name": "green" + }, + { + "name": "green-inhand-right", + "directions": 4 + }, + { + "name": "green-inhand-left", + "directions": 4 + }, { "name": "icon" }, + { + "name": "white" + }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 + }, + { + "name": "orange" + }, + { + "name": "orange-inhand-right", + "directions": 4 + }, + { + "name": "orange-inhand-left", + "directions": 4 + }, + { + "name": "purple" + }, + { + "name": "purple-inhand-right", + "directions": 4 + }, + { + "name": "purple-inhand-left", + "directions": 4 + }, + { + "name": "rainbow" + }, + { + "name": "rainbow-inhand-right", + "directions": 4 + }, + { + "name": "rainbow-inhand-left", + "directions": 4 + }, + { + "name": "red" + }, + { + "name": "red-inhand-right", + "directions": 4 + }, + { + "name": "red-inhand-left", + "directions": 4 + }, + { + "name": "egg-0" + }, + { + "name": "egg-1" + }, + { + "name": "egg-2" + }, + { + "name": "egg-3" + }, + { + "name": "yellow" + }, + { + "name": "yellow-inhand-right", + "directions": 4 + }, + { + "name": "yellow-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/orange-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/orange-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/orange-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/orange-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/orange.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-orange.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/orange.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/purple-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/purple-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/purple-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/purple-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/purple.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-purple.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/purple.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/rainbow-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/rainbow-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/rainbow-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/rainbow-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/rainbow.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-rainbow.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/rainbow.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-red.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/red-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-red.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/red-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-red.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/red-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-red.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/red-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-red.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/red.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-red.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/red.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/white.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-mime.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/white.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/yellow-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/yellow-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/yellow-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/yellow-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/egg.rsi/yellow.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/egg-yellow.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/egg.rsi/yellow.png diff --git a/Resources/Textures/Objects/Consumable/Food/eggplantparm.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/eggplantparm.rsi/icon.png deleted file mode 100644 index 435619a932..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/eggplantparm.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/eggplantparm.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/eggplantparm.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/eggplantparm.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/emptycondiment.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/emptycondiment.rsi/icon.png deleted file mode 100644 index a0d828c1fa..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/emptycondiment.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/emptycondiment.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/emptycondiment.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/emptycondiment.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/emptypizzabox.png b/Resources/Textures/Objects/Consumable/Food/emptypizzabox.png deleted file mode 100644 index d344bfd735..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/emptypizzabox.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/emptyusedpizzabox.png b/Resources/Textures/Objects/Consumable/Food/emptyusedpizzabox.png deleted file mode 100644 index d19fb07c3d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/emptyusedpizzabox.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/enchiladas.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/enchiladas.rsi/icon.png deleted file mode 100644 index 4effa4ba23..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/enchiladas.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/enchiladas.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/enchiladas.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/enchiladas.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/enchiladasold.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/enchiladasold.rsi/icon.png deleted file mode 100644 index d839f83237..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/enchiladasold.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/enchiladasold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/enchiladasold.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/enchiladasold.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/enzyme.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/enzyme.rsi/icon.png deleted file mode 100644 index 7e1a9c098e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/enzyme.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/enzyme.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/enzyme.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/enzyme.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/faggot.png b/Resources/Textures/Objects/Consumable/Food/faggot.png deleted file mode 100644 index 51eae6691e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/faggot.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fishandchips.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/fishandchips.rsi/icon.png deleted file mode 100644 index 92fa3e1a1b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fishandchips.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fishandchips.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/fishandchips.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/fishandchips.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/icon.png deleted file mode 100644 index c798c98c89..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/fishburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/fishfillet.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/fishfillet.rsi/icon.png deleted file mode 100644 index b2391770aa..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fishfillet.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fishfillet.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/fishfillet.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/fishfillet.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/fishfingers.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/fishfingers.rsi/icon.png deleted file mode 100644 index 140f6b1666..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fishfingers.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fishfingers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/fishfingers.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/fishfingers.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/flour.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/flour.rsi/icon.png deleted file mode 100644 index f7cfd516ab..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/flour.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/flour.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/flour.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/flour.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/flourbag.png b/Resources/Textures/Objects/Consumable/Food/flourbag.png deleted file mode 100644 index 0051992d4d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/flourbag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fortune_cookie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/fortune_cookie.rsi/icon.png deleted file mode 100644 index d604eb60a6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fortune_cookie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fortune_cookie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/fortune_cookie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/fortune_cookie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/friedegg.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/friedegg.rsi/icon.png deleted file mode 100644 index c660f38740..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/friedegg.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/friedegg.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/friedegg.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/friedegg.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/fries.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/fries.rsi/icon.png deleted file mode 100644 index 472251bdba..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/fries.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/fries.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/fries.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/fries.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/frosteddonut.png b/Resources/Textures/Objects/Consumable/Food/frosteddonut.png deleted file mode 100644 index 9902357801..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/frosteddonut.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/alpha-filling.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/alpha-filling.png new file mode 100644 index 0000000000..bd332f6422 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/alpha-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/berry.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/berry.png new file mode 100644 index 0000000000..1ad610e90d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/berry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/clown.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/clown.png new file mode 100644 index 0000000000..6d74460ed1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cone-trash.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cone-trash.png new file mode 100644 index 0000000000..c15a7a329a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cone-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cone.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cone.png new file mode 100644 index 0000000000..3e9b6be7bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cone.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cornuto.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cornuto.png new file mode 100644 index 0000000000..0d6f067138 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/cornuto.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/fruitsalad.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/fruitsalad.png new file mode 100644 index 0000000000..69bcaac1ea Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/fruitsalad.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo.png new file mode 100644 index 0000000000..92ca6f8122 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo1.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo1.png new file mode 100644 index 0000000000..403f3333b0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo2.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo2.png new file mode 100644 index 0000000000..ffc8cd6c53 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo3.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo3.png new file mode 100644 index 0000000000..a59bca1e96 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/jumbo3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/meta.json new file mode 100644 index 0000000000..38f056fed4 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/meta.json @@ -0,0 +1,104 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cornuto" + }, + { + "name": "sandwich" + }, + { + "name": "sandwich-strawberry" + }, + { + "name": "spacefreezy" + }, + { + "name": "sundae" + }, + { + "name": "alpha-filling" + }, + { + "name": "berry" + }, + { + "name": "clown" + }, + { + "name": "cone" + }, + { + "name": "cone-trash" + }, + { + "name": "fruitsalad" + }, + { + "name": "mime" + }, + { + "name": "rainbow" + }, + { + "name": "jumbo" + }, + { + "name": "jumbo1" + }, + { + "name": "jumbo2" + }, + { + "name": "jumbo3" + }, + { + "name": "nogga" + }, + { + "name": "nogga1" + }, + { + "name": "nogga2" + }, + { + "name": "nogga3" + }, + { + "name": "stick" + }, + { + "name": "stick2" + }, + { + "name": "popsicle-base" + }, + { + "name": "popsicle-base1" + }, + { + "name": "popsicle-base2" + }, + { + "name": "popsicle-base3" + }, + { + "name": "popsicle" + }, + { + "name": "popsicle1" + }, + { + "name": "popsicle2" + }, + { + "name": "popsicle3" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/mime.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/mime.png new file mode 100644 index 0000000000..09e4e0cf09 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/mime.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga.png new file mode 100644 index 0000000000..5553bbf95e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga1.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga1.png new file mode 100644 index 0000000000..1c2bf264c2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga2.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga2.png new file mode 100644 index 0000000000..22500bc614 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga3.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga3.png new file mode 100644 index 0000000000..1974e17fb3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base.png new file mode 100644 index 0000000000..ee7e6fd308 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base1.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base1.png new file mode 100644 index 0000000000..525d570a92 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base2.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base2.png new file mode 100644 index 0000000000..f1c05abb05 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base3.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base3.png new file mode 100644 index 0000000000..faf88a38a1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle-base3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle.png new file mode 100644 index 0000000000..15837f002a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle1.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle1.png new file mode 100644 index 0000000000..bf8c4ca322 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle2.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle2.png new file mode 100644 index 0000000000..280d8c8113 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle3.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle3.png new file mode 100644 index 0000000000..86eb98c4d9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/popsicle3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/rainbow.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/rainbow.png new file mode 100644 index 0000000000..06e061101e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/rainbow.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sandwich-strawberry.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sandwich-strawberry.png new file mode 100644 index 0000000000..ded374964f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sandwich-strawberry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sandwich.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sandwich.png new file mode 100644 index 0000000000..5b852e961a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sandwich.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/spacefreezy.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/spacefreezy.png new file mode 100644 index 0000000000..b293a37407 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/spacefreezy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/stick.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/stick.png new file mode 100644 index 0000000000..97dd0773bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/stick.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/stick2.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/stick2.png new file mode 100644 index 0000000000..2ebf777883 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/stick2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sundae.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sundae.png new file mode 100644 index 0000000000..0a5b911907 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/sundae.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/gappletart.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/gappletart.rsi/icon.png deleted file mode 100644 index a728ebd498..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/gappletart.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/gappletart.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/gappletart.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/gappletart.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/hburger.rsi/icon.png deleted file mode 100644 index 3b0f7badb6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/hburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/hburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/hburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/hburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/herbsalad.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/herbsalad.rsi/icon.png deleted file mode 100644 index b3e41c1d39..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/herbsalad.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/herbsalad.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/herbsalad.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/herbsalad.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/honeycomb.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/honeycomb.rsi/icon.png deleted file mode 100644 index b958f1eb84..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/honeycomb.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/honeycomb.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/honeycomb.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/honeycomb.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/hotchili.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/hotchili.rsi/icon.png deleted file mode 100644 index 8d8663aaeb..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/hotchili.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/hotchili.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/hotchili.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/hotchili.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/hotdog.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/hotdog.rsi/icon.png deleted file mode 100644 index 271f4838c6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/hotdog.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/hotdog.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/hotdog.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/hotdog.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/hotsauce.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/hotsauce.rsi/icon.png deleted file mode 100644 index a3c2aa5477..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/hotsauce.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/hotsauce.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/hotsauce.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/hotsauce.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/hugemushroomslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/hugemushroomslice.rsi/icon.png deleted file mode 100644 index 9ba43570c1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/hugemushroomslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/hugemushroomslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/hugemushroomslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/hugemushroomslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/badrecipe.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/badrecipe.png new file mode 100644 index 0000000000..a00482f081 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/badrecipe.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter.png new file mode 100644 index 0000000000..a867544725 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png new file mode 100644 index 0000000000..688ced7b62 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cakebatter.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cheesewedge.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cheesewedge.png new file mode 100644 index 0000000000..89abd85257 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cheesewedge.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cheesewheel.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cheesewheel.png new file mode 100644 index 0000000000..2793eff027 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cheesewheel.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png new file mode 100644 index 0000000000..44aaef5444 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-flat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png new file mode 100644 index 0000000000..4bb7e80041 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry-baked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png new file mode 100644 index 0000000000..0cecdc5ce6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pastry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png new file mode 100644 index 0000000000..e113678090 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-pie.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png new file mode 100644 index 0000000000..3074032158 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png new file mode 100644 index 0000000000..258a9e6c6a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big.png new file mode 100644 index 0000000000..1cf2178f75 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-small.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-small.png new file mode 100644 index 0000000000..b2f134acfb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-small.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo.png new file mode 100644 index 0000000000..f6f88702a1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json new file mode 100644 index 0000000000..cd099532ca --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -0,0 +1,89 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "badrecipe" + }, + { + "name": "butter" + }, + { + "name": "cakebatter" + }, + { + "name": "cheesewedge" + }, + { + "name": "cheesewheel" + }, + { + "name": "dough" + }, + { + "name": "dough-pastry" + }, + { + "name": "dough-pastry-baked" + }, + { + "name": "dough-pie" + }, + { + "name": "dough-flat" + }, + { + "name": "dough-slice" + }, + { + "name": "flour-big" + }, + { + "name": "flour-small" + }, + { + "name": "mayo" + }, + { + "name": "milk" + }, + { + "name": "milk-soy" + }, + { + "name": "milk-oat" + }, + { + "name": "oliveoil" + }, + { + "name": "pizzabread" + }, + { + "name": "rice-big" + }, + { + "name": "rice-small" + }, + { + "name": "soylent-green" + }, + { + "name": "soylent-yellow" + }, + { + "name": "spice" + }, + { + "name": "sugar-big" + }, + { + "name": "sugar-small" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-oat.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-oat.png new file mode 100644 index 0000000000..5802c6c82d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-oat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png new file mode 100644 index 0000000000..b36cc5c740 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png new file mode 100644 index 0000000000..f6be66ead1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil.png new file mode 100644 index 0000000000..c828e19053 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png new file mode 100644 index 0000000000..6c31b75117 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/pizzabread.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png new file mode 100644 index 0000000000..7a89c3361b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-small.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-small.png new file mode 100644 index 0000000000..f0dfb78496 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-small.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-green.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-green.png new file mode 100644 index 0000000000..0376f183f7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-green.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-yellow.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-yellow.png new file mode 100644 index 0000000000..e0f1268e4c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-yellow.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/spice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/spice.png new file mode 100644 index 0000000000..727582efd6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/spice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png new file mode 100644 index 0000000000..fc467656be Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-small.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-small.png new file mode 100644 index 0000000000..5e8849d86a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-small.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/jdonut1.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/jdonut1.rsi/icon.png deleted file mode 100644 index 1d3d321a67..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/jdonut1.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/jdonut1.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/jdonut1.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/jdonut1.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/jdonut2.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/jdonut2.rsi/icon.png deleted file mode 100644 index dc60647651..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/jdonut2.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/jdonut2.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/jdonut2.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/jdonut2.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/icon.png deleted file mode 100644 index 5e35240ffe..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/jellyburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/jellysandwich.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/jellysandwich.rsi/icon.png deleted file mode 100644 index 611a3a5847..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/jellysandwich.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/jellysandwich.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/jellysandwich.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/jellysandwich.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/jellytoast.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/jellytoast.rsi/icon.png deleted file mode 100644 index 59afaad5a9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/jellytoast.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/jellytoast.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/jellytoast.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/jellytoast.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/kabob.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/kabob.rsi/icon.png deleted file mode 100644 index c9baf5215b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/kabob.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/kabob.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/kabob.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/kabob.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/ketchup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/ketchup.rsi/icon.png deleted file mode 100644 index ff7f287fcc..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/ketchup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/ketchup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ketchup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/ketchup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/ketchupold.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/ketchupold.rsi/icon.png deleted file mode 100644 index d6ef5f7153..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/ketchupold.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/ketchupold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ketchupold.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/ketchupold.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/icon.png deleted file mode 100644 index dcfb928178..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/lemoncake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/lemoncake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/lemoncake_slice.rsi/icon.png deleted file mode 100644 index 9995115999..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/lemoncake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/lemoncake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/lemoncake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/lemoncake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/limecake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/limecake.rsi/icon.png deleted file mode 100644 index 2bbbd550e4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/limecake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/limecake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/limecake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/limecake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/limecake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/limecake_slice.rsi/icon.png deleted file mode 100644 index 7b4f9671f0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/limecake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/limecake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/limecake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/limecake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/liquidfood.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/liquidfood.rsi/icon.png deleted file mode 100644 index b73ae9e521..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/liquidfood.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/liquidfood.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/liquidfood.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/liquidfood.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/loadedbakedpotato.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/loadedbakedpotato.rsi/icon.png deleted file mode 100644 index a5cd17d512..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/loadedbakedpotato.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/loadedbakedpotato.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/loadedbakedpotato.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/loadedbakedpotato.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/bearsteak.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/bearsteak.png new file mode 100644 index 0000000000..6906fb408d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/bearsteak.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/benedict.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/benedict.png new file mode 100644 index 0000000000..cd96849cdb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/benedict.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterbiscuit.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterbiscuit.png new file mode 100644 index 0000000000..fe06122bf9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterbiscuit.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterdog.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterdog.png new file mode 100644 index 0000000000..082cd1496b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterdog.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/butteronastick.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butteronastick.png new file mode 100644 index 0000000000..a102602c40 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butteronastick.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/cornedbeef.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/cornedbeef.png new file mode 100644 index 0000000000..f47c40819b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/cornedbeef.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/cubancarp.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/cubancarp.png new file mode 100644 index 0000000000..f5a57b1d8d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/cubancarp.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/eggplantparm.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/eggplantparm.png new file mode 100644 index 0000000000..3e40b41363 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/eggplantparm.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/enchiladas.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/enchiladas.png new file mode 100644 index 0000000000..5aecd7e4e2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/enchiladas.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishandchips.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishandchips.png new file mode 100644 index 0000000000..6919be0fcc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishandchips.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishfry.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishfry.png new file mode 100644 index 0000000000..bf1975cdf0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishfry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/friedegg.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/friedegg.png new file mode 100644 index 0000000000..c9b16c6e36 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/friedegg.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-carrot.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-carrot.png new file mode 100644 index 0000000000..cfb5ed8e99 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-carrot.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-cheesy.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-cheesy.png new file mode 100644 index 0000000000..6745a5a7f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-cheesy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-parsnip.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-parsnip.png new file mode 100644 index 0000000000..9fe88f6aae Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-parsnip.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries.png new file mode 100644 index 0000000000..e2ed952cd1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/hotdog.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/hotdog.png new file mode 100644 index 0000000000..3e54bfa0d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/hotdog.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/lasagna.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/lasagna.png new file mode 100644 index 0000000000..198d1d6fec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/lasagna.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/loadedbakedpotato.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/loadedbakedpotato.png new file mode 100644 index 0000000000..4279826c8e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/loadedbakedpotato.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/memoryleek.rsi/memoryLeek.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/memoryLeek.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/memoryleek.rsi/memoryLeek.png rename to Resources/Textures/Objects/Consumable/Food/meals.rsi/memoryLeek.png diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json new file mode 100644 index 0000000000..d36390ab10 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -0,0 +1,130 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bearsteak", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "benedict" + }, + { + "name": "butterbiscuit" + }, + { + "name": "butterdog" + }, + { + "name": "butteronastick" + }, + { + "name": "cornedbeef" + }, + { + "name": "cubancarp" + }, + { + "name": "eggplantparm" + }, + { + "name": "enchiladas" + }, + { + "name": "fishandchips" + }, + { + "name": "fishfry" + }, + { + "name": "friedegg" + }, + { + "name": "fries" + }, + { + "name": "fries-carrot" + }, + { + "name": "fries-cheesy" + }, + { + "name": "fries-parsnip" + }, + { + "name": "hotdog" + }, + { + "name": "lasagna" + }, + { + "name": "loadedbakedpotato" + }, + { + "name": "ribs" + }, + { + "name": "memoryLeek", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "milkape" + }, + { + "name": "mint" + }, + { + "name": "nachos" + }, + { + "name": "nachos-cheesy" + }, + { + "name": "nachos-cuban" + }, + { + "name": "omelette" + }, + { + "name": "pigblanket" + }, + { + "name": "poutine" + }, + { + "name": "sashimi" + }, + { + "name": "saltysweet" + }, + { + "name": "soydope" + }, + { + "name": "stewedsoymeat" + }, + { + "name": "yakiimo" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/milkape.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/milkape.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/milkape.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/meals.rsi/milkape.png diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/mint.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/mint.png new file mode 100644 index 0000000000..924ed72367 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/mint.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos-cheesy.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos-cheesy.png new file mode 100644 index 0000000000..7d6124f454 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos-cheesy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos-cuban.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos-cuban.png new file mode 100644 index 0000000000..9a0d0225c1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos-cuban.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos.png new file mode 100644 index 0000000000..9cfae81964 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/nachos.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/omelette.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/omelette.png new file mode 100644 index 0000000000..657a4b940f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/omelette.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/pigblanket.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/pigblanket.png new file mode 100644 index 0000000000..110c69d650 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/pigblanket.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/poutine.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/poutine.png new file mode 100644 index 0000000000..b19ffc30b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/poutine.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/ribs.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/ribs.png new file mode 100644 index 0000000000..1503fb4ad5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/ribs.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/stew.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/saltysweet.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/stew.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/meals.rsi/saltysweet.png diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/sashimi.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/sashimi.png new file mode 100644 index 0000000000..1af06293cb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/sashimi.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/soydope.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/soydope.png new file mode 100644 index 0000000000..3bbc182317 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/soydope.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/stewedsoymeat.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/stewedsoymeat.png new file mode 100644 index 0000000000..13c1ffc115 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/stewedsoymeat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/yakiimo.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/yakiimo.png new file mode 100644 index 0000000000..60227b87e9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/yakiimo.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/alpha.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/alpha.png new file mode 100644 index 0000000000..46a29fe6c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/alpha.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon-cooked.png new file mode 100644 index 0000000000..0a13c65d3f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon.png new file mode 100644 index 0000000000..bf5ddb2259 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon2-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon2-cooked.png new file mode 100644 index 0000000000..54b9c0e3d2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon2-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon2.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon2.png new file mode 100644 index 0000000000..f091f132ce Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bacon2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/bear.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bear.png new file mode 100644 index 0000000000..668b244b1a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bear.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/bird-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bird-cooked.png new file mode 100644 index 0000000000..08af30dfe8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bird-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/bird.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bird.png new file mode 100644 index 0000000000..4ff20ab9ed Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/bird.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/chicken-fried.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/chicken-fried.png new file mode 100644 index 0000000000..4fd0399d0d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/chicken-fried.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/chicken2-fried.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/chicken2-fried.png new file mode 100644 index 0000000000..65954b31f1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/chicken2-fried.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/clown.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/clown.png new file mode 100644 index 0000000000..a86f55c406 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/clump.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/clump.png new file mode 100644 index 0000000000..ac75d45331 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/clump.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-cooked.png new file mode 100644 index 0000000000..d71a3a8a27 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-rangoon.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-rangoon.png new file mode 100644 index 0000000000..5171bbd737 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-rangoon.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab.png new file mode 100644 index 0000000000..fa3da7562e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet-alpha.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet-alpha.png new file mode 100644 index 0000000000..7fc9e782a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet-alpha.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet-cooked.png new file mode 100644 index 0000000000..d4a72dc681 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet.png new file mode 100644 index 0000000000..ee17f13070 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/cutlet.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/fish.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/fish.png new file mode 100644 index 0000000000..45153a62da Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/fish.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/golem.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/golem.png new file mode 100644 index 0000000000..9b18c60320 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/golem.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/goliath-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/goliath-cooked.png new file mode 100644 index 0000000000..5a5d253868 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/goliath-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/goliath.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/goliath.png new file mode 100644 index 0000000000..a09b038cdd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/goliath.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/icon.png deleted file mode 100644 index 58509e4be5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meat.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-cooked.png new file mode 100644 index 0000000000..31f45dcf2f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-tail.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-tail.png new file mode 100644 index 0000000000..3d63372e71 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-tail.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard.png new file mode 100644 index 0000000000..8fc8c91737 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball-cooked.png new file mode 100644 index 0000000000..c6b99ea003 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatball.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/meatball.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/meatball.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/meatball.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball.png new file mode 100644 index 0000000000..b181bcf00d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meatball.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json index b6a9d8c6c4..5a0068e69e 100644 --- a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json @@ -1 +1,169 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alpha" + }, + { + "name": "bacon" + }, + { + "name": "bacon2" + }, + { + "name": "bacon-cooked" + }, + { + "name": "bacon2-cooked" + }, + { + "name": "bear" + }, + { + "name": "bird" + }, + { + "name": "bird-cooked" + }, + { + "name": "clump" + }, + { + "name": "chicken-fried" + }, + { + "name": "chicken2-fried" + }, + { + "name": "clown" + }, + { + "name": "crab" + }, + { + "name": "crab-cooked" + }, + { + "name": "crab-rangoon" + }, + { + "name": "cutlet" + }, + { + "name": "cutlet-alpha" + }, + { + "name": "cutlet-cooked" + }, + { + "name": "meatball" + }, + { + "name": "meatball-cooked" + }, + { + "name": "meatball-inhand-right", + "directions": 4 + }, + { + "name": "meatball-inhand-left", + "directions": 4 + }, + { + "name": "fish" + }, + { + "name": "golem" + }, + { + "name": "goliath" + }, + { + "name": "goliath-cooked" + }, + { + "name": "lizard" + }, + { + "name": "lizard-cooked" + }, + { + "name": "lizard-tail" + }, + { + "name": "plate-meat" + }, + { + "name": "plain" + }, + { + "name": "plain-cooked" + }, + { + "name": "plant" + }, + { + "name": "product" + }, + { + "name": "product-cooked" + }, + { + "name": "rotten", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "salami" + }, + { + "name": "salami-slice" + }, + { + "name": "sausage" + }, + { + "name": "spider" + }, + { + "name": "spiderleg" + }, + { + "name": "spiderleg-cooked" + }, + { + "name": "tomato" + }, + { + "name": "xeno" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/plain-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plain-cooked.png new file mode 100644 index 0000000000..21fbe98978 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plain-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plain.png new file mode 100644 index 0000000000..9303217d28 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/plant.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plant.png new file mode 100644 index 0000000000..e80bf13617 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plant.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/plate-meat.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plate-meat.png new file mode 100644 index 0000000000..7934423ee0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plate-meat.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/product-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/product-cooked.png new file mode 100644 index 0000000000..44d6f9319e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/product-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/product.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/product.png new file mode 100644 index 0000000000..f9c1b88902 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/product.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/rotten.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/rotten.png new file mode 100644 index 0000000000..da12a30d77 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/rotten.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/salami-slice.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/salami-slice.png new file mode 100644 index 0000000000..db2629bdfa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/salami-slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/salami.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/salami.png new file mode 100644 index 0000000000..aca1f35739 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/salami.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/sausage.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/sausage.png new file mode 100644 index 0000000000..09fa2462a9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/sausage.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/spider.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spider.png new file mode 100644 index 0000000000..c1441a7974 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spider.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/spiderleg-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spiderleg-cooked.png new file mode 100644 index 0000000000..bb163f1dbe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spiderleg-cooked.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/spiderleg.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spiderleg.png new file mode 100644 index 0000000000..e8d3aaf1c8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/spiderleg.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/tomato.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/tomato.png new file mode 100644 index 0000000000..72242699f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/tomato.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/xeno.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xeno.png new file mode 100644 index 0000000000..74cd9327cd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meat.rsi/xeno.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat_pizza_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meat_pizza_slice.rsi/icon.png deleted file mode 100644 index 687d9112f0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meat_pizza_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meat_pizza_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat_pizza_slice.rsi/meta.json deleted file mode 100644 index 2d0d580e61..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meat_pizza_slice.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatball.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatball.rsi/icon.png deleted file mode 100644 index 44e2e8cb28..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatball.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatball.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatball.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatball.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/meatballsoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatballsoup.rsi/icon.png deleted file mode 100644 index 1b6c7138f2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatballsoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatballsoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatballsoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatballsoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatballspaghetti.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatballspaghetti.rsi/icon.png deleted file mode 100644 index 6fcfefb0d5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatballspaghetti.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatballspaghetti.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatballspaghetti.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatballspaghetti.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatbread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatbread.rsi/icon.png deleted file mode 100644 index b79466691a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatbread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatbread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatbread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatbread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatbreadslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatbreadslice.rsi/icon.png deleted file mode 100644 index d77eeb8877..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatbreadslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatbreadslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatbreadslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatbreadslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatpie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatpie.rsi/icon.png deleted file mode 100644 index c1032309ae..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatpie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatpie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatpie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatpie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatpizza.png b/Resources/Textures/Objects/Consumable/Food/meatpizza.png deleted file mode 100644 index e3e90b84c7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatpizza.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/icon.png deleted file mode 100644 index 4ce070396b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatpizza.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.png b/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.png deleted file mode 100644 index 4dae2ccdee..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.rsi/icon.png deleted file mode 100644 index 687d9112f0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatpizzaslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/meatsteak.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/meatsteak.rsi/icon.png deleted file mode 100644 index 5f84bae288..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/meatsteak.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/meatsteak.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meatsteak.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/meatsteak.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/memoryleek.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/memoryleek.rsi/meta.json deleted file mode 100644 index 108239cfdc..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/memoryleek.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA 3.0", - "copyright": "Yeeye", - "states": [ - { - "name": "memoryLeek", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/milk.png b/Resources/Textures/Objects/Consumable/Food/milk.png deleted file mode 100644 index d51219b3da..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/milk.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/milkape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/milkape.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/milkape.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/milosoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/milosoup.rsi/icon.png deleted file mode 100644 index 006e085724..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/milosoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/milosoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/milosoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/milosoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/icon.png deleted file mode 100644 index 15a9c7eff7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/inhand-left.png deleted file mode 100644 index 3db2175335..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/inhand-right.png deleted file mode 100644 index 40d4fbc83e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mimeburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/mint.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mint.rsi/icon.png deleted file mode 100644 index 88b72910be..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mint.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mint.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mint.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mint.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/mixedcondiments.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mixedcondiments.rsi/icon.png deleted file mode 100644 index 292f33a7c5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mixedcondiments.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mixedcondiments.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mixedcondiments.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mixedcondiments.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/monkeycube.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/monkeycube.rsi/icon.png deleted file mode 100644 index da74f36927..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/monkeycube.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/monkeycube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/monkeycube.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/monkeycube.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/monkeysdelight.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/monkeysdelight.rsi/icon.png deleted file mode 100644 index beda019a1b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/monkeysdelight.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/monkeysdelight.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/monkeysdelight.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/monkeysdelight.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-closed.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-closed.png new file mode 100644 index 0000000000..19b00bb0d1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-trash.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-trash.png new file mode 100644 index 0000000000..9a2d989b36 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box1.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box1.png new file mode 100644 index 0000000000..aca69bf06a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box2.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box2.png new file mode 100644 index 0000000000..47db42ac75 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box3.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box3.png new file mode 100644 index 0000000000..3ae750382c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box4.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box4.png new file mode 100644 index 0000000000..112ed2c015 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box5.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box5.png new file mode 100644 index 0000000000..3c2f234a64 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy-open.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy-open.png new file mode 100644 index 0000000000..48b953ee44 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy.png new file mode 100644 index 0000000000..3c398673c9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker-dip.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker-dip.png new file mode 100644 index 0000000000..14846b7a04 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker-dip.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker.png new file mode 100644 index 0000000000..b821d56b76 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-closed.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-closed.png new file mode 100644 index 0000000000..909147cc6a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-open.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-open.png new file mode 100644 index 0000000000..70d56114b8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json new file mode 100644 index 0000000000..2dd2de560a --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json @@ -0,0 +1,100 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box1" + }, + { + "name": "box2" + }, + { + "name": "box3" + }, + { + "name": "box4" + }, + { + "name": "box5" + }, + { + "name": "box-trash" + }, + { + "name": "tin-closed" + }, + { + "name": "tin-hot", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "tin-open" + }, + { + "name": "tin-trash" + }, + { + "name": "candy" + }, + { + "name": "candy-open" + }, + { + "name": "cracker" + }, + { + "name": "cracker-dip", + "delays": [ + [ + 0.6, + 0.6, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "erp-closed" + }, + { + "name": "erp-open" + }, + { + "name": "mre-closed" + }, + { + "name": "mre-hot", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "mre-open" + }, + { + "name": "paste" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-closed.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-closed.png new file mode 100644 index 0000000000..66d37db21e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-hot.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-hot.png new file mode 100644 index 0000000000..2a5437c826 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-hot.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-open.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-open.png new file mode 100644 index 0000000000..701c46970b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/paste.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/paste.png new file mode 100644 index 0000000000..0853648f1b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/paste.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-closed.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-closed.png new file mode 100644 index 0000000000..7bea18955a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-hot.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-hot.png new file mode 100644 index 0000000000..6a3eba2314 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-hot.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-open.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-open.png new file mode 100644 index 0000000000..740c9f18b1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-trash.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-trash.png new file mode 100644 index 0000000000..a653b1f66e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/mre.rsi/tin-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/mtearp.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mtearp.rsi/icon.png deleted file mode 100644 index aab6af6eee..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mtearp.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mtearp.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mtearp.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mtearp.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/muffin.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/muffin.rsi/icon.png deleted file mode 100644 index 96fb8c1b1a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/muffin.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/muffin.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/muffin.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/muffin.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/icon.png deleted file mode 100644 index 939950a32a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mushroompizza.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/mushroompizzaslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mushroompizzaslice.rsi/icon.png deleted file mode 100644 index b68afb1120..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mushroompizzaslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mushroompizzaslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mushroompizzaslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mushroompizzaslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/mushroomsoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mushroomsoup.rsi/icon.png deleted file mode 100644 index fb8b15404a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mushroomsoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mushroomsoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mushroomsoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mushroomsoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/mysterysoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/mysterysoup.rsi/icon.png deleted file mode 100644 index 1daca9525b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/mysterysoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mysterysoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mysterysoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/mysterysoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/nettlesoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/nettlesoup.rsi/icon.png deleted file mode 100644 index 7ba2eb7e15..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/nettlesoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/nettlesoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/nettlesoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/nettlesoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/alpha-filling.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/alpha-filling.png new file mode 100644 index 0000000000..dfb50a1ce8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/alpha-filling.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/boiled.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/boiled.png new file mode 100644 index 0000000000..9e96eb123a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/boiled.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/butter.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/butter.png new file mode 100644 index 0000000000..185564cd6c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/butter.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/chowmein.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/chowmein.png new file mode 100644 index 0000000000..b15597ff22 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/chowmein.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/copypasta.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/copypasta.png new file mode 100644 index 0000000000..d4c8beab49 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/copypasta.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/meatball.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/meatball.png new file mode 100644 index 0000000000..9d8fe2a99e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/meatball.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/meta.json new file mode 100644 index 0000000000..28ab5723a4 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/meta.json @@ -0,0 +1,54 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "butter" + }, + { + "name": "chowmein" + }, + { + "name": "copypasta", + "delays": [ + [ + 0.5, + 0.2, + 0.2, + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "meatball" + }, + { + "name": "tomato" + }, + { + "name": "packet" + }, + { + "name": "boiled" + }, + { + "name": "alpha-filling" + }, + { + "name": "spesslaw" + }, + { + "name": "plate" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/packet.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/packet.png new file mode 100644 index 0000000000..1fd0f2c3e3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/packet.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/plate.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/plate.png new file mode 100644 index 0000000000..68465ac43b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/plate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/spesslaw.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/spesslaw.png new file mode 100644 index 0000000000..6a0c418705 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/spesslaw.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/noodles.rsi/tomato.png b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/tomato.png new file mode 100644 index 0000000000..4f962bdec8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/noodles.rsi/tomato.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/oliveoil.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/oliveoil.rsi/icon.png deleted file mode 100644 index ca6b233b76..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/oliveoil.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/oliveoil.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/oliveoil.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/oliveoil.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/omelette.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/omelette.rsi/icon.png deleted file mode 100644 index adb11cb2d2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/omelette.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/omelette.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/omelette.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/omelette.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/orangecake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/orangecake.rsi/icon.png deleted file mode 100644 index bf0c25877a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/orangecake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/orangecake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/orangecake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/orangecake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/orangecake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/orangecake_slice.rsi/icon.png deleted file mode 100644 index 85646fb7da..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/orangecake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/orangecake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/orangecake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/orangecake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/pastatomato.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/pastatomato.rsi/icon.png deleted file mode 100644 index 8b6aba6706..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pastatomato.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pastatomato.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/pastatomato.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/pastatomato.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/peppermillsmall.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/peppermillsmall.rsi/icon.png deleted file mode 100644 index c0f9ae9261..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/peppermillsmall.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/peppermillsmall.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/peppermillsmall.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/peppermillsmall.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/phelmbiscuit.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/phelmbiscuit.rsi/icon.png deleted file mode 100644 index f3bbcd8f74..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/phelmbiscuit.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/phelmbiscuit.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/phelmbiscuit.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/phelmbiscuit.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/pie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/pie.rsi/icon.png deleted file mode 100644 index afdd303971..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/pie.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/pie.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/icon.png deleted file mode 100644 index f83d1e96cc..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/pizzamargherita.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/pizzamargheritaslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/pizzamargheritaslice.rsi/icon.png deleted file mode 100644 index f1ee9b19cc..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pizzamargheritaslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pizzamargheritaslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/pizzamargheritaslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/pizzamargheritaslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/plaincake.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/plaincake.rsi/icon.png deleted file mode 100644 index 45e4ee8a0b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/plaincake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/plaincake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/plaincake.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/plaincake.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/plaincake_slice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/plaincake_slice.rsi/icon.png deleted file mode 100644 index 4981b1d5b3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/plaincake_slice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/plaincake_slice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/plaincake_slice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/plaincake_slice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/plaindonut.png b/Resources/Textures/Objects/Consumable/Food/plaindonut.png deleted file mode 100644 index d6e246de0e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/plaindonut.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json new file mode 100644 index 0000000000..0a96ac5f11 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plate" + }, + { + "name": "plate-trash" + }, + { + "name": "plate-pizza" + }, + { + "name": "plate-plastic" + }, + { + "name": "plate-slice-shading" + }, + { + "name": "plate-small" + }, + { + "name": "plate-small-trash" + }, + { + "name": "plate-tart" + }, + { + "name": "plate-small-plastic" + }, + { + "name": "tin" + }, + { + "name": "tray" + }, + { + "name": "tray-trash" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-pizza.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-pizza.png new file mode 100644 index 0000000000..5f95d86cb3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-pizza.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-plastic.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-plastic.png new file mode 100644 index 0000000000..fbd1ae3165 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-plastic.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-slice-shading.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-slice-shading.png new file mode 100644 index 0000000000..8874e90454 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-slice-shading.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small-plastic.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small-plastic.png new file mode 100644 index 0000000000..0eb537824b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small-plastic.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small-trash.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small-trash.png new file mode 100644 index 0000000000..3befe2b5ad Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small.png new file mode 100644 index 0000000000..3afc00ebb4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-small.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-tart.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-tart.png new file mode 100644 index 0000000000..1e86936f27 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-tart.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-trash.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-trash.png new file mode 100644 index 0000000000..1ca5355711 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate.png new file mode 100644 index 0000000000..9fa2b33db3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/plate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/tin.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/tin.png new file mode 100644 index 0000000000..5bdbc10a93 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/tin.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray-trash.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray-trash.png new file mode 100644 index 0000000000..3b3ab971c1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray.png new file mode 100644 index 0000000000..dfc6ffe418 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plump_pie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/plump_pie.rsi/icon.png deleted file mode 100644 index f05eaf231e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/plump_pie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/plump_pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/plump_pie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/plump_pie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/poisonrawmeat.png b/Resources/Textures/Objects/Consumable/Food/poisonrawmeat.png deleted file mode 100644 index 7b4b0f8b7a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/poisonrawmeat.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/popcorn.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/popcorn.rsi/icon.png deleted file mode 100644 index f1a0547bd6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/popcorn.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/popcorn.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/popcorn.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/popcorn.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/poppypretzel.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/poppypretzel.rsi/icon.png deleted file mode 100644 index 8de5053865..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/poppypretzel.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/poppypretzel.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/poppypretzel.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/poppypretzel.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/icon.png deleted file mode 100644 index 22a72463e7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-left.png deleted file mode 100644 index 23aeffa07a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-right.png deleted file mode 100644 index 01027d3f31..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/pumpkinpie.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/pumpkinpieslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/pumpkinpieslice.rsi/icon.png deleted file mode 100644 index 751920a0d7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/pumpkinpieslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/pumpkinpieslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/pumpkinpieslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/pumpkinpieslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/rawmeat.png b/Resources/Textures/Objects/Consumable/Food/rawmeat.png deleted file mode 100644 index 1507ff25b7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/rawmeat.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/rice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/rice.rsi/icon.png deleted file mode 100644 index 934de72c75..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/rice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/rice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/rice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/rice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/roburger.rsi/icon.png deleted file mode 100644 index e44438fa71..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/roburger.rsi/inhand-left.png deleted file mode 100644 index 3db2175335..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/roburger.rsi/inhand-right.png deleted file mode 100644 index 40d4fbc83e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/roburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/roburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/rofflewaffles.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/rofflewaffles.rsi/icon.png deleted file mode 100644 index f69ff80bb1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/rofflewaffles.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/rofflewaffles.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/rofflewaffles.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/rofflewaffles.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/rorosoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/rorosoup.rsi/icon.png deleted file mode 100644 index 02b9a61600..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/rorosoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/rorosoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/rorosoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/rorosoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/rottenmeat.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/rottenmeat.rsi/icon.png deleted file mode 100644 index 0591ca2352..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/rottenmeat.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/rottenmeat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/rottenmeat.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/rottenmeat.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/rpudding.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/rpudding.rsi/icon.png deleted file mode 100644 index 4fd7fda9d4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/rpudding.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/rpudding.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/rpudding.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/rpudding.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/saltshakersmall.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/saltshakersmall.rsi/icon.png deleted file mode 100644 index b9696a57ad..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/saltshakersmall.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/saltshakersmall.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/saltshakersmall.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/saltshakersmall.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/icon.png deleted file mode 100644 index 6c98eeca7e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/jelly.png b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/jelly.png new file mode 100644 index 0000000000..09738b7725 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/jelly.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/meta.json index 6b3193ec36..cb76503b91 100644 --- a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/meta.json @@ -1,50 +1,23 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [ { - "name": "icon" + "name": "jelly" }, { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "nota" }, { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "plain" + }, + { + "name": "toasted" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/nota.png b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/nota.png new file mode 100644 index 0000000000..5090059f6c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/nota.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/plain.png b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/plain.png new file mode 100644 index 0000000000..84ff3a4599 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/plain.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/toasted.png b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/toasted.png new file mode 100644 index 0000000000..1c289316ce Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/sandwich.rsi/toasted.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich_filling.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/sandwich_filling.rsi/icon.png deleted file mode 100644 index 50a937cdd3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sandwich_filling.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich_filling.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/sandwich_filling.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/sandwich_filling.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich_top.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/sandwich_top.rsi/icon.png deleted file mode 100644 index 6f7cb205a0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sandwich_top.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sandwich_top.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/sandwich_top.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/sandwich_top.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/sausage.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/sausage.rsi/icon.png deleted file mode 100644 index ec11500010..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sausage.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sausage.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/sausage.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/sausage.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/shandp.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/shandp.rsi/icon.png deleted file mode 100644 index 5740164c49..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/shandp.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/shandp.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/shandp.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/shandp.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json new file mode 100644 index 0000000000..0416b44460 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json @@ -0,0 +1,98 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "skewer" + }, + { + "name": "skewer-meat1" + }, + { + "name": "skewer-meat2" + }, + { + "name": "skewer-meat3" + }, + { + "name": "skewer-meat4" + }, + { + "name": "skewer-meat-alpha1" + }, + { + "name": "skewer-meat-alpha2" + }, + { + "name": "skewer-meat-alpha3" + }, + { + "name": "skewer-meat-alpha4" + }, + { + "name": "skewer-mushroom1" + }, + { + "name": "skewer-mushroom2" + }, + { + "name": "skewer-mushroom3" + }, + { + "name": "skewer-mushroom4" + }, + { + "name": "skewer-pepper1" + }, + { + "name": "skewer-pepper2" + }, + { + "name": "skewer-pepper3" + }, + { + "name": "skewer-pepper4" + }, + { + "name": "skewer-tomato1" + }, + { + "name": "skewer-tomato2" + }, + { + "name": "skewer-tomato3" + }, + { + "name": "skewer-tomato4" + }, + { + "name": "skewer-corn1" + }, + { + "name": "skewer-corn2" + }, + { + "name": "skewer-tail1" + }, + { + "name": "skewer-tail2" + }, + { + "name": "skewer-tail-cooked1" + }, + { + "name": "skewer-tail-cooked2" + }, + { + "name": "skewer-rat1" + }, + { + "name": "skewer-rat2" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png new file mode 100644 index 0000000000..e1f8ec3ceb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png new file mode 100644 index 0000000000..8dc4eec7c3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png new file mode 100644 index 0000000000..97e0d482fb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png new file mode 100644 index 0000000000..8d729f22e1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png new file mode 100644 index 0000000000..3f62a05be5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png new file mode 100644 index 0000000000..4753c6a2f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png new file mode 100644 index 0000000000..8f1ae81e9b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png new file mode 100644 index 0000000000..1dbc77d261 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png new file mode 100644 index 0000000000..39f4888018 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png new file mode 100644 index 0000000000..a9f8ad789f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png new file mode 100644 index 0000000000..e2747afae3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png new file mode 100644 index 0000000000..505d9599e1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png new file mode 100644 index 0000000000..e9cbf32606 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png new file mode 100644 index 0000000000..78f86e3a7b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png new file mode 100644 index 0000000000..dac4665696 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png new file mode 100644 index 0000000000..670b66ff9f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png new file mode 100644 index 0000000000..3c8b115ee8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png new file mode 100644 index 0000000000..d0d8caae3e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png new file mode 100644 index 0000000000..3e41b5ea86 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png new file mode 100644 index 0000000000..36f7c5bfdb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png new file mode 100644 index 0000000000..02e8069f3d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png new file mode 100644 index 0000000000..f40274d08b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png new file mode 100644 index 0000000000..c8033c05bd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png new file mode 100644 index 0000000000..0227fd5470 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png new file mode 100644 index 0000000000..39399183ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png new file mode 100644 index 0000000000..c3d3a70e02 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png new file mode 100644 index 0000000000..1edf8de4c9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png new file mode 100644 index 0000000000..cc79b96e78 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer.png new file mode 100644 index 0000000000..131d455efe Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/skrellsnacks.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/skrellsnacks.rsi/icon.png deleted file mode 100644 index a3e06bcc56..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/skrellsnacks.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/skrellsnacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skrellsnacks.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/skrellsnacks.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans-empty.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans-empty.png new file mode 100644 index 0000000000..2b46eec723 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans-empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans-open.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans-open.png new file mode 100644 index 0000000000..7d7738dc82 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans.png new file mode 100644 index 0000000000..7c6413af29 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/beans.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/boritos-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/boritos-trash.png new file mode 100644 index 0000000000..024ca7ce39 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/boritos-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/boritos.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/boritos.png new file mode 100644 index 0000000000..dfed94d778 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/boritos.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cheesiehonkers-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cheesiehonkers-trash.png new file mode 100644 index 0000000000..dbc9b7313c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cheesiehonkers-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cheesiehonkers.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cheesiehonkers.png new file mode 100644 index 0000000000..4b514de166 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/cheesiehonkers.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips-trash.png new file mode 100644 index 0000000000..2c4bb27550 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips.png new file mode 100644 index 0000000000..12ea29ebfb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chips.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/candy.rsi/inhand-left.png rename to Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-inhand-left.png diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/candy.rsi/inhand-right.png rename to Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-inhand-right.png diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-open.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-open.png new file mode 100644 index 0000000000..0bccf07f9f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Trash/candy.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-trash.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Trash/candy.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar-trash.png diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar.png new file mode 100644 index 0000000000..ced959c0e2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/chocolatebar.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar-trash.png new file mode 100644 index 0000000000..8ff77978c3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar.png new file mode 100644 index 0000000000..6b52533a8b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json new file mode 100644 index 0000000000..49b407efa9 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json @@ -0,0 +1,120 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beans" + }, + { + "name": "beans-empty" + }, + { + "name": "beans-open" + }, + { + "name": "boritos" + }, + { + "name": "boritos-trash" + }, + { + "name": "cheesiehonkers" + }, + { + "name": "cheesiehonkers-trash" + }, + { + "name": "chips" + }, + { + "name": "chips-trash" + }, + { + "name": "chocolatebar" + }, + { + "name": "chocolatebar-open" + }, + { + "name": "chocolatebar-trash" + }, + { + "name": "chocolatebar-inhand-right", + "directions": 4 + }, + { + "name": "chocolatebar-inhand-left", + "directions": 4 + }, + { + "name": "energybar" + }, + { + "name": "energybar-trash" + }, + { + "name": "packet-inhand-right", + "directions": 4 + }, + { + "name": "packet-inhand-left", + "directions": 4 + }, + { + "name": "peachtin" + }, + { + "name": "peachtin-empty" + }, + { + "name": "peachtin-open" + }, + { + "name": "peachtinmaint" + }, + { + "name": "peachtinmaint-empty" + }, + { + "name": "peachtinmaint-open" + }, + { + "name": "pistachio-trash" + }, + { + "name": "popcorn" + }, + { + "name": "popcorn-trash" + }, + { + "name": "raisins" + }, + { + "name": "raisins-trash" + }, + { + "name": "semki-trash" + }, + { + "name": "susjerky" + }, + { + "name": "susjerky-trash" + }, + { + "name": "syndicakes" + }, + { + "name": "syndicakes-trash" + }, + { + "name": "tatortot" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/packet-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/packet-inhand-left.png new file mode 100644 index 0000000000..42c874c4fa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/packet-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/packet-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/packet-inhand-right.png new file mode 100644 index 0000000000..e8abcf6547 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/packet-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin-empty.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin-empty.png new file mode 100644 index 0000000000..0f8f534922 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin-empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin-open.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin-open.png new file mode 100644 index 0000000000..2ee01465aa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin.png new file mode 100644 index 0000000000..972b5ed49e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtin.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint-empty.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint-empty.png new file mode 100644 index 0000000000..7d282d24ec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint-empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint-open.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint-open.png new file mode 100644 index 0000000000..e5aa5dba19 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint.png new file mode 100644 index 0000000000..fb6d6fad8a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/peachtinmaint.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio-trash.png new file mode 100644 index 0000000000..4fd0625bdb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/pistachio-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-trash.png new file mode 100644 index 0000000000..8ddbb2a7d7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn.png new file mode 100644 index 0000000000..566b155c5e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/popcorn.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/raisins-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/raisins-trash.png new file mode 100644 index 0000000000..4a4f3ada8d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/raisins-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/raisins.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/raisins.png new file mode 100644 index 0000000000..ebb32393aa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/raisins.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/semki-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/semki-trash.png new file mode 100644 index 0000000000..2e16c11e7f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/semki-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/susjerky-trash.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/susjerky-trash.png new file mode 100644 index 0000000000..b8f2fc2da2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/susjerky-trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/susjerky.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/susjerky.png new file mode 100644 index 0000000000..c02085cf53 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/susjerky.png differ diff --git a/Resources/Textures/Objects/Consumable/Trash/syndi_cakes.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes-trash.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Trash/syndi_cakes.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes-trash.png diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png new file mode 100644 index 0000000000..1b45ff7bbd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/syndicakes.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/tatortot.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/tatortot.png new file mode 100644 index 0000000000..802b7e05c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/tatortot.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/icon.png deleted file mode 100644 index b2f5424fb1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/inhand-left.png deleted file mode 100644 index 993e02aef2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/inhand-right.png deleted file mode 100644 index f36ef75a67..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/sosjerky.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/soydope.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/soydope.rsi/icon.png deleted file mode 100644 index 246f55a475..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/soydope.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/soydope.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/soydope.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/soydope.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/soylent_green.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/soylent_green.rsi/icon.png deleted file mode 100644 index 1d0896814c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/soylent_green.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/soylent_green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/soylent_green.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/soylent_green.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/soylent_yellow.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/soylent_yellow.rsi/icon.png deleted file mode 100644 index 9842710350..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/soylent_yellow.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/soylent_yellow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/soylent_yellow.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/soylent_yellow.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/soysauce.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/soysauce.rsi/icon.png deleted file mode 100644 index 141f42ef5c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/soysauce.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/soysauce.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/soysauce.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/soysauce.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/space_twinkie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/space_twinkie.rsi/icon.png deleted file mode 100644 index 0d5d9e4657..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/space_twinkie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/space_twinkie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/space_twinkie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/space_twinkie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/spacylibertyduff.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/spacylibertyduff.rsi/icon.png deleted file mode 100644 index 4b132f3f38..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/spacylibertyduff.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/spacylibertyduff.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/spacylibertyduff.rsi/meta.json deleted file mode 100644 index 491b6ae98a..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/spacylibertyduff.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "delays": [[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/spaghetti.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/spaghetti.rsi/icon.png deleted file mode 100644 index 1a3957e4c7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/spaghetti.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/spaghetti.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/spaghetti.rsi/meta.json deleted file mode 100644 index 2d0d580e61..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/spaghetti.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/spaghettiboiled.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/spaghettiboiled.rsi/icon.png deleted file mode 100644 index 53771feb14..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/spaghettiboiled.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/spaghettiboiled.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/spaghettiboiled.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/spaghettiboiled.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/icon.png deleted file mode 100644 index 3042a0f4f7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/spellburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/spesslaw.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/spesslaw.rsi/icon.png deleted file mode 100644 index 39c700592d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/spesslaw.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/spesslaw.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/spesslaw.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/spesslaw.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/stew.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/stew.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/stew.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/stewedsoymeat.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/stewedsoymeat.rsi/icon.png deleted file mode 100644 index d14f83794a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/stewedsoymeat.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/stewedsoymeat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/stewedsoymeat.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/stewedsoymeat.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/stuffing.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/stuffing.rsi/icon.png deleted file mode 100644 index 5a11ff0825..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/stuffing.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/stuffing.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/stuffing.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/stuffing.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/sugar.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/sugar.rsi/icon.png deleted file mode 100644 index c247ab0d06..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sugar.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sugar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/sugar.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/sugar.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/sugarsmall.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/sugarsmall.rsi/icon.png deleted file mode 100644 index aacc16e3d5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/sugarsmall.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/sugarsmall.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/sugarsmall.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/sugarsmall.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/superbiteburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/superbiteburger.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/superbiteburger.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/syndi_cakes.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/syndi_cakes.rsi/icon.png deleted file mode 100644 index 4792deb385..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/syndi_cakes.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/syndi_cakes.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/syndi_cakes.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/syndi_cakes.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/icon.png deleted file mode 100644 index b8a1b29667..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/taco.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/tastybread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tastybread.rsi/icon.png deleted file mode 100644 index dc4ad42b62..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tastybread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tastybread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tastybread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tastybread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/toastedsandwich.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/toastedsandwich.rsi/icon.png deleted file mode 100644 index 612711d705..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/toastedsandwich.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/toastedsandwich.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/toastedsandwich.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/toastedsandwich.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/tofu.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tofu.rsi/icon.png deleted file mode 100644 index 02dbba3fdc..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tofu.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tofu.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tofu.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tofu.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/tofubread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tofubread.rsi/icon.png deleted file mode 100644 index e0afad6b34..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tofubread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tofubread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tofubread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tofubread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/tofubreadslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tofubreadslice.rsi/icon.png deleted file mode 100644 index 77c678a08b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tofubreadslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tofubreadslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tofubreadslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tofubreadslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/icon.png deleted file mode 100644 index 24b042aac4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tofuburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/tofurkey.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tofurkey.rsi/icon.png deleted file mode 100644 index 828eac2da6..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tofurkey.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tofurkey.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tofurkey.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tofurkey.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/tomatomeat.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tomatomeat.rsi/icon.png deleted file mode 100644 index e93b2469ea..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tomatomeat.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tomatomeat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tomatomeat.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tomatomeat.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/tomatosoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/tomatosoup.rsi/icon.png deleted file mode 100644 index d33e656060..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/tomatosoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/tomatosoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/tomatosoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/tomatosoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/twinkie.png b/Resources/Textures/Objects/Consumable/Food/twinkie.png deleted file mode 100644 index 9beedf980a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/twinkie.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/twobread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/twobread.rsi/icon.png deleted file mode 100644 index 0677fc9b79..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/twobread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/twobread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/twobread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/twobread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/validsalad.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/validsalad.rsi/icon.png deleted file mode 100644 index 8c30c26df1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/validsalad.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/validsalad.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/validsalad.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/validsalad.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/icon.png deleted file mode 100644 index 45ba98ba84..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/vegetablepizza.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/vegetablepizzaslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/vegetablepizzaslice.rsi/icon.png deleted file mode 100644 index 75b5cd4e46..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/vegetablepizzaslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/vegetablepizzaslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/vegetablepizzaslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/vegetablepizzaslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/vegetablesoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/vegetablesoup.rsi/icon.png deleted file mode 100644 index 8a51ba0de2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/vegetablesoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/vegetablesoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/vegetablesoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/vegetablesoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/waffles.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/waffles.rsi/icon.png deleted file mode 100644 index f00fb998ed..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/waffles.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/waffles.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/waffles.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/waffles.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/watermelonslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/watermelonslice.rsi/icon.png deleted file mode 100644 index 545be1de0d..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/watermelonslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/watermelonslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/watermelonslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/watermelonslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/wingfangchu.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/wingfangchu.rsi/icon.png deleted file mode 100644 index 07c6298103..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/wingfangchu.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/wingfangchu.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/wingfangchu.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/wingfangchu.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/wishsoup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/wishsoup.rsi/icon.png deleted file mode 100644 index b8cb4f68eb..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/wishsoup.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/wishsoup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/wishsoup.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/wishsoup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/xburger.rsi/icon.png deleted file mode 100644 index c3593b801b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/xburger.rsi/inhand-left.png deleted file mode 100644 index f5ed6b39cd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/xburger.rsi/inhand-right.png deleted file mode 100644 index 9e9290dd8c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/xburger.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/xburger.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Food/xenobreadslice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/xenobreadslice.rsi/icon.png deleted file mode 100644 index 0815019b91..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/xenobreadslice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/xenobreadslice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/xenobreadslice.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/xenobreadslice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/xenomeat.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/xenomeat.rsi/icon.png deleted file mode 100644 index da3ca891df..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/xenomeat.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/xenomeat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/xenomeat.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/xenomeat.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/icon.png deleted file mode 100644 index ead509e9f3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/xenomeatbread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/xenomeatpie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/xenomeatpie.rsi/icon.png deleted file mode 100644 index 408060f169..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/xenomeatpie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/xenomeatpie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/xenomeatpie.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Food/xenomeatpie.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-0.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-0.png deleted file mode 100644 index 478eb2e560..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-1.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-1.png deleted file mode 100644 index 471af9a3b3..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-2.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-2.png deleted file mode 100644 index a5810dbe92..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-3.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-3.png deleted file mode 100644 index 78c3319ace..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-4.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-4.png deleted file mode 100644 index 19d7fbd9db..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-5.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-5.png deleted file mode 100644 index 2829d4bf8e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-6.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-6.png deleted file mode 100644 index 4f7459abcb..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/donutbox-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/icon.png b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/icon.png deleted file mode 100644 index 478eb2e560..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/meta.json deleted file mode 100644 index 3f7bd515bc..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/donutbox.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "donutbox-0" - }, - { - "name": "donutbox-1" - }, - { - "name": "donutbox-2" - }, - { - "name": "donutbox-3" - }, - { - "name": "donutbox-4" - }, - { - "name": "donutbox-5" - }, - { - "name": "donutbox-6" - }, - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-0.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-0.png deleted file mode 100644 index ac9db4ec90..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-1.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-1.png deleted file mode 100644 index e0fc4da3bb..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-10.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-10.png deleted file mode 100644 index 0ae9c0e220..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-10.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-11.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-11.png deleted file mode 100644 index 52da1fd3b2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-11.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-12.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-12.png deleted file mode 100644 index 0425899d3c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-12.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-2.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-2.png deleted file mode 100644 index fa29f9c71b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-3.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-3.png deleted file mode 100644 index a0d051caba..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-4.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-4.png deleted file mode 100644 index 8959a9d964..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-5.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-5.png deleted file mode 100644 index 3582ecc62f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-6.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-6.png deleted file mode 100644 index 988b00352e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-7.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-7.png deleted file mode 100644 index aa4659f900..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-8.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-8.png deleted file mode 100644 index 71138a6925..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-8.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-9.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-9.png deleted file mode 100644 index baf3dae50e..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/eggbox-9.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/meta.json deleted file mode 100644 index 8afe9a2cdf..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox.rsi/meta.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "eggbox-0" - }, - { - "name": "eggbox-1" - }, - { - "name": "eggbox-2" - }, - { - "name": "eggbox-3" - }, - { - "name": "eggbox-4" - }, - { - "name": "eggbox-5" - }, - { - "name": "eggbox-6" - }, - { - "name": "eggbox-7" - }, - { - "name": "eggbox-8" - }, - { - "name": "eggbox-9" - }, - { - "name": "eggbox-10" - }, - { - "name": "eggbox-11" - }, - { - "name": "eggbox-12" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/icon.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/icon.png deleted file mode 100644 index 57b8918ee9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/inhand-left.png deleted file mode 100644 index 8836aacfbe..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/inhand-right.png deleted file mode 100644 index e86da3cc45..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/eggbox_shut.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubebox.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubebox.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubebox.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubewrap.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubewrap.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubewrap.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/icon.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/icon.png deleted file mode 100644 index fbdb3ecee2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/iconopen.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/iconopen.png deleted file mode 100644 index 62170fc573..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/iconopen.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/meta.json deleted file mode 100644 index 6b3193ec36..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox.rsi/meta.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox_tag.rsi/icon.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox_tag.rsi/icon.png deleted file mode 100644 index 72be64fe62..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox_tag.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox_tag.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox_tag.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/pizzabox_tag.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/icon.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/icon.png deleted file mode 100644 index 96deef8a08..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/meta.json b/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/meta.json deleted file mode 100644 index c4711e62ba..0000000000 --- a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "pizzaboxstack-0" - }, - { - "name": "pizzaboxstack-1" - }, - { - "name": "pizzaboxstack-2" - }, - { - "name": "pizzaboxstack-3" - }, - { - "name": "pizzaboxstack-4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-0.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-0.png deleted file mode 100644 index 2d30e6f423..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-1.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-1.png deleted file mode 100644 index 70f7209947..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-2.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-2.png deleted file mode 100644 index 1363e7c747..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-3.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-3.png deleted file mode 100644 index 9bbc5a971a..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-4.png b/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-4.png deleted file mode 100644 index 96deef8a08..0000000000 Binary files a/Resources/Textures/Objects/Consumable/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/4no_raisins.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/4no_raisins.rsi/icon.png deleted file mode 100644 index 1d1f30a467..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/4no_raisins.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/4no_raisins.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/4no_raisins.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/4no_raisins.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/ash.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/ash.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/ash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/candy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/candy.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/candy.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/cheesie_honkers.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/cheesie_honkers.rsi/icon.png deleted file mode 100644 index 9a52fdb83b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/cheesie_honkers.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/cheesie_honkers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/cheesie_honkers.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/cheesie_honkers.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/chips.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/chips.rsi/icon.png deleted file mode 100644 index 775d31cd40..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/chips.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/chips.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/chips.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/chips.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/corncob.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/corncob.rsi/icon.png deleted file mode 100644 index 4c61f5570b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/corncob.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/corncob.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/corncob.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/corncob.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/liquidfood.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/liquidfood.rsi/icon.png deleted file mode 100644 index 7488f176e0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/liquidfood.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/liquidfood.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/liquidfood.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/liquidfood.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/pistachios_pack.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/pistachios_pack.rsi/icon.png deleted file mode 100644 index 3efe4588cf..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/pistachios_pack.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/pistachios_pack.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/pistachios_pack.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/pistachios_pack.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/pizzabox_messy.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/pizzabox_messy.rsi/icon.png deleted file mode 100644 index 7a14347f43..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/pizzabox_messy.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/pizzabox_messy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/pizzabox_messy.rsi/meta.json deleted file mode 100644 index b6a9d8c6c4..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/pizzabox_messy.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/plasticbag.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/plasticbag.rsi/icon.png deleted file mode 100644 index 0e1b54e058..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/plasticbag.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/plasticbag.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/plasticbag.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/plasticbag.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/plate.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/plate.rsi/icon.png deleted file mode 100644 index 16c7bebf26..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/plate.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/plate.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/plate.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/plate.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/popcorn.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/popcorn.rsi/icon.png deleted file mode 100644 index 24eb1166ed..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/popcorn.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/popcorn.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/popcorn.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/popcorn.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/semki_pack.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/semki_pack.rsi/icon.png deleted file mode 100644 index 6842a73734..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/semki_pack.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/semki_pack.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/semki_pack.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/semki_pack.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/snack_bowl.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/snack_bowl.rsi/icon.png deleted file mode 100644 index b7f4dcb5a8..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/snack_bowl.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/snack_bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/snack_bowl.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/snack_bowl.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/sosjerky.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/sosjerky.rsi/icon.png deleted file mode 100644 index d287608356..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/sosjerky.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/sosjerky.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/sosjerky.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/sosjerky.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/syndi_cakes.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/syndi_cakes.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/syndi_cakes.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/tastybread.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/tastybread.rsi/icon.png deleted file mode 100644 index e5ca19b111..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/tastybread.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/tastybread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/tastybread.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/tastybread.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/tray.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/tray.rsi/icon.png deleted file mode 100644 index 501be4a783..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/tray.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/tray.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/tray.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/tray.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/waffles.rsi/icon.png b/Resources/Textures/Objects/Consumable/Trash/waffles.rsi/icon.png deleted file mode 100644 index be3d1d2025..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Trash/waffles.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Trash/waffles.rsi/meta.json b/Resources/Textures/Objects/Consumable/Trash/waffles.rsi/meta.json deleted file mode 100644 index 1700d4ab4a..0000000000 --- a/Resources/Textures/Objects/Consumable/Trash/waffles.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", "states": [{"name": "icon"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Trash/ash.rsi/icon.png b/Resources/Textures/Objects/Materials/materials.rsi/ash.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Trash/ash.rsi/icon.png rename to Resources/Textures/Objects/Materials/materials.rsi/ash.png diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index d4ad379ee8..30ed4cee60 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "ash" + }, { "name": "alienhide" }, diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubebox.rsi/icon.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/box.png similarity index 100% rename from Resources/Textures/Objects/Consumable/FoodContainers/monkeycubebox.rsi/icon.png rename to Resources/Textures/Objects/Misc/monkeycube.rsi/box.png diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/cube.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/cube.png new file mode 100644 index 0000000000..f9935e6614 Binary files /dev/null and b/Resources/Textures/Objects/Misc/monkeycube.rsi/cube.png differ diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json b/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json new file mode 100644 index 0000000000..e990b48b2f --- /dev/null +++ b/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box" + }, + { + "name": "cube" + }, + { + "name": "wrapper" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/FoodContainers/monkeycubewrap.rsi/icon.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper.png similarity index 100% rename from Resources/Textures/Objects/Consumable/FoodContainers/monkeycubewrap.rsi/icon.png rename to Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/dead.png new file mode 100644 index 0000000000..3a1e5735cd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/harvest.png new file mode 100644 index 0000000000..8c5eb7dc51 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json new file mode 100644 index 0000000000..0fdf07f2bd --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA 3.0", + "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce.png new file mode 100644 index 0000000000..e0898b8baf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/seed.png new file mode 100644 index 0000000000..c63fb5cc6d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-1.png new file mode 100644 index 0000000000..77e20df4fc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-2.png new file mode 100644 index 0000000000..419ba77c1f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-3.png new file mode 100644 index 0000000000..23a74c6983 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-4.png new file mode 100644 index 0000000000..2bea35ad62 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-5.png new file mode 100644 index 0000000000..efe887736d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-6.png new file mode 100644 index 0000000000..d063832b78 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/oat.rsi/stage-6.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/dead.png new file mode 100644 index 0000000000..07b9366b96 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/harvest.png new file mode 100644 index 0000000000..4285fc2a0c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json new file mode 100644 index 0000000000..28708c4268 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA 3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "slice" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce.png new file mode 100644 index 0000000000..3de2582e42 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/seed.png new file mode 100644 index 0000000000..bdac8fb001 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/slice.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/slice.png new file mode 100644 index 0000000000..6fa2063b25 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/slice.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-1.png new file mode 100644 index 0000000000..f3ee167fec Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-2.png new file mode 100644 index 0000000000..146f0f8846 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-3.png new file mode 100644 index 0000000000..24c5632811 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/dead.png new file mode 100644 index 0000000000..07b9366b96 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/harvest.png new file mode 100644 index 0000000000..6abaa49ad5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json new file mode 100644 index 0000000000..28708c4268 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA 3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "slice" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png new file mode 100644 index 0000000000..68fc745713 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/seed.png new file mode 100644 index 0000000000..e308555d83 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/slice.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/slice.png new file mode 100644 index 0000000000..b0c41b7c0d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/slice.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-1.png new file mode 100644 index 0000000000..6ec16d9236 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-2.png new file mode 100644 index 0000000000..1cb53104ec Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-3.png new file mode 100644 index 0000000000..3520e6d7d9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/dead.png new file mode 100644 index 0000000000..082443de97 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/harvest.png new file mode 100644 index 0000000000..5e52276009 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json new file mode 100644 index 0000000000..28708c4268 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA 3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9b0c2e771e9d2442dd7d21c019b970c1299b5cf4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "slice" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce.png new file mode 100644 index 0000000000..e831df78c6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/seed.png new file mode 100644 index 0000000000..ce2d94d565 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/slice.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/slice.png new file mode 100644 index 0000000000..1c4d96d8e1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/slice.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-1.png new file mode 100644 index 0000000000..2678518fca Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-2.png new file mode 100644 index 0000000000..287d5625f0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-3.png new file mode 100644 index 0000000000..01128a82bc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_donk_pocket.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_donk_pocket.png deleted file mode 100644 index 53695eb6ae..0000000000 Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_donk_pocket.png and /dev/null differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 0a13cf7250..7a4a0f9842 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -31,9 +31,6 @@ { "name": "box_hug" }, - { - "name": "box_donk_pocket" - }, { "name": "box_id" },