From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 10 May 2023 11:36:47 +0000 (+0000) Subject: condiment rework (#16247) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=21166406d8f28f668fad768dea9c890d9db0c0d2;p=space-station-14.git condiment rework (#16247) Co-authored-by: deltanedas <@deltanedas:kde.org> --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index aea084a0a1..ab6ac3295c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -10,7 +10,7 @@ FoodCondimentBottleHotsauce: 1 FoodCondimentBottleKetchup: 1 FoodCondimentBottleBBQ: 1 - FoodCondimentBottleSmallVinegar: 2 + FoodCondimentBottleVinegar: 2 ReagentContainerOliveoil: 2 MonkeyCubeBox: 1 FoodContainerEgg: 1 @@ -18,4 +18,4 @@ ReagentContainerMilkSoy: 1 FoodButter: 4 FoodCheese: 1 - FoodMeat: 6 \ No newline at end of file + FoodMeat: 6 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index 642a9006f7..04845e4446 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -1,10 +1,28 @@ # TODO: Removes the icon components from all these when that gets fixed. +- type: entity + parent: BaseItem + id: BaseFoodCondiment + abstract: true + components: + - type: DrawableSolution + solution: food + - type: DrainableSolution + solution: food + - type: Sprite + sprite: Objects/Consumable/Food/condiments.rsi + - type: Icon + sprite: Objects/Consumable/Food/condiments.rsi + - type: TrashOnEmpty + solution: food + - type: SpaceGarbage + - type: StaticPrice + price: 0 + # Packets -# Since this one is closed, the only way to insert liquid is with a syringe. - type: entity - parent: BaseItem + parent: BaseFoodCondiment id: BaseFoodCondimentPacket name: condiment packet abstract: true @@ -15,15 +33,12 @@ refillable: false openSounds: collection: packetOpenSounds - - type: DrawableSolution - solution: food + # Since this one is closed, the only way to insert liquid is with a syringe. - type: InjectableSolution solution: food - - type: DrainableSolution - solution: food - # Note NOT refillable. - # It be a shame if it turned out ALL drinks were ALWAYS refillable.... ffs. - # Well its fixed now, but I want to share my pain. + # Note NOT refillable. + # It be a shame if it turned out ALL drinks were ALWAYS refillable.... ffs. + # Well its fixed now, but I want to share my pain. - type: SolutionContainerManager solutions: food: @@ -31,22 +46,12 @@ - type: SolutionTransfer maxTransferAmount: 10 - 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: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodCondimentPacket - id: FoodCondimentPacket - components: - - type: Tag - tags: - - Trash + - type: PhysicalComposition + materialComposition: + Plastic: 50 - type: entity parent: BaseFoodCondimentPacket @@ -334,7 +339,7 @@ # Bottles - type: entity - parent: BaseItem + parent: BaseFoodCondiment id: BaseFoodCondimentBottle abstract: true name: condiment bottle @@ -344,10 +349,6 @@ solution: food openSounds: collection: pop - - type: RefillableSolution - solution: food - - type: DrainableSolution - solution: food - type: SolutionContainerManager solutions: food: @@ -357,23 +358,14 @@ minTransferAmount: 5 maxTransferAmount: 30 - type: Sprite - netsync: false - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-empty - type: Appearance - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: bottle-alpha- - - type: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodCondimentBottle - id: FoodCondimentBottle - components: - - type: Tag - tags: - - Trash + - type: PhysicalComposition + materialComposition: + Glass: 50 - type: entity parent: BaseFoodCondimentBottle @@ -395,7 +387,6 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-coldsauce - type: entity @@ -418,13 +409,34 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-enzyme +- type: entity + parent: BaseFoodCondimentBottle + id: FoodCondimentBottleVinegar + name: vinegar bottle + description: Used in cooking to enhance flavor. + components: + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Vinegar + Quantity: 30 + - type: Sprite + layers: + - state: bottle-empty + - state: label-v + - state: bottle-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Icon + state: bottle-vinegar + - type: entity parent: BaseFoodCondimentBottle id: FoodCondimentBottleHotsauce - name: hotsauce + name: hotsauce bottle description: You can almost TASTE the stomach ulcers now! components: - type: SolutionContainerManager @@ -441,13 +453,12 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-hotsauce - type: entity parent: BaseFoodCondimentBottle id: FoodCondimentBottleKetchup - name: ketchup + name: ketchup bottle description: You feel more American already. components: - type: SolutionContainerManager @@ -464,13 +475,12 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-ketchup - type: entity parent: BaseFoodCondimentBottle id: FoodCondimentBottleBBQ - name: BBQ sauce + name: BBQ sauce bottle description: Hand wipes not included. components: - type: SolutionContainerManager @@ -488,13 +498,12 @@ visible: true # So there's no error. - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: bottle-ketchup # Shakers - type: entity - parent: BaseItem + parent: BaseFoodCondimentBottle id: BaseFoodShaker abstract: true name: empty shaker @@ -503,10 +512,6 @@ - type: Drink solution: food isOpen: true - - type: RefillableSolution - solution: food - - type: DrainableSolution - solution: food - type: SolutionContainerManager solutions: food: @@ -534,22 +539,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Sprite - netsync: false - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-empty - - type: Appearance - - type: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodShaker - id: FoodShakerEmpty - name: empty shaker - description: A shaker used to store and dispense spices. - components: - - type: Tag - tags: - - Trash - type: entity parent: BaseFoodShaker @@ -563,12 +553,9 @@ reagents: - ReagentId: TableSalt Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-salt - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-salt - type: entity @@ -583,160 +570,7 @@ reagents: - ReagentId: Blackpepper Quantity: 20 - - type: Sprite - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-pepper - type: Icon - sprite: Objects/Consumable/Food/condiments.rsi state: shaker-pepper - -# Small Bottles - -- type: entity - parent: BaseItem - id: BaseFoodCondimentBottleSmall - abstract: true - name: condiment bottle - description: A smaller glass bottle used to store condiments. - components: - - type: Drink - solution: food - openSounds: - collection: pop - - type: RefillableSolution - solution: food - - type: DrainableSolution - solution: food - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - - type: SolutionTransfer - maxTransferAmount: 15 - - type: Sprite - netsync: false - sprite: Objects/Consumable/Food/condiments.rsi - state: bottle-s-empty - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 3 - fillBaseName: bottle-s-alpha- - - type: TrashOnEmpty - solution: food - -- type: entity - parent: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmall - components: - - type: Tag - tags: - - Trash - -- type: entity - parent: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallColdsauce - name: coldsauce bottle - description: Leaves the tongue numb in its passage. - components: - - type: SolutionContainerManager - solutions: - food: - 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: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallHotsauce - name: hotsauce - description: You can almost TASTE the stomach ulcers now! - components: - - type: SolutionContainerManager - solutions: - food: - 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: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallKetchup - name: ketchup - description: You feel more American already. - components: - - type: SolutionContainerManager - solutions: - food: - 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: BaseFoodCondimentBottleSmall - id: FoodCondimentBottleSmallVinegar - name: vinegar - description: Used in cooking to enhance flavor. - components: - - type: SolutionContainerManager - solutions: - food: - 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 - noSpawn: 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/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png deleted file mode 100644 index c92c93cdd4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-1.png and /dev/null 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 deleted file mode 100644 index 7256ecf197..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-2.png and /dev/null 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 deleted file mode 100644 index 09338067ff..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-alpha-3.png and /dev/null 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 deleted file mode 100644 index 5f7c6abb72..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-coldsauce.png and /dev/null 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 deleted file mode 100644 index 08ea20bab4..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-empty.png and /dev/null 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 deleted file mode 100644 index d71d89ea12..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-hotsauce.png and /dev/null 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 deleted file mode 100644 index bf805dbb9b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-ketchup.png and /dev/null 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 deleted file mode 100644 index 2775306d16..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-s-vinegar.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-vinegar.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-vinegar.png new file mode 100644 index 0000000000..3e8398af3f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-vinegar.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 deleted file mode 100644 index c1cf210a68..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-c.png and /dev/null 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 deleted file mode 100644 index 1173f56c00..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-h.png and /dev/null 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 deleted file mode 100644 index f056783c03..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-k.png and /dev/null 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 deleted file mode 100644 index 4fc9f547e5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-s-v.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-v.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-v.png new file mode 100644 index 0000000000..a1e9df0c39 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/label-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 index 05b5ef2dc3..cd02b0bed0 100644 --- a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json @@ -1,7 +1,7 @@ { "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. Shaker sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/7ec204f85ed34a3d9c9d09d51977f2ad610c481e", + "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Shaker sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/7ec204f85ed34a3d9c9d09d51977f2ad610c481e. label-v.png made by deltanedas (github)", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "bottle-enzyme" }, + { + "name": "bottle-vinegar" + }, { "name": "bottle-coldsauce" }, @@ -40,30 +43,6 @@ { "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" }, @@ -80,16 +59,7 @@ "name": "label-k" }, { - "name": "label-s-c" - }, - { - "name": "label-s-h" - }, - { - "name": "label-s-k" - }, - { - "name": "label-s-v" + "name": "label-v" }, { "name": "packet-astrotame" diff --git a/Resources/migration.yml b/Resources/migration.yml index 0d8b17df16..a7f004fbea 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -47,3 +47,6 @@ WeaponSubMachineGunVectorRubber: WeaponSubMachineGunDrozdRubber MagazineBoxAntiMaterial: MagazineBoxAntiMateriel CartridgeAntiMaterial: CartridgeAntiMateriel BulletAntiMaterial: BulletAntiMateriel + +# 2023--05-10 +FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce