From 9865d8a68011a0d1bb2b938b9bad8988935e1d00 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Fri, 12 Jul 2024 12:07:51 -0500 Subject: [PATCH 1/2] Added A new drink! --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../en-US/reagents/floofstation/drinks.ftl | 2 ++ .../VendingMachines/Inventories/soda.yml | 3 ++- .../Objects/Consumable/Drinks/drinks_cans.yml | 19 +++++++++++++ .../FloofStation/Flavors/flavors.yml | 4 +++ .../FloofStation/Reagents/Drinks/drinks.yml | 20 ++++++++++++++ .../Consumable/Drinks/nnn_can.rsi/icon.png | Bin 0 -> 444 bytes .../Drinks/nnn_can.rsi/icon_open.png | Bin 0 -> 449 bytes .../Drinks/nnn_can.rsi/inhand-left.png | Bin 0 -> 430 bytes .../Drinks/nnn_can.rsi/inhand-right.png | Bin 0 -> 422 bytes .../Consumable/Drinks/nnn_can.rsi/meta.json | 25 ++++++++++++++++++ 11 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/reagents/floofstation/drinks.ftl create mode 100644 Resources/Prototypes/FloofStation/Flavors/flavors.yml create mode 100644 Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 35de5555a29..b69f4934a92 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -210,6 +210,7 @@ flavor-complex-milk = like milk flavor-complex-tea = like tea flavor-complex-ice = like ice flavor-complex-mopwata = like stagnant, dirty water +flavor-complex-nikkonectar = like creamy blueberries. ## Cocktails flavor-complex-long-island = suspiciously like iced tea diff --git a/Resources/Locale/en-US/reagents/floofstation/drinks.ftl b/Resources/Locale/en-US/reagents/floofstation/drinks.ftl new file mode 100644 index 00000000000..0f77ef58b6b --- /dev/null +++ b/Resources/Locale/en-US/reagents/floofstation/drinks.ftl @@ -0,0 +1,2 @@ +reagent-name-NNN = Nikko's Naughty Nectar +reagent-desc-NNN = A sticky, musky white liquid that tastes of blueberries. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 494f05f6a31..f6624966b62 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SodaInventory startingInventory: DrinkColaCan: 3 @@ -7,6 +7,7 @@ DrinkIcedTeaCan: 3 DrinkLemonLimeCan: 3 DrinkFourteenLokoCan: 3 + DrinkNNNCan: 3 emaggedInventory: DrinkNukieCan: 3 DrinkChangelingStingCan: 3 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 38ebc132c9f..f8ada34e648 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -499,3 +499,22 @@ sprite: Objects/Consumable/Drinks/wine_can.rsi - type: Item sprite: Objects/Consumable/Drinks/wine_can.rsi + +#Floof +- type: entity + parent: DrinkCanBaseFull + id: DrinkNNNCan + name: Nikkos Naughty Nectar + description: A can of Nikko's Naughty Nectar! Best not to ask how it's made... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: NikkosNaughtyNectar + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/nnn_can.rsi + - type: Item + sprite: Objects/Consumable/Drinks/nnn_can.rsi diff --git a/Resources/Prototypes/FloofStation/Flavors/flavors.yml b/Resources/Prototypes/FloofStation/Flavors/flavors.yml new file mode 100644 index 00000000000..e9a75f2231f --- /dev/null +++ b/Resources/Prototypes/FloofStation/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: nikkonectar + flavorType: Complex + description: flavor-complex-nikkonectar diff --git a/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml new file mode 100644 index 00000000000..cf39c6e3191 --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml @@ -0,0 +1,20 @@ +- type: reagent + id: NikkosNaughtyNectar + name: reagent-name-NNN + parent: BaseDrink + desc: reagent-desc-NNN + physicalDesc: reagent-physical-desc-creamy + flavor: nikkonectar + color: "#deebff" + recognizable: true + viscosity: 0.15 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + #TO-DO Lust+ + footstepSound: + collection: FootstepSticky + params: + volume: 3 diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..85275913d59c252c72fac32e6c862160f43e3071 GIT binary patch literal 444 zcmV;t0YmPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0Z~arK~z{rWBmXB zKf^!*CMZ2%VAKJl4j6U7fIEP!f+#wx^S`o!U)q!0l4+{{>+L0wsnVezW{U@;h9Ut68Q!7+s4=9S$f zg#^iIAk5DdOoJ>&2CFvhhO$Tm=s|)H+Z!tV2SovT@PncR6b0If5 zW;a-vg6UcLl?>IckhDQ6AS(ofl=M+(N&s07cz5q2l!XWdasgS1ux||{5q`OQ7fkt+r mPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0ai&wK~z{rWBmXB zKf^!*CMZ2%VAKJl4j6U7fIEP!f+#wx6GfAmu`-y>PYw|PQXjz_A_2(`09hUz=E$J0 ztq$g|+O!)?PwSt_aP!J;Mlgp2KvEQdEQk5l!7&7kK^B9+f&FV3)OB1*4o;HOK$xE^ zn9eFp2h$*+t}F)+36cRQ3W&w_hD!gVGCTf1d-VYYZ{L6NznZqoe{Dqxpfc=wabc3u zfP<0p|CH6c7`FGWfr=o&;pZn9_%5DcxN`3~N$G&BY(^kKZi$eZVCXpj7W~u#Bst)~xx0*fD`&yu9t0?fe-I$6ItC?1D3jsMhi_n- r9Lqs~EC)~%jOKz-2aI$FFfafBGBnlT(>WGr00000NkvXXu0mjf#yGQ7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea78e1b319a7a86f8853afafce025de3af472e25 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB24_zf$B>G+x3dhhm>eZq(`_5XHVS$!)@+Vb z$UR{Ff^(8uYF|Q7Wrxh630@wl;u~V6xo0mq!8+$j{JaTfKXlr@+fB&7^CID#mUZlV|NQuNZ%z8)#H%_S zd#;ogPyT#+_LiIPGK-mC2^-9_S@P~(_piszGsKIN?WD6B`kyM*#>G95o<2kR^UVwK zjRwCBdELVQ9@ZDF-d5h47%9Ur?I>dckV?DI*4-qzfLWZ?_<(tg$Uk)sT6fd4 PVa(v^>gTe~DWM4f*yyTr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ea0b1987719a73a48603007700457eca48344592 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB25V0j$B>G+x3dh-F*-`LrN=h9xikmuIB?(V zPNVPz4Ozyi&K4{`wL87kFaDan|3U%l>Ft%=y>H%RrG47xuXKJ^M~`}1_gv3QCZ%UW z5~4&Hmbo%wr5^P6EMI**ul`J2S?@yyP2=$O>Q1vytNy-_^x^Tj`s*svJQMO(&pTJo zfAi~(yWeIlzb>>vfA!z{vGo>*J!ahalQVCh{k;$S*ze2=Ex)zyqn=Mro!NP%3VV^Q z`=?ueQBBY@a<>(2%M4_gA;#K39JNE>{qGNpPa3`2yY*6a^Ts)nCl-GZ>Ues_K`#C- zbCQMegyZ42AMf>h{86d1lJi9kgHJcpfh`(vs;k(a$31(~$qM Date: Fri, 12 Jul 2024 19:29:02 +0200 Subject: [PATCH 2/2] Add #Floofstation comment to SodaInv. Making upstream merge more easy that way. --- .../Prototypes/Catalog/VendingMachines/Inventories/soda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index f6624966b62..d3de4d8dd8d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -7,7 +7,7 @@ DrinkIcedTeaCan: 3 DrinkLemonLimeCan: 3 DrinkFourteenLokoCan: 3 - DrinkNNNCan: 3 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 3 DrinkChangelingStingCan: 3