From f5aa5f1f22cf255beae398e349e567d466567e40 Mon Sep 17 00:00:00 2001 From: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Date: Sun, 28 Apr 2024 06:40:07 +0200 Subject: [PATCH] Several new bartender tools (#27406) * added bar specs * specs in boozeomat * added jigger in bartender guide * fixed ice bucket * cdn --------- Co-authored-by: metalgearsloth --- .../VendingMachines/Inventories/boozeomat.yml | 3 + .../Consumable/Drinks/drinks_special.yml | 60 ++++++++++++++++++ .../Entities/Objects/Misc/utensils.yml | 25 ++++++++ .../Guidebook/Service/Bartender.xml | 1 + .../Consumable/Drinks/icebucket.rsi/icon.png | Bin 0 -> 554 bytes .../Consumable/Drinks/icebucket.rsi/meta.json | 14 ++++ .../Consumable/Drinks/jigger.rsi/icon.png | Bin 0 -> 314 bytes .../Consumable/Drinks/jigger.rsi/meta.json | 14 ++++ .../utensils.rsi/bar_spoon-inhand-left.png | Bin 0 -> 260 bytes .../utensils.rsi/bar_spoon-inhand-right.png | Bin 0 -> 251 bytes .../Objects/Misc/utensils.rsi/bar_spoon.png | Bin 0 -> 312 bytes .../Objects/Misc/utensils.rsi/meta.json | 13 +++- 12 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/utensils.rsi/bar_spoon-inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/utensils.rsi/bar_spoon-inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/utensils.rsi/bar_spoon.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index bd8b04f982..a309b1d61d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -7,6 +7,9 @@ DrinkVacuumFlask: 5 DrinkFlaskBar: 5 DrinkShaker: 5 + DrinkJigger: 5 + DrinkIceBucket: 2 + BarSpoon: 3 CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index ad2e760141..d2c1249740 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -104,3 +104,63 @@ - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/jar_what.rsi + +- type: entity + id: BartenderMixer + abstract: true + components: + - type: DrainableSolution + solution: drink + - type: Drink + - type: DrawableSolution + solution: drink + - type: RefillableSolution + solution: drink + - type: SolutionTransfer + canChangeTransferAmount: true + - type: Spillable + solution: drink + - type: UserInterface + interfaces: + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface + +- type: entity + parent: [BaseItem, BartenderMixer] + id: DrinkJigger + name: jigger + description: Like a shaker, but smaller. Used to control the amount of ingredients. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + - type: MixableSolution + solution: drink + - type: FitsInDispenser + solution: drink + - type: Sprite + sprite: Objects/Consumable/Drinks/jigger.rsi + state: icon + - type: PhysicalComposition + materialComposition: + Steel: 20 + +- type: entity + parent: [BaseItem, BartenderMixer] + id: DrinkIceBucket + name: ice bucket + description: A special bucket of refreshy ice. Prohibited use for challenge with the same name! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Ice + Quantity: 200 + - type: Sprite + sprite: Objects/Consumable/Drinks/icebucket.rsi + state: icon + - type: PhysicalComposition + materialComposition: + Steel: 75 diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index 4250669581..86667f094f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml @@ -120,3 +120,28 @@ - Plastic - Trash - Knife + +- type: entity + parent: UtensilBase + id: BarSpoon + name: bar spoon + description: Your personal helper to mix drinks and changes lives. + components: + - type: Tag + tags: + - Metal + - type: Sprite + state: bar_spoon + - type: Item + heldPrefix: spoon + - type: Utensil + types: + - Spoon + - type: MeleeWeapon + wideAnimationRotation: 180 + attackRate: 2 + damage: + types: + Blunt: 2 + - type: Shovel + speedModifier: 0.05 # nah diff --git a/Resources/ServerInfo/Guidebook/Service/Bartender.xml b/Resources/ServerInfo/Guidebook/Service/Bartender.xml index 060c39fca3..b7599fc0d1 100644 --- a/Resources/ServerInfo/Guidebook/Service/Bartender.xml +++ b/Resources/ServerInfo/Guidebook/Service/Bartender.xml @@ -18,6 +18,7 @@ Don't forget containers to serve them in! + ## Drinks diff --git a/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..228d098060c98d18e2dd042dfe3da92ca330d8bd GIT binary patch literal 554 zcmV+_0@eMAP)Px$~zN-clmlwv$SwA}Ul>^=Tq;90T~=aLylej4`ZM zD*$*%#BrQYW3aRYG))5ln5GF`*P$p1JkJATOmu{E4$e6Y!vFwWuUGiK44f=w4k8jy8b8wnqtQruP?yUkG);qH7$72eo|pPaf>-9QHr4oGKM-T)cBABN6VK~1mf&0MSZZ|RQv)K$p1k18eE|-P& zzAZ9H-|uiZOf1WSuIrdirywGzs)}Z_iT!>rHX)867e*gdg07*qoM6N<$g4bQ}&j0`b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json new file mode 100644 index 0000000000..f55a85dc26 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Dezzzix; Discord: dezzzix", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] + } diff --git a/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6c65ca02025aacb218b407e6fe5ecbddcfce6a5a GIT binary patch literal 314 zcmV-A0mc4_P)Px#^hrcPR9J=Wls$@sKoEt$Sr!`fB!(t)07DbQK0}|xBX|ZwQ!`@?J%bpv2qON_ zIMFWbPtrZZZqi>^@Ls*HDjGZ+}l;5<)+5NNG2#yAIX{s)v&7r-zK08ZnFCs&Xp z32B->W8oG+DRo6r#Bm(#`%WCkWLb9oS%6pKd;{NK?0N$pkH_PA02I_&->PH0L;wH) M07*qoM6N<$f>Q*7#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/meta.json new file mode 100644 index 0000000000..f55a85dc26 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Dezzzix; Discord: dezzzix", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] + } diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/bar_spoon-inhand-left.png b/Resources/Textures/Objects/Misc/utensils.rsi/bar_spoon-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fba15fa255f879d0d87f31550a559a4c7abab68d GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_IbKEhE&XX zdutA z`>mkK#p}|pg?zqpeDls#*D9l)>^i?}S5Q}rz?@}L8pk3+zkc*TCefbL*!|dI7tj6G z{B9qAZ4A$G@;X_1BHX6Q{JlHKSzwTnmS+0=jZjj~>w9nO4!pHfXi-=yGX385+EX^V zpZveP%W_$_e%05j-Z^BcR9FQ5Fu6{1-oD!M<3fF03 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/bar_spoon-inhand-right.png b/Resources/Textures/Objects/Misc/utensils.rsi/bar_spoon-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d2b32fd8b8a18fd80925ae90ede3738ffd2c5d55 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtBiahE&XX zduyZMAp@S)MA^j^ObHC)uWF?@SJXV;dxuGSChMWr2NoM2{`V4}wq{AS5F=0*1B1ZC zDM5ytH|STKXw}mao70ag|G#5;|MxP6R52>}~qH5onr>!{mAiZS&>J46O t{}bn4GZlMntK+I&|MzLPx#@<~KNR9J=Wmmv;>Fc3xmmQ4^`12GPdK;Y_o8P32}@Hk{Wf~0~IK+<3*4Pn*p z0fxmfBd=dPkCKt$-ePMjk$I_EBHEdU_PGAzr2zVAg@Pl+j| zgni#X=WW|0F#rG~HX4JJ5{xl8j^pF)HLeK>uB3%IW2FkM31yFCGsw!Oo@4YTS+qSv@(=_P< z)OD>3Fwe6tfchp}*Hsrly#e)2_>Bf`eN31cd7fh!264_`>UsgePg1p2ui!BN0000< KMNUMnLSTY5PJ1T+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/meta.json b/Resources/Textures/Objects/Misc/utensils.rsi/meta.json index 30dd4e8564..77aeb5e3c1 100644 --- a/Resources/Textures/Objects/Misc/utensils.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/utensils.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept; Bar spoon by Dezzzix", "size": { "x": 32, "y": 32 @@ -40,6 +40,17 @@ }, { "name": "plastic_knife" + }, + { + "name": "bar_spoon" + }, + { + "name": "bar_spoon-inhand-left", + "directions": 4 + }, + { + "name": "bar_spoon-inhand-right", + "directions": 4 } ] }