From 6d82a7becc3d40937c83b98c25cf85042811fe95 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:32:57 +0000 Subject: [PATCH] Adds a new condiment station (#2637) * Adds a new condiment station * Update soda.yml * Update service.yml * Update soda.yml * Moves condiment cup to _NF * Changes + cleanup Converted tag to empty comp Removed StaticPrice to match the rest of the machines Rebase CondimentCup to DrinkWaterCup added on head sprite Added label to jugs * Condiment cups are now at 10, small copyright adjustment. Feel free to review. * Update service.yml * My sins (CondimentSqueezeBottle) --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../_NF/Containers/CondimentCupComponent.cs | 11 ++ .../CondimentSqueezeBottleComponent.cs | 11 ++ .../meta/consumable/food/condiments.ftl | 2 + .../Entities/Structures/Machines/lathe.yml | 1 + .../Catalog/ReagentDispensers/condiments.yml | 11 ++ .../Consumable/Drinks/condiments_bottles.yml | 135 ++++++++++++++++++ .../Objects/Consumable/Drinks/drinks.yml | 17 +++ .../Consumable/Food/Containers/condiments.yml | 13 +- .../Entities/Objects/Devices/production.yml | 19 +++ .../Objects/Specific/Service/condimentcup.yml | 43 ++++++ .../Structures/Dispensers/condiments.yml | 36 +++++ .../Entities/Structures/Machines/lathe.yml | 2 + .../_NF/Recipes/Lathes/electronics.yml | 10 +- .../Prototypes/_NF/Recipes/Lathes/service.yml | 15 ++ Resources/Prototypes/_NF/tags.yml | 2 +- .../condiment_cup.rsi/equipped-HELMET.png | Bin 0 -> 324 bytes .../Head/Hats/condiment_cup.rsi/icon.png | Bin 0 -> 229 bytes .../Head/Hats/condiment_cup.rsi/meta.json | 18 +++ .../Drinks/condiment_cup.rsi/icon-0.png | Bin 0 -> 261 bytes .../Drinks/condiment_cup.rsi/icon-1.png | Bin 0 -> 127 bytes .../Drinks/condiment_cup.rsi/meta.json | 17 +++ .../dispenser0.png | Bin 0 -> 303 bytes .../dispenser1.png | Bin 0 -> 334 bytes .../condiment_cup_dispenser.rsi/meta.json | 17 +++ .../Structures/smalldispensers.rsi/icon.png | Bin 0 -> 804 bytes .../Structures/smalldispensers.rsi/meta.json | 14 ++ 26 files changed, 382 insertions(+), 12 deletions(-) create mode 100644 Content.Shared/_NF/Containers/CondimentCupComponent.cs create mode 100644 Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs create mode 100644 Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json diff --git a/Content.Shared/_NF/Containers/CondimentCupComponent.cs b/Content.Shared/_NF/Containers/CondimentCupComponent.cs new file mode 100644 index 00000000000..01ef61f9ed0 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentCupComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentCup empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentCupComponent : Component +{ + +} diff --git a/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs new file mode 100644 index 00000000000..7d7711f1a3b --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentSqueezeBottle empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentSqueezeBottleComponent : Component +{ + +} diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl new file mode 100644 index 00000000000..f89397fcb53 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl @@ -0,0 +1,2 @@ +reagent-name-coldsauce = coldsauce +reagent-desc-coldsauce = Coldsauce. Leaves the tongue numb in its passage. diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 45e157b6e91..8af06f49954 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -517,6 +517,7 @@ - SalvageTechFabCircuitboardNF # Frontier - NFScrapProcessorCircuitboard # Frontier - BlueprintLithographMachineCircuitboard # Frontier + - CondimentDispenserCircuitboard # Frontier dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard diff --git a/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml new file mode 100644 index 00000000000..366a7b6c185 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml @@ -0,0 +1,11 @@ +- type: reagentDispenserInventory + id: CondimentDispenserInventory + inventory: + - DrinkAstrotameJug + - DrinkBbqSauceJug + - DrinkColdsauceJug + - DrinkHorseradishSauceJug + - DrinkHotsauceJug + - DrinkKetchupJug + - DrinkMustardJug + - DrinkSoysauceJug diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml new file mode 100644 index 00000000000..aea59ed3e51 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml @@ -0,0 +1,135 @@ +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkAstrotameJug + name: astrotame jug + description: The sweetness of a thousand sugars but none of the calories. Put it in your coffee. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Astrotame + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-astrotame + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkBbqSauceJug + name: bbq sauce jug + description: Finally, ketchup for grownups. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: BbqSauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-bbq-sauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkColdsauceJug + name: coldsauce jug + description: Something to make every meal a little cooler. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Frostoil + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-coldsauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHorseradishSauceJug + name: horseradish sauce jug + description: Now with 50% more horse. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: HorseradishSauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-horseradish-sauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHotsauceJug + name: hotsauce jug + description: The antithesis of no more tears shampoo. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Hotsauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-hotsauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkKetchupJug + name: ketchup jug + description: Someone filled a tomato with sugar until it burst. Delicious. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Ketchup + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-ketchup + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkMustardJug + name: mustard jug + description: All of the implications of real mustard with none of the flavor. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Mustard + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-mustard + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkSoysauceJug + name: soy sauce jug + description: You can only dream of putting some of this on a bowl of rice. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Soysauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-soysauce diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml index 761d49039ee..61a58dbf889 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -95,3 +95,20 @@ - type: Icon sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi state: icon + +# condiment cup +- type: entity + parent: DrinkWaterCup + id: CondimentCup + name: condiment cup + description: A flimsy cup that can be filled with condiments. Warranty void if filled with other things. + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Drinks/condiment_cup.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hats/condiment_cup.rsi + - type: CondimentCup + - type: SolutionContainerManager + solutions: + drink: + maxVol: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml index a6ab68876f6..6b43a731960 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -28,16 +28,9 @@ sprite: _NF/Objects/Consumable/Food/condiments.rsi - type: Icon sprite: _NF/Objects/Consumable/Food/condiments.rsi - # - type: EmitSoundOnActivate - # sound: - # collection: squeezeBottleUseSounds - # params: - # variation: 0.125 - # - type: EmitSoundOnLand - # sound: - # collection: squeezeBottleUseSounds - # params: - # variation: 0.125 + - type: CondimentSqueezeBottle + - type: FitsInDispenser + solution: food - type: entity parent: BaseFoodCondimentSqueezeBottle diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index bfd5c43d1db..182d5c2add6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -348,3 +348,22 @@ stackRequirements: Steel: 5 Plastic: 5 + +- type: entity + id: CondimentDispenserCircuitboard + parent: BaseMachineCircuitboard + name: condiment dispenser machine board + description: A machine printed circuit board for a condiment dispenser. + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: CondimentDispenserEmpty + requirements: # Frontier + MatterBin: 1 # Frontier + stackRequirements: + Steel: 5 + tagRequirements: + GlassBeaker: + amount: 1 + defaultPrototype: Beaker diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml new file mode 100644 index 00000000000..5d236032593 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml @@ -0,0 +1,43 @@ +- type: entity + name: condiment cup dispenser + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser + parent: [BaseItem, PaperBin] + components: + - type: Sprite + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + state: dispenser0 + - type: ItemMapper + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + mapLayers: + dispenser1: + whitelist: + components: + - CondimentCup + - type: Bin + whitelist: + components: + - CondimentCup + +- type: entity + name: condiment cup dispenser + suffix: 10 + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser10 + parent: CondimentCupDispenser + components: + - type: Bin + initialContents: + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + whitelist: + components: + - CondimentCup diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml new file mode 100644 index 00000000000..f0b25439ebb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml @@ -0,0 +1,36 @@ +- type: entity + parent: ReagentDispenserBase + id: CondimentDispenser + name: condiment dispenser + suffix: Filled + description: A condiment dispenser with a single slot for a condiment cup. + components: + - type: Rotatable + - type: Sprite + sprite: _NF/Structures/smalldispensers.rsi + drawdepth: SmallObjects + state: icon + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + pack: CondimentDispenserInventory + - type: Transform + noRot: false + - type: Machine + board: CondimentDispenserCircuitboard + - type: GuideHelp + guides: + - Bartender + - Drinks + +- type: entity + id: CondimentDispenserEmpty + suffix: Empty + parent: CondimentDispenser + components: + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + pack: EmptyInventory diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index ae15f942792..9a8a5e67723 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -134,6 +134,8 @@ - FoodPlateSmallPlastic - NapkinDrum - Napkin + - CondimentCupDispenser + - CondimentCup - FoodCondimentSqueezeBottleClear ## EVA - ClothingOuterEVASuitHydro diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 96cd0950d1c..4de8b2c445e 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -46,6 +46,14 @@ Steel: 800 Glass: 900 +- type: latheRecipe + parent: BaseCircuitboardRecipe + id: CondimentDispenserCircuitboard + result: CondimentDispenserCircuitboard + materials: + Steel: 100 + Glass: 500 + # Thrusters - type: latheRecipe id: ThrusterSecurityMachineCircuitboard @@ -105,4 +113,4 @@ result: PortableGeneratorHyperPacmanMachineCircuitboard materials: Steel: 350 - Glass: 350 \ No newline at end of file + Glass: 350 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 853acc01279..0d693561ceb 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -58,6 +58,21 @@ Plastic: 100 Steel: 100 +- type: latheRecipe + id: CondimentCupDispenser + result: CondimentCupDispenser + parent: BaseServiceItemsRecipe + applyMaterialDiscount: false + +- type: latheRecipe + id: CondimentCup + result: CondimentCup + parent: BaseServiceItemsRecipe + completetime: 0.1 + applyMaterialDiscount: false + materials: + Steel: 10 + - type: latheRecipe id: FoodCondimentSqueezeBottleClear result: FoodCondimentSqueezeBottleClear diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index e22609d87a2..1a7e9b6ff15 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -152,4 +152,4 @@ id: NFVGRoidInterior - type: Tag - id: NFFoamRPG \ No newline at end of file + id: NFFoamRPG diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b156524af5f99df7b26f5b5fb37680fb51b66c GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{&~7MhE&XX zd+TCvvw?u?Mf26V3_FFz9XJDYN*bgWF+Wdc4O*l!X>XX?0o(Z=GmclZu=KQKZ=N;z z*S_#UiX5^aB-Uhndn6y!Cncv|F5-M?4ZZsyq?TOr`|)+p48 zqs#E#(-on27;nE@KIL2ScG;QBR<2s?)$@49(*1qaXSV2cPc3sOd~n?Cx65t&&sxrz zj6mlxFocJEwfb|`?wjii9gT)^hJ29&)(z%d4`dHWvwq-vuyzMS`tOe)UdukPkIHe| z{Ps(Qdq!ZxX?tcqb9sfm^940xUr+eV7_?im@$gx8kN4>;S-Zfdf{7gs(jHPl0yp2T Q`wQZGy85}Sb4q9e0OUx900000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d9a9acb6928f0ee5e7b3c62ce250ba596729525 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2z= zUOvcsSV4g0fbSHh3#J7^vH=XL0lKXL%)AO#1#%Z%Tb?}pYHqF{edEn5mWJYUJL}7n z>rYt9f0J?g5w(76P<4=e^bXc;4hDzNi`B;^n)M3Pxn@|ZGwfmR6-}Cxx2vx%^|FU% z?5snNa~flNK0e;NwJcM9)d9I(LV_!_V%w}*mQG===>09uoyMnF%X?kP`Wu(k^Et%~ aA6Qg5^(DEI4u1eTmBG{1&t;ucLK6VH08&%{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..e53406df8f1 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "equipped-HELMET, icon by wallflowerghost(discord), edited by dvir001 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e570dc439c889d8892ffb5f6b86bacbae278885f GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D_gC^*;C z#W5tJ_3h+?yv&L`Earh+4kiw~B9F2(8<}1(oa9xodJy-lcsj>#>GRwRkM7=P@W7() z@gHmb)5=Ow{@<61lyY_+{d?{>XeFTA1O0nTSdNhhsEXLn80|unV{L yJ_g#taDa8q8`DR3COo|ibSPhHglC$sFM}444RSaLTne5HqC8#wT-G@yGywpPH(wF} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..589dcf55b36c1f8c89a815c203c86ba7c0b0b9bb GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_ zFKlFFFyLTvyiuRAsXFVdQ&MBb@0NIlwz5oCK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..90542ff7b90 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "icon-0/1 by wallflowerghost(discord)", + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d594488b7a9bb33c39fb1da076394b11b35c28 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y} z6C_v{Cy4Zv9Pn6oY`6ctzwz5s^_hXdc|yN&^QInw$h3(|Gf)0v{(n9HPM1_`Z+&OFH@$BEXNAV`3j>_wVgoGPAi`AXOy;TqIb6ze10(0J+k$83{{?GyieRp|w10Z;F zv%KTs9aoPD|9^jOj!E|DXUb|0WS{V+;mZyNH)-u+osCJF&r@4ve{@mo@`c(9#kb#+*`S85j zc8PPbdyX9df)76N-7(1?{Y~rR?Ix?bo3a}K!Jogs*^h1liWnRG`|sQr_{5zNr0>4{ zlgKU}55C4lYa-lAMO}Fc%gXrLfSgI*&YQX)9Xpq)(dt)QDRwihw<*wo%k7|s#7zc< YKFy%}bJ^#m0|SV`)78&qol`;+0IeU2)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json new file mode 100644 index 00000000000..6c27c69df8f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by dustylens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dispenser0" + }, + { + "name": "dispenser1" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png b/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..de1dfe52b9ceb79092390a7dfa90ef0cbed31e98 GIT binary patch literal 804 zcmV+<1Ka$GP)Px%-bqA3R9J=Wlut+$VHn1LV?rn%I)t`p6m<$ef?Rg`b5bfRq&;+yh~17B9+ob3 z5MuS>K`-G=K}dJOTZf_TP(~wo5XVErhKF32z}9t?Fqa&Z*y%8ToN;%dV6)3U@G(2T zeZG00nR(xVnriyblFC8TG)>naNm8}BS9KMWRoGB1{zvlO!N1^8;T1UhD)_3!D+joF zuEC64Jqv)Y>%7hE@^00TIy*bf-rio9tE!5ss?s2s@kqqloJ=wV41#q1(Npum^AX#> z#q9V9@5e`dHA{M6U|_&atn2z;agxaj{w*JOR>>1cBob!Cxf3AixnQ-pqvhpghKGlx zvQyA~z7c@@^b_V^^fMjr1E8y`3xG@}!|d!VlarGG4B3qyiAHIQM#)5@0Ni-|41l%v z+sqkFyqy2U*w`2V>2w-^`opPYS*C8U2*AqseE@d$ipa7|v1svZHVZ(ZP(YStF4_B4 z`v zS=>+*rkb0XYHnr}$O1wLesr{vGPg;Y+r-T@4HugbLLh`7oldj9zFt0nD^KG%@5_3= zAIfs?WO(@^Yd-ER4xTAUBoY{BE6<`(E4uxp!3DFtv2Oz61@^x;B-IPWw7W0L112~2qsQM84%>!((lc*d-j?4lnShc2LI~%F%TD_2<+