From 387208b7e7dc75a75063f81da72c0dd76d55a83f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 12 Jul 2024 17:00:24 +0200 Subject: [PATCH 01/17] i think i fixed my shit --- .../en-US/_NF/flavors/flavor-profiles.ftl | 2 + .../reagents/meta/consumable/drink/drinks.ftl | 6 ++ Resources/Prototypes/_NF/Flavors/flavors.yml | 10 ++++ .../_NF/Reagents/Consumables/Drink/drinks.yml | 52 ++++++++++++++++++ .../_NF/Recipes/Reactions/drinks.yml | 22 ++++++++ .../Drinks/ginandsonic.rsi/fill-1.png | Bin 0 -> 560 bytes .../Drinks/ginandsonic.rsi/fill-2.png | Bin 0 -> 558 bytes .../Drinks/ginandsonic.rsi/fill-3.png | Bin 0 -> 552 bytes .../Drinks/ginandsonic.rsi/icon.png | Bin 0 -> 552 bytes .../Drinks/ginandsonic.rsi/icon_empty.png | Bin 0 -> 558 bytes .../Drinks/ginandsonic.rsi/meta.json | 26 +++++++++ .../Drinks/goldencat.rsi/fill-1.png | Bin 0 -> 497 bytes .../Drinks/goldencat.rsi/fill-2.png | Bin 0 -> 492 bytes .../Drinks/goldencat.rsi/fill-3.png | Bin 0 -> 476 bytes .../Consumable/Drinks/goldencat.rsi/icon.png | Bin 0 -> 476 bytes .../Drinks/goldencat.rsi/icon_empty.png | Bin 0 -> 486 bytes .../Consumable/Drinks/goldencat.rsi/meta.json | 26 +++++++++ 17 files changed, 144 insertions(+) create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon_empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index 9ef7d59859a..9b1ae9c02ef 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -1 +1,3 @@ flavor-base-basic = basic +flavor-complex-fast = fast +flavor-complex-greed = like greed \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index 858ae5f354e..043d824e364 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -1,2 +1,8 @@ reagent-name-pumpkin-spice-latte = spiced pumpkin latte reagent-desc-pumpkin-spice-latte = It's autumn somewhere. Smells like cinnamon and cloves. + +reagent-name-gin-and-sonic = gin and sonic +reagent-desc-gin-and-sonic = Why did the hedgehog go to Saturn? To collect its rings! + +reagent-name-golden-cat = golden cat +reagent-desc-golden-cat = Legends say the golden cat sold a burger for 100000 spesos. Has a metallic smell. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 931dae9501d..441beb2acb3 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -2,3 +2,13 @@ id: basic flavorType: Base description: flavor-base-basic + +- type: flavor + id: fast + flavorType: Complex + description: flavor-base-fast + +- type: flavor + id: greed + flavorType: Complex + description: flavor-complex-greed \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index ebc6a5b1264..3ead9f0bef8 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -23,3 +23,55 @@ metamorphicMaxFillLevels: 2 metamorphicFillBaseName: fill- metamorphicChangeColor: false + +- type: reagent + id: GinAndSonic + name: reagent-name-gin-and-sonic + parent: BaseDrink + desc: reagent-desc-gin-and-sonic + physicalDesc: reagent-physical-desc-aromatic + flavor: fast + color: "#3061e3" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: GinTonic + amount: 0.2 + - !type:AdjustReagent + reagent: Desoxyephedrine + amount: 0.1 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/ginandsonic.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: GoldenCat + name: reagent-name-golden-cat + parent: BaseDrink + desc: reagent-desc-golden-cat + physicalDesc: reagent-physical-desc-aromatic + flavor: greed + color: "#eed037" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Whiskey + amount: 0.2 + - !type:AdjustReagent + reagent: Rum + amount: 0.2 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/goldencat.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index 670fadacde2..1dc37ca0e2c 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -22,3 +22,25 @@ amount: 1 products: PumpkinSpiceLatte: 6 + +- type: reaction + id: GinAndSonic + reactants: + GinTonic: + amount: 1 + Desoxyephedrine: + amount: 1 + products: + GinAndSonic: 2 + +- type: reaction + id: GoldenCat + reactants: + Whiskey: + amount: 1 + Rum: + amount: 2 + Gold: + amount: 2 + products: + GoldenCat: 5 \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2c513e2933a4a08d9f7209daf4d3aedcab7d5d4e GIT binary patch literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|dINkyTm^(= zbmR=P)tuL8xW7@ipW7z`NgHC@1M8JIk+&S zhN!jrL~RY4`^=A_yE|z~`Lff~F2B2MXPs&hx!Jhmp4rhaxv#FpMfdbnEZwkt$GvlJ zXZe<$s91ky=Ko)LmH!v5`G4{1w-*oo|Njqk1yC^r86-Ytd#tPq6w)sV@(X4FN)rjx z%I*Hktoh3W^q-igi(`mI@7hZT^A0QUus!&}aI%O=Rb0C3QnK{a@AZ2mlQ=RjZab`F zI`!v%rB?<#|0AP+sQzbem|t{YL+jgf^BZhud}7*_6y}wE)S>^e$;-Tdx60Xm|9i#B zxTl`kpvC)KLYOhLphw>!>42!vhAWI!7g<{z)-mU>c0BpZF0p(g1H&So4}Iznmd$HC z+ROM!SkOTBq-Fi*KTEb8IxPC&<(c44j|USQv&#$STQe|TGcLHyr^Wan-kEV{ro%7s zgf*59J%;9g?lv9N3u8OTX>PjyebU;+k8*53pFVBn+EX>_$_2*A6_Fo%gEk#{P?hOb zJGI*D`tF}B#Zz?Tg)@q^RUgebFmv|OX{MDgXE>aEduvL^*1P}rs{CL(P+-_t?5Uvw P3|t0JS3j3^P67z`NgHC@1M8JIk+&S zhN!jrL~RY4`^=A_yE|z~`Lff~F2B2MXPs&hx!Jhmp4rhaxv#FpMfdbnEZwkt$GvlJ zXZe<$s91ky=Ko)LmH!v5`G4{1w-*oo|Njqk1yC^r86-Ytd#tPq6w)sV@(X4FN)rjx z%I*Hktoh3W^q+{Qi(`mI@7hbJ^A0Nrum(gltPEGEHfDA_XS8wB|NndV@(TiPyQ+67 z?{J^NWAJT$>5uqN_6+}m&mENix8w5l!#r(!8dgTMP6!g1aC*^{InUOARwIXs?8qV=P@ZGvX^{>WB%OsY9cD9TF z2IWF!hA%7+1h%ED-ECQwG-KhjvkV>o41?PR&=>)Myt=k^uc6{ZP#!0jHuGaZh_c#0L18Mzm!`;6xYRv@( OErX}4pUXO@geCxH)f5{5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..ef3020481da6bcdecdca519a18be1a6f7e498b9f GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|dINkyTm^(= zbmR=P)tuL8xW7@ipW7z`NgHC@1M8JIk+&S zhN!jrL~RY4`^=A_yE|z~`Lff~F2B2MXPs&hx!Jhmp4rhaxv#FpMfdbnEZwkt$GvlJ zXZe<$s91ky=Ko)LmH!v5`G4{1w-*oo|Njqk1yC^r86-Ytd#tPq6w)sV@(X4FN)rjx z%I*Hktoh3W^dFz6i(`mI@7hbY`9~CZ*dA0gT<}?tvhiU+UJm=e|L0dL*8C`1@ixG_ zo#nmo5y@#!?O*roe^SrzA(&6%e1+Xl@j|xZdj~>tyfW8HyeKtw^Zz_Wh*>Uu5!1bR zhMtepmiy+e8O7UMaKTr1=cj8I@W;u!U_lV{iyzuq$Mk_r-Wag@J>d zAmitWd-(egC_fd=%VTYHo42})$Bz3$5&Qpr%mNAa%>F5hjTrt(Nofc(e%jCQ`VB*6 z5p(zLyBRG0$5OZMwn$mcS2^>Mo{RBhGdEq~fRJPA7}c5O?`%uc7z`NgHC@1M8JIk+&S zhN!jrL~RY4`^=A_yE|z~`Lff~F2B2MXPs&hx!Jhmp4rhaxv#FpMfdbnEZwkt$GvlJ zXZe<$s91ky=Ko)LmH!v5`G4{1w-*oo|Njqk1yC^r86-Ytd#tPq6w)sV@(X4FN)rjx z%I*Hktoh3W^dFz6i(`mI@7hbY`9~CZ*dA0gT<}?tvhiU+UJm=e|L0dL*8C`1@ixG_ zo#nmo5y@#!?O*roe^SrzA(&6%e1+Xl@j|xZdj~>tyfW8HyeKtw^Zz_Wh*>Uu5!1bR zhMtepmiy+e8O7UMaKTr1=cj8I@W;u!U_lV{iyzuq$Mk_r-Wag@J>d zAmitWd-(egC_fd=%VTYHo42})$Bz3$5&Qpr%mNAa%>F5hjTrt(Nofc(e%jCQ`VB*6 z5p(zLyBRG0$5OZMwn$mcS2^>Mo{RBhGdEq~fRJPA7}c5O?`%uc7z`NgHC@1M8JIk+&S zhN!jrL~RY4`^=A_yE|z~`Lff~F2B2MXPs&hx!Jhmp4rhaxv#FpMfdbnEZwkt$GvlJ zXZe<$s91ky=Ko)LmH!v5`G4{1w-*oo|Njqk1yC^r86-Ytd#tPq6w)sV@(X4FN)rjx z%I*Hktoh3W^q+{Qi(`mI@7hae`&txu7!s-(BK-ySZZSAw`EF9>|LeCGJ#}w?^Dc3A zM$j+M4XLyK8GrlX{g+B@&Cv+B}`O-w;`^S(QuMHLpY;S>j$hH5U=eVTXDV0Wa+!MA2^zRU$2TQ&9tdWA{E==*l|7x}-e zGT(n-p5p0r_Fuau3lx?uxcWBg@Xh3xZyZ+cUdt^Qz5l=Mk`KJ~Iffq61u=(#LCfIj L>gTe~DWM4fxHtz5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json new file mode 100644 index 00000000000..08387bc35d8 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..04783e9c8042b8c68c7aab20787766a702711af3 GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|(gJ)!T=#kD z-zal=b!F9)Wkoyk14`^I?KO<%X_!8-cKKeW^lzQXzvqd`$9?TOJ=9{HByH@3{5lz? zzSMc~_5c6>2TtGVp1mb1v%|_IO-eh-!vK&enjAZ>3c)wog0Mnh7-j-39Y5 z{x2Rt82_DpD+I1kUG*BhCxem~8uwqf1wjLm8vq?CpK zF{{k~@R`SK;^coSM>RjHm@b{>*nQ!r!<=H-gjuXhR8q5+-aI#N+2%P<73Hg6@96&Q zb5iE+!7~$!{g;YL%{uKbLh*2~7Y5rQ_`Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..520a678b25e77a623d4436edd73b33e75e4fcd60 GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|(gJ)!T=#kD z-zal=b!F9)Wkoyk14`^I?KO<%X_!8-cKKeW^lzQXzvqd`$9?TOJ=9{HByH@3{5lz? zzSMc~_5c6>2TtGVp1mb1v%|_IO-eh-!vK&enjAZ>3c)wog0Mnh7-j-39Y5 z{x2Rt8WsNzb& zA@hb5?)AHO2pPUm7F+(J?}@;yX0e5z*$R6q874yu9etgo=rEskM~-f z7tnGKPpCR_W9=5E!*eoDu2<^K2)-^BY1iCgH9_bJ>zrcIBwO#F-gT@pF>~K~%4)v6 z&-%eHz5N_R>H7q=E?l~&*K(J8hORB+)*HnKPU)2XXYke4nW`(<6AKJK22WQ% Jmvv4FO#oQZ-ueIl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4d622d76a66f4b36d40ddf711d23a24c4e0cf8 GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|(gJ)!T=#kD z-zal=b!F9)Wkoyk14`^I?KO<%X_!8-cKKeW^lzQXzvqd`$9?TOJ=9{HByH@3{5lz? zzSMc~_5c6>2TtGVp1mb1v%|_IO-eh-!vK&enjAZ>3c)wog0Mnh7-j-39Y5 z{x2Rt8`rC(Vo#p@?L(4J$-+k%wu!RM*luet uA-W|spZ(Bz);&7+8*ja_dzd?IpZ>H@`ckrzEcU<2TtGVp1mb1v%|_IO-eh-!vK&enjAZ>3c)wog0Mnh7-j-39Y5 z{x2Rt8`rC(Vo#p@?L(4J$-+k%wu!RM*luet uA-W|spZ(Bz);&7+8*ja_dzd?IpZ>H@`ckrzEcU<2TtGVp1mb1v%|_IO-eh-!vK&enjAZ>3c)wog0Mnh7-j-39Y5 z{x2Rt8wb@LqC9{+GQI4-u;jsMw9`Rb`RIoa4A{fuaQ_0{MA$C^s@Tk8ZXdKb3b zXPBg1^Y)ZI#77EjZ3mVO`#T4H;L^l37f8eLE!`hSc87?rK312LG zgyD;ph(gt!pN<9#rqWBbso`@Olmk!JhuCyP%5Lyp1I)z4*}Q$iB} Df|A>H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json new file mode 100644 index 00000000000..08387bc35d8 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} From 79f6129c41c48c757ded51ecd035c533ff3bcc8c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 12 Jul 2024 17:44:18 +0200 Subject: [PATCH 02/17] changed reagent into ethanol --- .../_NF/Reagents/Consumables/Drink/drinks.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 3ead9f0bef8..c811d91c860 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -27,7 +27,7 @@ - type: reagent id: GinAndSonic name: reagent-name-gin-and-sonic - parent: BaseDrink + parent: BaseAlcohol desc: reagent-desc-gin-and-sonic physicalDesc: reagent-physical-desc-aromatic flavor: fast @@ -38,8 +38,8 @@ - !type:SatiateThirst factor: 2 - !type:AdjustReagent - reagent: GinTonic - amount: 0.2 + reagent: Ethanol + amount: 0.3 - !type:AdjustReagent reagent: Desoxyephedrine amount: 0.1 @@ -53,7 +53,7 @@ - type: reagent id: GoldenCat name: reagent-name-golden-cat - parent: BaseDrink + parent: BaseAlcohol desc: reagent-desc-golden-cat physicalDesc: reagent-physical-desc-aromatic flavor: greed @@ -64,11 +64,8 @@ - !type:SatiateThirst factor: 2 - !type:AdjustReagent - reagent: Whiskey - amount: 0.2 - - !type:AdjustReagent - reagent: Rum - amount: 0.2 + reagent: Ethanol + amount: 0.4 metamorphicSprite: sprite: _NF/Objects/Consumable/Drinks/goldencat.rsi state: icon_empty From 39a0d9bbd26b2af4e14f5999b41c31be2111e349 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 14 Jul 2024 19:50:14 +0200 Subject: [PATCH 03/17] Welcome to the Junglegit add --all --- Resources/Audio/_NF/Effects/fart.ogg | Bin 0 -> 8479 bytes .../en-US/_NF/flavors/flavor-profiles.ftl | 3 +- .../reagents/meta/consumable/drink/drinks.ftl | 5 ++- Resources/Prototypes/_NF/Flavors/flavors.yml | 7 +++- .../_NF/Reagents/Consumables/Drink/drinks.yml | 30 ++++++++++++++++++ .../_NF/Recipes/Reactions/drinks.yml | 14 +++++++- .../_NF/SoundCollections/emotes.yml | 5 +++ .../Drinks/pineappleblast.rsi/fill-1.png | Bin 0 -> 583 bytes .../Drinks/pineappleblast.rsi/fill-2.png | Bin 0 -> 583 bytes .../Drinks/pineappleblast.rsi/fill-3.png | Bin 0 -> 574 bytes .../Drinks/pineappleblast.rsi/icon.png | Bin 0 -> 574 bytes .../Drinks/pineappleblast.rsi/icon_empty.png | Bin 0 -> 583 bytes .../Drinks/pineappleblast.rsi/meta.json | 26 +++++++++++++++ 13 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 Resources/Audio/_NF/Effects/fart.ogg create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json diff --git a/Resources/Audio/_NF/Effects/fart.ogg b/Resources/Audio/_NF/Effects/fart.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d7391c6b48fb3fb0b2fc882c6a42a3df29e0b8bd GIT binary patch literal 8479 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 O0@u^k&t;ucLK6Vtk^~9> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7705e5d0be8a16faef7e931976b89e15c3b665bb GIT binary patch literal 574 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|)&=;4xC#i# z=*Ssnt2wXHaDSt2KgHAPUaZy2R`bs*jD1aw^Lz{z<=UT{4cb8ulu z4N+_LiP{=8_n99TdgD*rE9^Z(-2Z!aGF|Nmc5Q&P}Wo<~|lP*V)TmeA3Y*OoN4l2+7L z1iBF!^i1|y?XKwx6tXG_@(X4F>L(H$|Nm$wSgCQDyRy`OaiM*|KvRBrx;Tbd^tMi7 z>}xjQVfoy0q1ImsL6f|E>HFgAJ8cctT32d9mA2Z>J#S@)+7}H#&cqv27(;oO8d?; zbe~8}{20%+r;$}*;cT914Z21P9&C3wJK@M8{)pIL3#42mSQG-Ue^P&My>EL^2`5it zulmtu)@DxMLr?Z(hpsoCVp#P1-a3b?k{QK*f3=fpSE?7jSQgju_#waN&cx#(T*u#o O0@u^k&t;ucLK6Vtk^~9> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..c52b763739ebbc27b51aec25f3f789bb86a18fcf GIT binary patch literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|)&=;4xC#i# z=*Ssnt2wXHaDSt2KgHAPUaZy2R`bs*jD1aw^Lz{z<=UT{4cb8ulu z4N+_LiP{=8_n99TdgD*rE9^Z(-2Z!aGF|Nmc5Q&P}Wo<~|lP*V)TmeA3Y*OoN4l2+7L z1iBF!^i1|y?XKwx6tXG_@(X4F>L(H$|Nm$wSgCQDyRy`OaiM*|z_4KSba4!^=xv=8 znAc*!<5J9WgL}*0{*;@u9^Cn#V$HW@P2?=u4v|OhX$2bDKNqCd)+hwL-V(@`ZmCb$avQ z8<)nNw>=A Date: Sun, 14 Jul 2024 19:55:57 +0200 Subject: [PATCH 04/17] Jungle Warfaregit add --all --- .../_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json index 08387bc35d8..555c2d8f78c 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json @@ -23,4 +23,4 @@ "name": "fill-3" } ] -} +} \ No newline at end of file From 25ee1d799edb3cff668c7c78f93c429d791e8a15 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 14 Jul 2024 20:08:26 +0200 Subject: [PATCH 05/17] did an oopsie with the sprites and added an unwanted file --- .../Prototypes/_NF/SoundCollections/emotes.yml | 7 +------ .../Drinks/pineappleblast.rsi/fill-1.png | Bin 583 -> 1078 bytes .../Drinks/pineappleblast.rsi/fill-2.png | Bin 583 -> 1078 bytes .../Drinks/pineappleblast.rsi/fill-3.png | Bin 574 -> 1014 bytes .../Drinks/pineappleblast.rsi/icon.png | Bin 574 -> 1014 bytes .../Drinks/pineappleblast.rsi/icon_empty.png | Bin 583 -> 1078 bytes 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Resources/Prototypes/_NF/SoundCollections/emotes.yml b/Resources/Prototypes/_NF/SoundCollections/emotes.yml index 9ee9d2294f3..6df7a996ade 100644 --- a/Resources/Prototypes/_NF/SoundCollections/emotes.yml +++ b/Resources/Prototypes/_NF/SoundCollections/emotes.yml @@ -3,9 +3,4 @@ files: - /Audio/_NF/Voice/Human/belch_1.ogg - /Audio/_NF/Voice/Human/belch_2.ogg - - /Audio/_NF/Voice/Human/belch_3.ogg - -- type: soundCollection #You told me to do it myself :P - ra.Y - id: Fart - files: - - /Audio/_NF/Effects/fart.ogg + - /Audio/_NF/Voice/Human/belch_3.ogg \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-1.png index c52b763739ebbc27b51aec25f3f789bb86a18fcf..5c75595395bdf319abcd9e43008e275a28f3f82b 100644 GIT binary patch delta 1068 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 O0@u^k&t;ucLK6Vtk^~9> diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon.png index 7705e5d0be8a16faef7e931976b89e15c3b665bb..f85e14854039377a9237e81122e9131136098ef0 100644 GIT binary patch delta 1003 zcmV z#(zt4MOq?dsTL~3loi8hdoJK00SpxAA;(?{?2GzMcJMmhkGO=6@5K(f@A_;OZ;CdSX#?QWnPAes_5#)~l{_>~z7z7M}@!(Ws_x>4hI!r-#o!s$bWg}me z>vwcUr2p*;y?@`PFcaY)uPX)Kd-JwZ#tI2!BmnlmoG0-^vl2eP{eDgKE;6MA0Jo82X2(IV-{NvU_pqY7&#4h+KHFjExEmtrw?EKq0Qx2$=j(rs}9M38@3^?39FT^s6 zUP7t?Z`sCkG%Yus+nh{kPNun!j*_|iZJ(Aa@Enb|Y_qlP7xs}-0@FH&Q3}>40TPfPrNK^Qfnm{{Omh&4U}eJYune8%LvezR`E{hC_zXQ6~-XvzuC4)H|OWlU32vV z`aqiY@sdT)jPta5DlDAis}N@A*X=T##KmR!Fngiv5}Tvl?G#S~zE2CaiX3u9f{jFdVD7c(<)o11izPkwPVDuq0Lt z$A608vqlQWl)g-mQWKGa3=A70aE2i**8t29;#AJS$?khG6_VbXLmQ|!BsE9o8j#Z9 zfEqiI#R0YaU}{dL)Er5@A!!4>HHWE?ob0~8`+uO!x*IFHSx?<8X)qisE**()B}`(I zGe`+q34_?A5k$Dx{fW^;mx4pZG8|1b&1AYDjufs9u8xQ!2qp74uYZ#Sz|H5|4cb8ulu z4N+_LiP{=8_n99TdgD*rE9^Z(-2Z!aGF|Nmc5Q&P}Wo<~|lP*V)TmeA3Y*OoN4l2+7L z1iBF!^i1|y?XKwx6tXG_@(X4F>L(H$|Nm$wSgCQDyRy`OaiM*|KvRBrx;Tbd^tMi7 z>}xjQVfoy0q1ImsL6f|E>HFgAJ8cctT32d9mA2Z>J#S@)+7}H#&cqv27(;oO8d?; zbe~8}{20%+r;$}*;cT914Z21P9&C3wJK@M8{)pIL3#42mSQG-Ue^P&My>EL^2`5it zulmtu)@DxMLr?Z(hpsoCVp#P1-a3b?k{QK*f3=fpSE?7jSQgju_#waN&cx#(T*u#o O0@u^k&t;ucLK6Vtk^~9> diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/icon_empty.png index c52b763739ebbc27b51aec25f3f789bb86a18fcf..5c75595395bdf319abcd9e43008e275a28f3f82b 100644 GIT binary patch delta 1068 zcmV+{1k?M+1hxo}8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00ZzzL_t(og~gV?Z`(!` z$3I8%L|P(csTL~3l4ZwD0`v#a0uCC$K!FYc+M!E;Y?*@&MV79elc{U}g|1mTcIecl z$WWk00XKF0J9go~vMtM`_~SZIq%E6tXajK`K#<3KKfd?w`+wdYJbIvbhoW`<>B6H2 z>h_aw-W`z1J9m}cYACzaxPA~x(8)V@75DEcyVX!L-+ggyK(yqeWIM3+UpjGJTap4; z`|VfJ8G9dq)h+YdKnOV527un@pFyJ*1DJJF#ibv95pM&42GHBw70J7^2kds^pet6Y z__nf$gEG@!PJpYUrd8Pm~#x*=I9PyVWxd0OB_7uG_N!tr(jO#4>29XyqV@61s zwh=rpWFs^XQfE#E>DWH@aV!Psnf@fHQ95Sc;k*+gAGns{KK#qx^8>eO9Mt3mi+~jGN3av@-ihE`Vgu z4qd@U81Iy0DI7~NCxc9zIT@rn02`r^lK9FTI4y^+;GkRrKMvL*1VWG?rN**vfM!tb z4^j|sl1p(QS^ zsnbmH*)*qYb%j0sJGuNGkzB3S#aH5RKVGSQ?5F=vm*G04^a0RJ1KT~(tqgS!_r2V+;8J~H#849> zeSbjHM9c-ikZ~sJj&}7vu(cDfzT1mf8?ryC@o5H`Hq$a>vLREhths`2FBrt~cKtJcFa0Yf(UW|>rx>A00004cb8ulu z4N+_LiP{=8_n99TdgD*rE9^Z(-2Z!aGF|Nmc5Q&P}Wo<~|lP*V)TmeA3Y*OoN4l2+7L z1iBF!^i1|y?XKwx6tXG_@(X4F>L(H$|Nm$wSgCQDyRy`OaiM*|z_4KSba4!^=xv=8 znAc*!<5J9WgL}*0{*;@u9^Cn#V$HW@P2?=u4v|OhX$2bDKNqCd)+hwL-V(@`ZmCb$avQ z8<)nNw>=A Date: Mon, 15 Jul 2024 18:21:59 +0200 Subject: [PATCH 06/17] I wish for actual brewing but here we are making torpedo juice --- .../en-US/_NF/flavors/flavor-profiles.ftl | 3 +- .../reagents/meta/consumable/drink/drinks.ftl | 5 +- Resources/Prototypes/_NF/Flavors/flavors.yml | 7 +- .../_NF/Reagents/Consumables/Drink/drinks.yml | 29 ++++++++- .../_NF/Recipes/Reactions/drinks.yml | 14 +++- .../Drinks/torpedojuice.rsi/fill-1.png | Bin 0 -> 2003 bytes .../Drinks/torpedojuice.rsi/fill-2.png | Bin 0 -> 1976 bytes .../Drinks/torpedojuice.rsi/fill-3.png | Bin 0 -> 1913 bytes .../Drinks/torpedojuice.rsi/icon.png | Bin 0 -> 1913 bytes .../Drinks/torpedojuice.rsi/icon_empty.png | Bin 0 -> 2027 bytes .../Drinks/torpedojuice.rsi/meta.json | 61 ++++++++++++++++++ 11 files changed, 112 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index 13df3bd419d..4384d462eae 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -1,4 +1,5 @@ flavor-base-basic = basic flavor-complex-fast = fast flavor-complex-greed = like greed -flavor-complex-blast = like jungle warfare \ No newline at end of file +flavor-complex-blast = like jungle warfare +flavor-complex-torpedo = like convoy raiding \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index 42a48895d62..f2935c95034 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -8,4 +8,7 @@ reagent-name-golden-cat = golden cat reagent-desc-golden-cat = Legends say the golden cat sold a burger for 100000 spesos. Has a metallic smell. reagent-name-pineapple-blast = pineapple blast -reagent-desc-pineapple-blast = When the trees start talking... Smells tropical with a sulfuric note. \ No newline at end of file +reagent-desc-pineapple-blast = When the trees start talking... Smells tropical with a sulfuric note. + +reagent-name-torpedo-juice = torpedo juice +reagent-desc-torpedo-juice = The joys of drinking and unristricted submarine warfare combined! Has a strong alcoholic smell. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 651197c6edb..4a97bd05225 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -16,4 +16,9 @@ - type: flavor id: blast flavorType: Complex - description: flavor-complex-blast \ No newline at end of file + description: flavor-complex-blast + +- type: flavor + id: torpedo + flavorType: Complex + description: flavor-complex-torpedo \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 46f93a26a86..8132b2ed90d 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -36,7 +36,7 @@ Drink: effects: - !type:SatiateThirst - factor: 2 + factor: 0.5 - !type:AdjustReagent reagent: Ethanol amount: 0.3 @@ -62,7 +62,7 @@ Drink: effects: - !type:SatiateThirst - factor: 2 + factor: 0.2 - !type:AdjustReagent reagent: Ethanol amount: 0.4 @@ -85,7 +85,7 @@ Drink: effects: - !type:SatiateThirst - factor: 2 + factor: 1 - !type:AdjustReagent reagent: Ethanol amount: 0.4 @@ -101,4 +101,27 @@ state: icon_empty metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: TorpedoJuice + name: reagent-name-torpedo-juice + parent: BaseAlcohol + desc: reagent-desc-torpedo-juice + physicalDesc: reagent-physical-desc-aromatic + flavor: torpedo + color: "#d4db9a" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.8 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.6 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/torpedojuice.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- metamorphicChangeColor: false \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index 38dcff8461b..d42637332de 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -55,4 +55,16 @@ Napalm: amount: 1 products: - PineappleBlast: 5 \ No newline at end of file + PineappleBlast: 5 + +- type: reaction + id: TorpedoJuice + reactants: + JuicePineapple: + amount: 2 + Ethanol: + amount: 2 + Thermite: + amount: 1 + products: + TorpedoJuice: 5 \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..41cf4142b40403a3171a48d97c17c55599f01d22 GIT binary patch literal 2003 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 KMNUMnLSTZOvDx_m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..1d02fd5edf704da03a9c71127d26f242762cff60 GIT binary patch literal 1913 zcmV-<2Zs2GP)Px+Gf6~2RCt{2np;d;_Z`PS2MqQJ;n*=QF?JZ2sK6RhEr_xV)X-SqSt1>At(HGiExXaomyO6d?TMsQv%TNL$spHsK2?S#o z%+37waPYwwE(Xm6+5Ns8|8M8~K0p4K-~ayyzR(xiOzpjLw`RRd@`Ir((|28XGS_9)A~Qs&RbV9o1UQ{e zQCC+d2_eK-RTBj_dRb5JKU`8L0BWV|Wy|xkbF|-|i13!11vZ<1OTk|%sS)3H{cA%u ztpyIT@DcrZ_=7FugNMPtDe$LHpB8~YKui04zGdrKtyb-~qA0YswytPj1URDAzyWMk zh5YEf9_dfdJS&1j<68b^bbzhQzw8H|E~*v)_MNk;F^%6@_2tRxk013NTdn-JBjYc> zShVBVb6>B0c_Z(?efu`YwwV+1e|fo&izC-H)~AcA#qSRu0HEUhnFJqX5`PSQe6K3A zPXpj7+spU9U$POKQm%L2a#3Af4X7i_@AuQu(GdfCapbz>a5%)FLx*B`o68$SbPSNL z{6G1_uZU*{m0uT0EVqVKn$)MKzMjASU2k{ECVS1_uW@di1C`d-kjZFyiwv zLl6MB+s)6P|Alz%)N!fX<&+@(`2hmK2>@PgKPgNmwP$y`oRY4&yg|f+M%`mGs`5PPLmU3Q(E0j;CH*-Jn*Rl zAbKzW==Mw56z0e@33a_w4t_%`oT^;qvcN`&L zY3&}Fn@VU?l(S9yz1yH9lxH%(?jH;DkY%8${S*Mo!KI+0sJ6lV zmzT$h6DK5q){1Y6bm#y4TYCtFLU=qL>~;&XEOYMMISD{_dHMku%#dXOpy~aq+6%)w z)lGtTn>WUYH?Fu+2AGU0Y$olGF)%QYP#%Hzcs%3+X0w@zu_+u5ht&Lo=R{dqp;k8& z_>Hm!S)Qb;t4nHcZx@kx06=&B&NYcI?GqTxJe8%RS6Xz0m}c^ZI<2@(?wAiuE2Suk zLLd;}yU#wFBFtD_=ozA2GBvG699T812w4o+U0U-@R7V|=+{mimmCg<0Cn%*?Q%-#&adPfF)VKVOePbNbCAO& zbxQ|9*Y8}DCM>1G0em@UI{^0os7Il*=g$*;jc}uXh^ntF_56=N^kFMb&CRmcy#PSu zEIofR2s@X`U9Q;aI3C^?nuvi0v{NxT>T)EV`H#HNqILS{6G1sUXZgDTtH~|^%=v2Z zj_nIPYBTZpE_M6U_0j!=Hrw?2guH0!b9Aeg1IW3#Yt{iM+Zoo@K!;0?DSPR5Aff&% zv$F|j;m74X0BUZ1n&5*>;!o-(%xba=dx4(4r3TFjzv;P~l(DH$b%~i>mat~a>G%EA z=+#4!m2Sm$%uaB`J0QJodrZvB7A-%S+rV_@U%OiZIl3Hd<{c<<7>l9?Nj|^lq1>Ze zO?DyY=Em4E?7JyptyC{^R&d04u8}jl4~Y4wyiY_psc)t;e^MPFSEt86ImNw+1x5p_ zPj#tQo?$!w$teOMN!ts|bU>wjk0`b*MYxX@XKMk-iyesp zR4Ns3OY}OpoGq31J*)m>WHKEf-T9N60ireF4pUmN-d3s6-O+3w-?egivLk#wN;m#B zJHU2Bh?%+AbuT#maHhdR;{r2t3!7?7y7T`J*u;`4XJHqh00000NkvXXu0mjf`Vypq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1d02fd5edf704da03a9c71127d26f242762cff60 GIT binary patch literal 1913 zcmV-<2Zs2GP)Px+Gf6~2RCt{2np;d;_Z`PS2MqQJ;n*=QF?JZ2sK6RhEr_xV)X-SqSt1>At(HGiExXaomyO6d?TMsQv%TNL$spHsK2?S#o z%+37waPYwwE(Xm6+5Ns8|8M8~K0p4K-~ayyzR(xiOzpjLw`RRd@`Ir((|28XGS_9)A~Qs&RbV9o1UQ{e zQCC+d2_eK-RTBj_dRb5JKU`8L0BWV|Wy|xkbF|-|i13!11vZ<1OTk|%sS)3H{cA%u ztpyIT@DcrZ_=7FugNMPtDe$LHpB8~YKui04zGdrKtyb-~qA0YswytPj1URDAzyWMk zh5YEf9_dfdJS&1j<68b^bbzhQzw8H|E~*v)_MNk;F^%6@_2tRxk013NTdn-JBjYc> zShVBVb6>B0c_Z(?efu`YwwV+1e|fo&izC-H)~AcA#qSRu0HEUhnFJqX5`PSQe6K3A zPXpj7+spU9U$POKQm%L2a#3Af4X7i_@AuQu(GdfCapbz>a5%)FLx*B`o68$SbPSNL z{6G1_uZU*{m0uT0EVqVKn$)MKzMjASU2k{ECVS1_uW@di1C`d-kjZFyiwv zLl6MB+s)6P|Alz%)N!fX<&+@(`2hmK2>@PgKPgNmwP$y`oRY4&yg|f+M%`mGs`5PPLmU3Q(E0j;CH*-Jn*Rl zAbKzW==Mw56z0e@33a_w4t_%`oT^;qvcN`&L zY3&}Fn@VU?l(S9yz1yH9lxH%(?jH;DkY%8${S*Mo!KI+0sJ6lV zmzT$h6DK5q){1Y6bm#y4TYCtFLU=qL>~;&XEOYMMISD{_dHMku%#dXOpy~aq+6%)w z)lGtTn>WUYH?Fu+2AGU0Y$olGF)%QYP#%Hzcs%3+X0w@zu_+u5ht&Lo=R{dqp;k8& z_>Hm!S)Qb;t4nHcZx@kx06=&B&NYcI?GqTxJe8%RS6Xz0m}c^ZI<2@(?wAiuE2Suk zLLd;}yU#wFBFtD_=ozA2GBvG699T812w4o+U0U-@R7V|=+{mimmCg<0Cn%*?Q%-#&adPfF)VKVOePbNbCAO& zbxQ|9*Y8}DCM>1G0em@UI{^0os7Il*=g$*;jc}uXh^ntF_56=N^kFMb&CRmcy#PSu zEIofR2s@X`U9Q;aI3C^?nuvi0v{NxT>T)EV`H#HNqILS{6G1sUXZgDTtH~|^%=v2Z zj_nIPYBTZpE_M6U_0j!=Hrw?2guH0!b9Aeg1IW3#Yt{iM+Zoo@K!;0?DSPR5Aff&% zv$F|j;m74X0BUZ1n&5*>;!o-(%xba=dx4(4r3TFjzv;P~l(DH$b%~i>mat~a>G%EA z=+#4!m2Sm$%uaB`J0QJodrZvB7A-%S+rV_@U%OiZIl3Hd<{c<<7>l9?Nj|^lq1>Ze zO?DyY=Em4E?7JyptyC{^R&d04u8}jl4~Y4wyiY_psc)t;e^MPFSEt86ImNw+1x5p_ zPj#tQo?$!w$teOMN!ts|bU>wjk0`b*MYxX@XKMk-iyesp zR4Ns3OY}OpoGq31J*)m>WHKEf-T9N60ireF4pUmN-d3s6-O+3w-?egivLk#wN;m#B zJHU2Bh?%+AbuT#maHhdR;{r2t3!7?7y7T`J*u;`4XJHqh00000NkvXXu0mjf`Vypq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..bd558c2fc9dad66287c2c1f52da2523b47589667 GIT binary patch literal 2027 zcmVPx+rAb6VRCt{2nr&=T*BQruH*sQLAlJq*!Ldn`z%T(qw?tWrOh;0-7P=w&sVeHW zwrZyNXI&3y zX=xGF)zy*^LiCl@l7GFK$+Z5Li>n1dm6ZM1{JiWO?fNqjo^_+ZO!Lnw_;baT;`z?M zP06N-z#$esqOG?+oi#pq68tj)fAHWz;rIKs`<|Yj$Ck5Nt=hGsC~VudZCv{zz!4<_ z2e6eD@clC20JE9@u`hU`uv`Gx7Y?h&)V!GV;i>93=UW?+J@t*8<=;dMLpMnZzFhAK$7< z?Lz=~OILC7dPjr4WT|H=hNYs@JGcJs#a|x!-el^8I@*d}Dl2i7mzM)-&+_?vG&VNI zz@F{CD!JWmv1!w$7~Zx0YxYEYhi z{_`o5jw9pFt>};a$(Kr5|M_#PHdicnJ+diA4u^xAH*d0K%NB9?@L>s{yQhl~0RTK6 z4{yHl6S3#OZs|m4iv;P<58w|B0PxPP{la820dS(TMbgzRUL)ecBa)YdRpX3C^deRTTNM%Xx+IP zD`+~d*2x5ZkH>>vucyAgUW{f1@p#4t8tM0C>qV^?BLA&75?o{efujL-rV>tm$BoFX3IzJATSmNb&otqs8^UX zN4s8PP!jSpnP1xG_@;O+OBdAxoLXkcsrG;yUwN0NpZ$Q6d_5M$Fe$j{Qm=mqi(+6! z{T?l?tE-F1VlNN~aPi_r?)~NOELitdWLf6!-MbVN6fk%0T=wnTCjn#v|5M*tO)wb5 z>-A!{+mU6NBS(%%0J=|x?t{S$St?lV#}~B+h8OD82hZt>dHL}RozqJHm!Ssvurv18J%UAshNJpiD) zdi%1(QxyV(ndh=}G)s>hA%+;dt_~|6Q*8J~J{v>mP;zeawp#MWG76tF@yo=?>R;+S}dlTKB`Y1|VsCU6q&P zQWQmnkCWFMyLRgA?9|{RY0=Po4(yiPZnpq6_CL|tBBeXOl4r#5DD*R#Ow`rYNucuU zB89HrzAOz`N`xC&o-+>s`{(Lb=ah z*#&?(PtBe`?;%TVCZ1lD2f(rO_Y&&N(d!e^qNUH#CCvwrb8{yw15mm!tj&S$&e+)e zt#*Gx`L~CM6ZXP)%X0y!{NhrA4>E~ArIRqL$u8{qdRCPfG$;J(FHI(mRsF|QcI#O5l86kE5$QCv6uY@S{; zetxPwd@@Qm{s|kvJVTJsNbI~97EF{}%`T@ze+$nHvBA002ov JPDHLkV1l3x{q6t& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json new file mode 100644 index 00000000000..4c56cbd9ad3 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json @@ -0,0 +1,61 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by ra.Y (Discord)", + "size": { + "x": 64, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "icon_empty", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-1", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-2", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-3", + "delays": + [ + [ + 1.0, + 1.0 + ] + ] + } + ] +} \ No newline at end of file From 406bba35e20da63c32f2bb6445c2386c2ca8470e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 18 Jul 2024 17:08:40 +0200 Subject: [PATCH 07/17] bee kind to the buzzkeeper --- .../en-US/_NF/flavors/flavor-profiles.ftl | 3 +- .../reagents/meta/consumable/drink/drinks.ftl | 5 ++- Resources/Prototypes/_NF/Flavors/flavors.yml | 7 +++- .../_NF/Reagents/Consumables/Drink/drinks.yml | 38 ++++++++++++++++++ .../_NF/Recipes/Reactions/drinks.yml | 16 +++++++- .../Drinks/beesknees.rsi/fill-1.png | Bin 0 -> 515 bytes .../Drinks/beesknees.rsi/fill-2.png | Bin 0 -> 546 bytes .../Drinks/beesknees.rsi/fill-3.png | Bin 0 -> 465 bytes .../Consumable/Drinks/beesknees.rsi/icon.png | Bin 0 -> 465 bytes .../Drinks/beesknees.rsi/icon_empty.png | Bin 0 -> 532 bytes .../Consumable/Drinks/beesknees.rsi/meta.json | 26 ++++++++++++ 11 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index 4384d462eae..c834c3e2ab6 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -2,4 +2,5 @@ flavor-base-basic = basic flavor-complex-fast = fast flavor-complex-greed = like greed flavor-complex-blast = like jungle warfare -flavor-complex-torpedo = like convoy raiding \ No newline at end of file +flavor-complex-torpedo = like convoy raiding +flavor-complex-bees = like buzzing and honey \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index f2935c95034..23d1b03ee03 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -11,4 +11,7 @@ reagent-name-pineapple-blast = pineapple blast reagent-desc-pineapple-blast = When the trees start talking... Smells tropical with a sulfuric note. reagent-name-torpedo-juice = torpedo juice -reagent-desc-torpedo-juice = The joys of drinking and unristricted submarine warfare combined! Has a strong alcoholic smell. \ No newline at end of file +reagent-desc-torpedo-juice = The joys of drinking and unristricted submarine warfare combined! Has a strong alcoholic smell. + +reagent-name-bees-knees = bees knees +reagent-desc-bees-knees = BEEEEEEEEEEEEEEES!!! Has a stingy smell. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 4a97bd05225..d540870c321 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -21,4 +21,9 @@ - type: flavor id: torpedo flavorType: Complex - description: flavor-complex-torpedo \ No newline at end of file + description: flavor-complex-torpedo + +- type: flavor + id: bees + flavorType: Complex + description: flavor-complex-bees \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 8132b2ed90d..155743b35ca 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -124,4 +124,42 @@ state: icon_empty metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: BeesKnees + name: reagent-name-bees-knees + parent: BaseAlcohol + desc: reagent-desc-bees-knees + physicalDesc: reagent-physical-desc-aromatic + flavor: bees + color: "#f1d25f" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.5 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:SatiateHunger + factor: 0.1 + - !type:HealthChange + damage: + types: + Poison: -0.05 + Radiation: -0.05 + - !type:ModifyBloodLevel + amount: 0.2 + conditions: + - !type:ReagentThreshold + min: 35 + damage: + types: + Airloss: 1 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi + state: icon_empty + metamorphicMaxFillLevels: 3 + metamorphicFillBaseName: fill- metamorphicChangeColor: false \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index d42637332de..22edb7be6ff 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -67,4 +67,18 @@ Thermite: amount: 1 products: - TorpedoJuice: 5 \ No newline at end of file + TorpedoJuice: 5 + +- type: reaction + id: BeesKnees + reactants: + JuiceLemon: + amount: 1 + BuzzochloricBees: + amount: 2 + Gin: + amount: 1 + Mead: + amount: 1 + products: + BeesKnees: 5 \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ce38ee14e96bfa777efc3289a2ce0b6698bf2a10 GIT binary patch literal 515 zcmV+e0{s1nP)Px$y-7qtR9J=WmcL5^VHn51nF(6r8bW`9AxJ@k9V9Ixg$cGeHxx=k2nE&F5N<(H zAw*LMVo}r(4G~BLEo})A2A3%*{>Yza+SC&FzIu0WI@Gfq-1G2$Kc9PFcn|nXRXDOV zeGYT;``OX(jtBm%!jYwW0RQ$~3kO=;t7*+cFV_Tsj37_q<{^RLC4Huc7H*xf0{~R@ zoTT7}+5n$Fgn9c1w$BG(8wM7G_o7);0HV226o22>Pn;(K5VzoEI#3(e#WaO{8mN$_ zT9+WaBdVD!A!rrt69KZBe0pSbYVRU6w+;X(NDIEbdxqHrB)R=qgHP#6bJRl!V0Fy7 zbM{!Oo=OQ1`#oOQ=E)WS7y&EKr);EIm6V0sEw`m;YK6cjrO?%@>~sJDw~cyGzW|Xfu#==6{?`Bi002ovPDHLk FV1nkb+id^< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0e0aef81d546b6c50ac99b4244ef267ed53e5d26 GIT binary patch literal 546 zcmV+-0^R+IP)Px$+(|@1R9J=WmN7^hQ5?p9rW(*1f}02;*r8o4LQrss0fUPKixuqR+@TT?k${4_ zITSZRX(b>|5)c(j9i&4kNGUCpPE`;|;naxHBxf$kU1~bHNZvc|h^C<5a`3)C@B6<0 z``_Jz`vi5xQy31k7OtLmDt_mJ*P*U>%4gsqec8mpJbk5%Tn_pQ0B4515MO>B5#E;9 zRLI1=FM9xR)W?TC-n-A#P|Ddzw04m`}j zy_f;vl?-5F?X%Y9QmV7@b=v|v&Y{dqpRY#5OOHS|@`-3vsm>)*whicw`Gky@b^u^3 k^6AjFIxsunm;Rvs0cpR&HZPiicK`qY07*qoM6N<$f=NUE^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..64e57b1c83608e36e266c2fb2ffab95e3402f84d GIT binary patch literal 465 zcmV;?0WSWDP)Px$i%CR5R9J=WmcL5^VHn51i3wUJtwBF9sFp&I+Ehqdq~Ak-LPL=>L_>>PlXFAi z(j+c96%-8-h(wVzl@MWYiP72V`QyA3ZEA^oUhxPOyk~jgz7Ox``#kS=IG~$K3_I)o zMMwSjY$?3uz`rGio$WKAPv15;(0F2B<6WQqPiNF zqI@A{S|}mpQq@TVLN?FO&MhBbL^cBe0I@l6{O%2oX&~b{N!GYeE7ivgVdC*JFfg_R ziH`#073$?)9RUCsa`6cc_B7RJXztqoFXjfOCdVPlWt1|5ngKc6DDD%q-q{;?etAVv zsX*etH3JIP6aYJ^clHMK4CooqGoWXnD>6X-k^#WM*-dHQ%9$lTsu>V7ZI=(%JQhl4 zK7p)Mg;a_&SA@J~1M+ZHVCl>a0Ki`4`a?4vKybr5#L|BNVxzjIT&iK300000NkvXX Hu0mjfdKAW5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..64e57b1c83608e36e266c2fb2ffab95e3402f84d GIT binary patch literal 465 zcmV;?0WSWDP)Px$i%CR5R9J=WmcL5^VHn51i3wUJtwBF9sFp&I+Ehqdq~Ak-LPL=>L_>>PlXFAi z(j+c96%-8-h(wVzl@MWYiP72V`QyA3ZEA^oUhxPOyk~jgz7Ox``#kS=IG~$K3_I)o zMMwSjY$?3uz`rGio$WKAPv15;(0F2B<6WQqPiNF zqI@A{S|}mpQq@TVLN?FO&MhBbL^cBe0I@l6{O%2oX&~b{N!GYeE7ivgVdC*JFfg_R ziH`#073$?)9RUCsa`6cc_B7RJXztqoFXjfOCdVPlWt1|5ngKc6DDD%q-q{;?etAVv zsX*etH3JIP6aYJ^clHMK4CooqGoWXnD>6X-k^#WM*-dHQ%9$lTsu>V7ZI=(%JQhl4 zK7p)Mg;a_&SA@J~1M+ZHVCl>a0Ki`4`a?4vKybr5#L|BNVxzjIT&iK300000NkvXX Hu0mjfdKAW5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..1dc963dfa02f18a65e361a597f61c756aac0ba77 GIT binary patch literal 532 zcmV+v0_**WP)Px$&PhZ;R9J=WmQN@IQ5?s=JJ~6_9F))sDNg>RHp*e`VRP9;ORdYE930fjL0goZ zILJ*=v==#OYuiK|WVQZm{w!lRW|(mzY2RBj?`04CE>rJ)XTG1$%p4x@ zmquE)Yl9t4+Q;=*%YVJ_`$)_7+yVUC=d2vaZl6cnT=Y9N0Ju|(N$eb6BDhJ=R#DCCkjb9 z>Q4w@tkpBOcAS1$)l(i0`20OnD>DFK103;q!bQpodLI1K@!C_ipJurOgabbRTW@3} zX8?NaxdZ66=MJFPo-2S6d#(UR?70CLwdV$4)Se3fi#-HY06sb3uHW(nM|h7?0Mo|76d_@^f)b~4(fqK zR$h};m1X&L<;AhD>y7m{HEOl(igqsmsAhBNS?nrF%TV6{01St=F0y54GwpRzKh- Date: Thu, 18 Jul 2024 17:11:49 +0200 Subject: [PATCH 08/17] threshold set wrong --- .../Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 155743b35ca..5cd2e577589 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -149,14 +149,14 @@ types: Poison: -0.05 Radiation: -0.05 - - !type:ModifyBloodLevel - amount: 0.2 conditions: - !type:ReagentThreshold min: 35 damage: types: Airloss: 1 + - !type:ModifyBloodLevel + amount: 0.2 metamorphicSprite: sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi state: icon_empty From 374fc0c6dffbd4f5c23d38327e7b5d5605ccc7f1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 18 Jul 2024 17:14:47 +0200 Subject: [PATCH 09/17] name edit --- .../Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index 23d1b03ee03..cfd3a313a47 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -13,5 +13,5 @@ reagent-desc-pineapple-blast = When the trees start talking... Smells tropical w reagent-name-torpedo-juice = torpedo juice reagent-desc-torpedo-juice = The joys of drinking and unristricted submarine warfare combined! Has a strong alcoholic smell. -reagent-name-bees-knees = bees knees +reagent-name-bees-knees = bee’s knees reagent-desc-bees-knees = BEEEEEEEEEEEEEEES!!! Has a stingy smell. \ No newline at end of file From 34febca303c1a7bf4cb50498c9a9d79eba3426d2 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 14 Sep 2024 22:55:10 +0300 Subject: [PATCH 10/17] Update drinks.yml fixing errors --- .../Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 5cd2e577589..c02fc7360e7 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -149,12 +149,10 @@ types: Poison: -0.05 Radiation: -0.05 + Airloss: 1 conditions: - !type:ReagentThreshold min: 35 - damage: - types: - Airloss: 1 - !type:ModifyBloodLevel amount: 0.2 metamorphicSprite: @@ -162,4 +160,4 @@ state: icon_empty metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- - metamorphicChangeColor: false \ No newline at end of file + metamorphicChangeColor: false From 5080b540358e4a5f7c3c178a9ede99a09297bad9 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 14 Sep 2024 23:08:38 +0300 Subject: [PATCH 11/17] Update drinks.yml more fixes --- Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index c02fc7360e7..290994b1ae8 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -149,7 +149,7 @@ types: Poison: -0.05 Radiation: -0.05 - Airloss: 1 + Asphyxiation: 1 conditions: - !type:ReagentThreshold min: 35 From 57af142a198bf6acbc093543a15da0ac72bdc275 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 14 Sep 2024 23:16:40 +0300 Subject: [PATCH 12/17] stirring and shacking --- Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index 22edb7be6ff..d6dd29724cd 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -1,6 +1,8 @@ - type: reaction id: Coffee minTemp: 353 # ~80 deg C + requiredMixerCategories: + - Stir reactants: Water: amount: 3 @@ -25,6 +27,8 @@ - type: reaction id: GinAndSonic + requiredMixerCategories: + - Shake reactants: GinTonic: amount: 1 @@ -35,6 +39,8 @@ - type: reaction id: GoldenCat + requiredMixerCategories: + - Stir reactants: Whiskey: amount: 1 @@ -59,6 +65,8 @@ - type: reaction id: TorpedoJuice + requiredMixerCategories: + - Shake reactants: JuicePineapple: amount: 2 @@ -81,4 +89,4 @@ Mead: amount: 1 products: - BeesKnees: 5 \ No newline at end of file + BeesKnees: 5 From 7ad5c7099b9f4623cdacf8e77789ccd6f16829af Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 15 Sep 2024 23:44:08 +0300 Subject: [PATCH 13/17] sprites --- .../Objects/Consumable/Drinks/drinks.yml | 97 ++++++++++++++++++ .../Drinks/beesknees.rsi/fill-1.png | Bin 515 -> 324 bytes .../Drinks/beesknees.rsi/fill-2.png | Bin 546 -> 346 bytes .../Drinks/beesknees.rsi/fill-3.png | Bin 465 -> 306 bytes .../Consumable/Drinks/beesknees.rsi/icon.png | Bin 465 -> 306 bytes .../Drinks/beesknees.rsi/icon_empty.png | Bin 532 -> 314 bytes .../Consumable/Drinks/beesknees.rsi/meta.json | 4 +- .../Drinks/ginandsonic.rsi/fill-1.png | Bin 560 -> 405 bytes .../Drinks/ginandsonic.rsi/fill-2.png | Bin 558 -> 405 bytes .../Drinks/ginandsonic.rsi/fill-3.png | Bin 552 -> 399 bytes .../Drinks/ginandsonic.rsi/icon.png | Bin 552 -> 399 bytes .../Drinks/ginandsonic.rsi/icon_empty.png | Bin 558 -> 400 bytes .../Drinks/ginandsonic.rsi/meta.json | 6 +- .../Drinks/goldencat.rsi/fill-1.png | Bin 497 -> 349 bytes .../Drinks/goldencat.rsi/fill-2.png | Bin 492 -> 345 bytes .../Drinks/goldencat.rsi/fill-3.png | Bin 476 -> 341 bytes .../Consumable/Drinks/goldencat.rsi/icon.png | Bin 476 -> 341 bytes .../Drinks/goldencat.rsi/icon_empty.png | Bin 486 -> 342 bytes .../Consumable/Drinks/goldencat.rsi/meta.json | 6 +- .../Drinks/pineappleblast.rsi/fill-1.png | Bin 1078 -> 470 bytes .../Drinks/pineappleblast.rsi/fill-2.png | Bin 1078 -> 470 bytes .../Drinks/pineappleblast.rsi/fill-3.png | Bin 1014 -> 480 bytes .../Drinks/pineappleblast.rsi/icon.png | Bin 1014 -> 480 bytes .../Drinks/pineappleblast.rsi/icon_empty.png | Bin 1078 -> 470 bytes .../Drinks/pineappleblast.rsi/meta.json | 4 +- .../Drinks/torpedojuice.rsi/fill-1.png | Bin 2003 -> 956 bytes .../Drinks/torpedojuice.rsi/fill-2.png | Bin 1976 -> 949 bytes .../Drinks/torpedojuice.rsi/fill-3.png | Bin 1913 -> 900 bytes .../Drinks/torpedojuice.rsi/icon.png | Bin 1913 -> 900 bytes .../Drinks/torpedojuice.rsi/icon_empty.png | Bin 2027 -> 970 bytes .../Drinks/torpedojuice.rsi/meta.json | 4 +- 31 files changed, 109 insertions(+), 12 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml new file mode 100644 index 00000000000..151a758255b --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -0,0 +1,97 @@ +# Drinks +- type: entity + parent: DrinkGlass + id: DrinkPumpkinSpiceLatte + suffix: pumpkin spice latte + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: PumpkinSpiceLatte + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi + state: icon + +# Alcohol drinks +- type: entity + parent: DrinkGlass + id: DrinkGinAndSonic + suffix: gin and sonik + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: GinAndSonic + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/ginandsonic.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkGoldenCat + suffix: golden cat + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: GoldenCat + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/goldencat.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkPineappleBlast + suffix: pineapple blast + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: PineappleBlast + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/pineappleblast.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkTorpedoJuice + suffix: torpedo juice + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: TorpedoJuice + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/torpedojuice.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkBeesKnees + suffix: bees knees + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BeesKnees + Quantity: 30 + - type: Icon + sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi + state: icon diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png index ce38ee14e96bfa777efc3289a2ce0b6698bf2a10..008e675fb55c9751cf0670af9183bf3bf1fffeb9 100644 GIT binary patch literal 324 zcmV-K0lWT*P)Px#{z*hZR5*=eWFP~4USZ5|`Qd+tS0DeAqa6bBd<@9feYnT!EsV`Vj?D%#KN+za zu&pDU;my+*|KI(_7%T&)Z@KyH=Vo;AZDsy5y}CB0GcYjNK7INM zyBF{QUt^|s*u;r4U|X60%)jC5E6Fwhm+eFufX{ZK48UhQK?4Zc&cJ{r8h?Mi?j!MX zfe!-%14B}gJ_Eyxx|zuGANhkB7#Nsiu^Pb4#3Z$Q_mTfUKRm=~<2_mC=RIN0a6SMD WYi5H?7~X>b0000Px$y-7qtR9J=WmcL5^VHn51nF(6r8bW`9AxJ@k9V9Ixg$cGeHxx=k2nE&F5N<(H zAw*LMVo}r(4G~BLEo})A2A3%*{>Yza+SC&FzIu0WI@Gfq-1G2$Kc9PFcn|nXRXDOV zeGYT;``OX(jtBm%!jYwW0RQ$~3kO=;t7*+cFV_Tsj37_q<{^RLC4Huc7H*xf0{~R@ zoTT7}+5n$Fgn9c1w$BG(8wM7G_o7);0HV226o22>Pn;(K5VzoEI#3(e#WaO{8mN$_ zT9+WaBdVD!A!rrt69KZBe0pSbYVRU6w+;X(NDIEbdxqHrB)R=qgHP#6bJRl!V0Fy7 zbM{!Oo=OQ1`#oOQ=E)WS7y&EKr);EIm6V0sEw`m;YK6cjrO?%@>~sJDw~cyGzW|Xfu#==6{?`Bi002ovPDHLk FV1nkb+id^< diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png index 0e0aef81d546b6c50ac99b4244ef267ed53e5d26..4e3c32b78554b03b68e9377c031ae2a5ad2d5bfc 100644 GIT binary patch literal 346 zcmV-g0j2(lP)Px$6iGxuR5*=eWFP~4USZ5|`Qd+tS0DeAqa6bBd<@9feYnT!EsV`Vj?D%#KN+za zu&pDU;my+*|KI(_7%T&)Z@KyH=Vo;AZDsy5y}CB0GcYjNK7INM zyBF{QUt^|s*u;r4U|X60%)jC5E3wI8c;WZg>pl`M7x*BHB^Bv2FubUn$-uzC@R2{5 zfq{WJ7N-HXZrx}2@%BAV*L>l9$iTp$gxdvbYKjcsUJBwg;3L00!H s+P(Y8|DPWo;xyo%Ec5f8FlRU)07Qp#kwqz7BLDyZ07*qoM6N<$f&)9BZ~y=R literal 546 zcmV+-0^R+IP)Px$+(|@1R9J=WmN7^hQ5?p9rW(*1f}02;*r8o4LQrss0fUPKixuqR+@TT?k${4_ zITSZRX(b>|5)c(j9i&4kNGUCpPE`;|;naxHBxf$kU1~bHNZvc|h^C<5a`3)C@B6<0 z``_Jz`vi5xQy31k7OtLmDt_mJ*P*U>%4gsqec8mpJbk5%Tn_pQ0B4515MO>B5#E;9 zRLI1=FM9xR)W?TC-n-A#P|Ddzw04m`}j zy_f;vl?-5F?X%Y9QmV7@b=v|v&Y{dqpRY#5OOHS|@`-3vsm>)*whicw`Gky@b^u^3 k^6AjFIxsunm;Rvs0cpR&HZPiicK`qY07*qoM6N<$f=NUE^Z)<= diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-3.png index 64e57b1c83608e36e266c2fb2ffab95e3402f84d..8bebaa9192a062a005529c2948e8e4316bea065a 100644 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|-gvq=hFJ6_ zrzkMj#3i07`1!EDEnNP;vBAV-hWsOuZKCb}|Ejy|GXuflhjOd88<=sgob|be=b!Y6 zKPgAD4s7cyXfyYZ|5N{6y8m@ued>(e(g$5RnR(9c->+oAv!TeiX1Y;BabQfr$!+g; zUR`cEiD&-C=(e7<>t=>a{5zK5re3upQN z*Gw#D1lrv^YnIaC?bDlX%sp`6z=w(P^B$gIWsyJJ5WW4K@t=y{a?2UxE98v~40?7o zl<6g;B~7}u_xFka^X26pnLL=M^ZD~UgLDgdhM=`2jfrz7KLGlh!PC{xWt~$(69Bru Be^~$k literal 465 zcmV;?0WSWDP)Px$i%CR5R9J=WmcL5^VHn51i3wUJtwBF9sFp&I+Ehqdq~Ak-LPL=>L_>>PlXFAi z(j+c96%-8-h(wVzl@MWYiP72V`QyA3ZEA^oUhxPOyk~jgz7Ox``#kS=IG~$K3_I)o zMMwSjY$?3uz`rGio$WKAPv15;(0F2B<6WQqPiNF zqI@A{S|}mpQq@TVLN?FO&MhBbL^cBe0I@l6{O%2oX&~b{N!GYeE7ivgVdC*JFfg_R ziH`#073$?)9RUCsa`6cc_B7RJXztqoFXjfOCdVPlWt1|5ngKc6DDD%q-q{;?etAVv zsX*etH3JIP6aYJ^clHMK4CooqGoWXnD>6X-k^#WM*-dHQ%9$lTsu>V7ZI=(%JQhl4 zK7p)Mg;a_&SA@J~1M+ZHVCl>a0Ki`4`a?4vKybr5#L|BNVxzjIT&iK300000NkvXX Hu0mjfdKAW5 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png index 64e57b1c83608e36e266c2fb2ffab95e3402f84d..8bebaa9192a062a005529c2948e8e4316bea065a 100644 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|-gvq=hFJ6_ zrzkMj#3i07`1!EDEnNP;vBAV-hWsOuZKCb}|Ejy|GXuflhjOd88<=sgob|be=b!Y6 zKPgAD4s7cyXfyYZ|5N{6y8m@ued>(e(g$5RnR(9c->+oAv!TeiX1Y;BabQfr$!+g; zUR`cEiD&-C=(e7<>t=>a{5zK5re3upQN z*Gw#D1lrv^YnIaC?bDlX%sp`6z=w(P^B$gIWsyJJ5WW4K@t=y{a?2UxE98v~40?7o zl<6g;B~7}u_xFka^X26pnLL=M^ZD~UgLDgdhM=`2jfrz7KLGlh!PC{xWt~$(69Bru Be^~$k literal 465 zcmV;?0WSWDP)Px$i%CR5R9J=WmcL5^VHn51i3wUJtwBF9sFp&I+Ehqdq~Ak-LPL=>L_>>PlXFAi z(j+c96%-8-h(wVzl@MWYiP72V`QyA3ZEA^oUhxPOyk~jgz7Ox``#kS=IG~$K3_I)o zMMwSjY$?3uz`rGio$WKAPv15;(0F2B<6WQqPiNF zqI@A{S|}mpQq@TVLN?FO&MhBbL^cBe0I@l6{O%2oX&~b{N!GYeE7ivgVdC*JFfg_R ziH`#073$?)9RUCsa`6cc_B7RJXztqoFXjfOCdVPlWt1|5ngKc6DDD%q-q{;?etAVv zsX*etH3JIP6aYJ^clHMK4CooqGoWXnD>6X-k^#WM*-dHQ%9$lTsu>V7ZI=(%JQhl4 zK7p)Mg;a_&SA@J~1M+ZHVCl>a0Ki`4`a?4vKybr5#L|BNVxzjIT&iK300000NkvXX Hu0mjfdKAW5 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png index 1dc963dfa02f18a65e361a597f61c756aac0ba77..e2f7e29966fccf5a9dbc1cbce91e9a4a6ae48634 100644 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|zIeJghFJ6_ zrzkMj#3i07`1!EDEnNP;vBAV-hWsOuZKCb}|Ejy|GXuflhjOd88<=sgob|be=b!Y6 zKPgAD4s7cyXfyYZ|5N{6y8m@ued>(e(g$5RnR(9c->+oAv!TeiX1Y;BabQfr$!+g; zUR`cEiD&-C=(spL^Xh)@l#H#3p84Nr{kqM KpUXO@geCyC!iORN literal 532 zcmV+v0_**WP)Px$&PhZ;R9J=WmQN@IQ5?s=JJ~6_9F))sDNg>RHp*e`VRP9;ORdYE930fjL0goZ zILJ*=v==#OYuiK|WVQZm{w!lRW|(mzY2RBj?`04CE>rJ)XTG1$%p4x@ zmquE)Yl9t4+Q;=*%YVJ_`$)_7+yVUC=d2vaZl6cnT=Y9N0Ju|(N$eb6BDhJ=R#DCCkjb9 z>Q4w@tkpBOcAS1$)l(i0`20OnD>DFK103;q!bQpodLI1K@!C_ipJurOgabbRTW@3} zX8?NaxdZ66=MJFPo-2S6d#(UR?70CLwdV$4)Se3fi#-HY06sb3uHW(nM|h7?0Mo|76d_@^f)b~4(fqK zR$h};m1X&L<;AhD>y7m{HEOl(igqsmsAhBNS?nrF%TV6{01St=F0y54GwpRzKh-uKj#dJN%ROBjLnNlQ z_Brw$HsD}+*dY7UK5yqbq9)?DofwoVF_T>`*=nu;n{01sfk)&1dptm l)jw>%FTmS$7 delta 398 zcmbQryn)52Gr-TCmrII^fq{Y7)59eQNGpIa2Q!d#S<-b3NHG=%xjQkeJ16rJ$myME z)Fck1&5nM7AcMrmY>$;yfkOHd&*|5zmD~N7S@V|%s7=h%#WBR9ckQKvd50Bv*dF{~ zI9bG`DlXl1DOq~z_xe4ONgSCMw;k3oo%(aX(kla=|B=x@RR1$K%r82yq4n*#`3<%+ zJ~8b|3iHZ7>d^n#xj6 z4(ph6SUaBlWtUjKk%3_m&xbzs2g~L)9_?lPBrIqkd(yK0^PeSK4jmSK@bXM>r^kbd zjoIY|^Q{>euNfCy=F?()5bw;mGt=Rhc)}V>haN-oKX;oB>V>f##wMuKj#dJN%ROBjLnNlQ z_F3{BG2n1r$Pm4*Lygy9Qw`(0`n{azmMxii{qOSgOa?DMr0ik&w(;Uep(BQFQ>vc1 z39fYwVcQ&Ru>3_G$L63jTFGYnRy~t@m}lkgv$=6bucnxfVo_&lywT@ERo+0w9jpsF no-AHfJh>Ylf1j9z7`ZB+xE#F-bOVE@tDnm{r-UW|)Q?@> delta 396 zcmbQrypF}FGr-TCmrII^fq{Y7)59eQNGpIa2Q!d#S<-b3NHG=%xjQkeJ16rJ$myME z)Fck1&5nM7AcMrmY>$;yfkOHd&*|5zmD~N7S@V|%s7=Jv#WBR9ckQLqd50AQSOX#& zR)#B78#6neGuk-m|NlLF`2_*DUDdmkceu~sG59vW^hf+Bdxn3(=MKvM+j05&VV<@< z4J#vBCj<#hIK61foM-Dls}#&zKl4Pxwf77a_D@*CHVU0!y0BIgRp{mWW)E2 zdi4V#3=QXaANX!vq54Cpn_hw%luCCrHhjAwF|nKrSRu20|ieeJDi zJDITSXSRoUZQ$&1TGNy_<%BWIG4J44tM3HMynkjk`E^L8Rq2BBzUy>?*rV2Mk8(S{ o@=D{R*?U*(e5?DL{q%vfez@W8-xsy!0z-_!)78&qol`;+0QuReegFUf diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png index ef3020481da6bcdecdca519a18be1a6f7e498b9f..6ed033801b955d1c3ac3cc79e24189c236dd54ac 100644 GIT binary patch delta 242 zcmZ3%($8$v8Q|y6%O%Cdz`(%k>ERLtqy<2jgBeI_=<){xDaPU;cPEB*=VV?2ITI!t zHOc?~{~yRSJNgBJ3=$vvm!D(>3K^6H`2{mfyr^0K|G!$f-TyTqM=OECg`O^sArezt z`yBaN4LDp99kX{GsxjyBz5ILrC-19LcYl<9W@2_}cJu$`UGUnvclm^tdlRQ?i!*vL zPIEb+8pL(6rfZIKflr9>j_a@Zq_sE9NSG(9-5xME$=b`!Zhed3NvG`!VOJ}zygBiU gyF@?cERLtq!mDzgBeJ=Ea^H1q!^2X+?^QKos)S9Ow#UkvP}t-Rq$=NSITTSX+A^! zbw;Ju4{TwZ%@`a)80-oe=6x~VP+{O8C&>7D;vW9~1IkZD^YU05-R7 zIH2X0$bOB`aEU#3v%=)x&b{>d_8+F|(Aa%e1`5UDtGiY+D{rsXPd|O>YU8xs&LN`h fcmBtj{$Nv|VI&^=#OeqztQb69{an^LB{Ts5XqK0+ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png index ef3020481da6bcdecdca519a18be1a6f7e498b9f..6ed033801b955d1c3ac3cc79e24189c236dd54ac 100644 GIT binary patch delta 242 zcmZ3%($8$v8Q|y6%O%Cdz`(%k>ERLtqy<2jgBeI_=<){xDaPU;cPEB*=VV?2ITI!t zHOc?~{~yRSJNgBJ3=$vvm!D(>3K^6H`2{mfyr^0K|G!$f-TyTqM=OECg`O^sArezt z`yBaN4LDp99kX{GsxjyBz5ILrC-19LcYl<9W@2_}cJu$`UGUnvclm^tdlRQ?i!*vL zPIEb+8pL(6rfZIKflr9>j_a@Zq_sE9NSG(9-5xME$=b`!Zhed3NvG`!VOJ}zygBiU gyF@?cERLtq!mDzgBeJ=Ea^H1q!^2X+?^QKos)S9Ow#UkvP}t-Rq$=NSITTSX+A^! zbw;Ju4{TwZ%@`a)80-oe=6x~VP+{O8C&>7D;vW9~1IkZD^YU05-R7 zIH2X0$bOB`aEU#3v%=)x&b{>d_8+F|(Aa%e1`5UDtGiY+D{rsXPd|O>YU8xs&LN`h fcmBtj{$Nv|VI&^=#OeqztQb69{an^LB{Ts5XqK0+ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png index bbb6f873fc1a606cf9e19815d3f7ed75948571b3..784b7fd0a2d1c0dd76581ce245c2cdd8a73b3992 100644 GIT binary patch delta 243 zcmZ3-GJ)BsGr-TCmrII^fq{Y7)59eQNDF{42Q!e=(B%&XQjEnx?oJHr&dIz4awbeP zYLfr||38pvcJvDb86-aTFF(l&6f!6Y@(X5|cu}+d|9`b|yZ>uKj#dJNi#%N%LnNlQ z_8Iau7;v~IE-;;Iu!~{YOV%C#zfM_Yy6eZb|4i}>R-*T|^dGpzr^V-ZGWxU4-JKJv zHQxm@U5#EMvgnq8W&42{H(aiqx$CoZ{fZ+jk6z3$Wce)cI`Y!zQdOQnwF(vmlr*<{an^LB{Ts5bwFLU delta 396 zcmbQhypF}FGr-TCmrII^fq{Y7)59eQNGpIa2Q!d#S<-b3NHG=%xjQkeJ16rJ$myME z)Fck1&5nM7AcMrmY>$;yfkOHd&*|5zmD~N7S@V|%s7=Jv#WBR9ckQLKeJu(+3<=c? zk^TaEw-_9;d^f4`|MlC8p1QZcd6zglBj}gshSXXAjKBTx{>#r$w~G0g?K}TErM`r9 z;szq!K~dUlRr7i;9{#1R%BH#3&57atea4=TLFpS-v^H|6_`32PT#%{AZ0wmp*Zl*C($uH)76~#Ho=vTSGOM>ORdoX|Oxe zc{V)T7G`-}WvR+;ZNJ1|f2bUOR5U6Tb0%NAUH8+G_*^2;|4 lD|fHu7L4Bi-*(9d-ufIv59xxK!@v+@@O1TaS?83{1OPMQoNE98 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json index 08387bc35d8..aca22de7671 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-NC-SA-4.0", "copyright": "Made by ra.Y (Discord)", "size": { - "x": 32, - "y": 32 + "x": 16, + "y": 16 }, "states": [ { @@ -23,4 +23,4 @@ "name": "fill-3" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-1.png index 04783e9c8042b8c68c7aab20787766a702711af3..1c7bacceedca53c0cfcf374a5f90ea977567983b 100644 GIT binary patch delta 184 zcmey!e3wbFGr-TCmrII^fq{Y7)59eQNDF{42Q!e=(B%)FsJOnKq1@BOF+^f&>Ul@5 zqY6AM0ph7%$Ch$j^!@m6`k%=+f?k|gQseK9I#nOSAg+}4Ez)R-+Q(jpX;$-BxJdg( zpZUA2@L&E9!gn7t6+|0TCAP;fN6)0r5AkJc2n?TcWJEozM(%yWIr zRc03q4C3pt0@e4+117MpyJ)i}@ERi%{sSbR@be5dk(2%;#VPS5HKmq8i_rN%oO2yu zngygJWoo6_&Yq^ToaG@Od+WH1fAdVq9Nodpk#kR_6&Rk0mi-o_E85hxMZTXwL>-g@ z`2!&YL#$^hZzZlEAlPUxnvsgW-9QXFI&=icRD1x9eRrT)Iw%f~qd1U~6L^9)Y9&H^ zg0h16J-9Ahmw`SKU=!B@_P+qNCVv8;0nA&Y9mD{76bguLXTA{(v~3?3Bf{?mJT1Ke fEB3zNWtO_XQrRl|ozN8N00000NkvXXu0mjf6=;f( diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png index 520a678b25e77a623d4436edd73b33e75e4fcd60..812f4051b15f52fccf1f3496ebc1717466e3a21a 100644 GIT binary patch delta 180 zcmaFEe3MDBGr-TCmrII^fq{Y7)59eQNDF{42Q!e=(B%)FsJOnKq1e;KF+^f&?)igU zM-+Hi0{By>^|%Wzn*Qkj|0jM)-if;{k33QAoc5`Y>w$~QSv&8xD=Kz^CxV{KPR&^S zvTJ9&iC;wD!s>+CldmtDBDhMbdXf286E3UYes8SI80JT_W@ql7v?}>8!#^h*)oUy> gKK|U|b90|oE04nx)2U||7=VuRboFyt=akR{0Iu9b<^TWy delta 328 zcmV-O0k{6y0_+1JiBL{Q4GJ0x0000DNk~Le0000W0000W2m=5B07RsU#*rbfe*p$b zL_t(IjjfW+u7n^Agl$&Do0mfdc@eRv;xDNXvwc4jc8NX7Fj-nh&qrG zk^?9OrBs7H z6F@%Bm(PIzXJG#XP;2r#05kye)@TPY06hu?h%RTo5h~Eq-Y$gQ3z#iE9s#x3bHK_h ab^icOEi9ES8H`;30000|NpD!vwcr0+AYGN&$eZ2ddtk%WgV|px2SX#ICY497H53D_;XkK zJrljpQq4Yz^M$`JnxvSTTb)$)tw2ERnqP#C*^NNPYSpm$^&7%31aEPB(Dyl0YI8kf Z#zCHY9?j>iflgrXboFC(S?83{1OUYuK0p8f delta 311 zcmV-70m%N<0^9>3iBL{Q4GJ0x0000DNk~Le0000W0000W2m=5B07RsU#*rbgfA&d4 zK~y-6t$OCs&r5slm%$Z3HAcLMW8Q${tO|NpD!vwcr0+AYGN&$eZ2ddtk%WgV|px2SX#ICY497H53D_;XkK zJrljpQq4Yz^M$`JnxvSTTb)$)tw2ERnqP#C*^NNPYSpm$^&7%31aEPB(Dyl0YI8kf Z#zCHY9?j>iflgrXboFC(S?83{1OUYuK0p8f delta 311 zcmV-70m%N<0^9>3iBL{Q4GJ0x0000DNk~Le0000W0000W2m=5B07RsU#*rbgfA&d4 zK~y-6t$OCs&r5slm%$Z3HAcLMW8Q${tOW2H@vbF(3K2h66od^Mbo@pq8Sq3@mqvKB8e|Jj8(G!>&Id>^_V7L-3^%kTVZR*-0uV)ZZ2TFnb zKnTGg*1MEdi7OBgY<3n^q@t?_5QEMxodL2HH$dY&9Z;1H6bG)WI3Si2aDg^!79s9H zS%LV^!1)tEt;wGN&;ZO=qaDNm^ePk}dffRzFrbxvJP3ama9Mf-%Px$kV!;AR5*>DlD}@#P!xy1Yr8lKPU2!qPBADEC_zn^GJqK98!&WW;Q?5Hm5B|B zh3DZ}kSP7LG*YOn#&vEhTZ(-cD!X+Ig7&u@9o=)j^9>i?z83G}F1L=m^8zRIrSo#a z;Qh{x_l@P@zT6vaBS$A<-|xxz%c~m!loR>@qMvVr?=l{y0BY~kxBmiIdK%$`KE6gp z#IlFWc$msyYojroFAD&UfBaIF0e}B{WsL&n3Dua7>|00&3=j0O|l zeST9xYJkDkhICqjZJR`AMZ>`F8Dv>btfc}N*G+6ASFskdEGKE-q1UEXSC=b*o<;y< zg((2B7Q!OqG`X}mO$x#yBh~`IgC~L10A*|=R{*Y~SfmQqxjeMmHw?;LH|Vsay13fk z%3!`I{%x?hC?sFze>CX(Ys6Z}m-*if)-0t=%OvnD7O5ieEC2$}B04JwJPXq@n;&U4 zqlsT#NG^nK`)cgx_o%kh0Ic`B%x4Mf{jS_?Db7=&tn*o-%J(wA0a`}QFH|=XXaE2J M07*qoM6N<$g3GkjlK=n! literal 1078 zcmV-61j+k}P)Px&@JU2LR9J<@mcMV?Mij?CNAg5kB4w!-D#Max$4vtC2haiz8o)q-4guPsOMq;d zgAPTOuAP&qYyX9=Svq#;)TPK!phf{Vb^JSa;lQ#j%cS_@I#8r7n{;RcaUMXB$9q4% z_wM`N9XxuVc!#2O{^`P_2kQ2dZ{8h{$vbzI-D)Vi)wq5TNzlnVcNO>VDZABBGv9r2 zZ9uf-qhvd<^~#=bu5N76X`dQ^lnpei3g2 zfCkXp+!e{Yvj^;U;aHBn!^QkryyyMo5{q5j-zsBQy|FXHEv`*gp1gECuM9{x4)|dv;u5#-&)Z1)G|g z&P_95ol@?&6?t@f!^-tsHdgjCV`*7GA?AQHZsJ&qnjPC#`va=|L8_ztaO8bfr)CQr zOW};0%rCSu`$#T;WX}#=!A2PGlw&CzOED*dOq)3wq&ff_p^=jK${aW?hpynDTmnB1 z)*%E!kRYYTvTuN9Q0)&=5O0!8aUfaELAgXL@`mMX-7+ziYwv{e7d2Nb%I zy;I5$5mG1e0+6F~rm53R@!2$|Y;}b`5U0I2X3*AyG_6kLW!khN4~FO0*)r@0*=2Y& z4h(~JvLREh zths`2FBrt~cKtJcF za0Yf(UWPN-@*Rx_kVw-<3_Nm@ooKhW8O7@!fd8R%48AN!;~anM(}!J%Lo9`qH}vLNsy zY!htd6ZqivL&g9XD3t|GA~+NLO;YIMSf8w_iX}L572!mMrt))jw?iFc|CmI7Z~NfF w7=`cpr$GRm{ysY{8vIfK5)egoiv$PwABpwc&#&uJApigX07*qoM6N<$g1Dyho&W#< diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-2.png index 5c75595395bdf319abcd9e43008e275a28f3f82b..4840ec06d22bb6cf55987abd6742d32cc316f16a 100644 GIT binary patch literal 470 zcmV;{0V)28P)Px$kV!;AR5*>DlD}@#P!xy1Yr8lKPU2!qPBADEC_zn^GJqK98!&WW;Q?5Hm5B|B zh3DZ}kSP7LG*YOn#&vEhTZ(-cD!X+Ig7&u@9o=)j^9>i?z83G}F1L=m^8zRIrSo#a z;Qh{x_l@P@zT6vaBS$A<-|xxz%c~m!loR>@qMvVr?=l{y0BY~kxBmiIdK%$`KE6gp z#IlFWc$msyYojroFAD&UfBaIF0e}B{WsL&n3Dua7>|00&3=j0O|l zeST9xYJkDkhICqjZJR`AMZ>`F8Dv>btfc}N*G+6ASFskdEGKE-q1UEXSC=b*o<;y< zg((2B7Q!OqG`X}mO$x#yBh~`IgC~L10A*|=R{*Y~SfmQqxjeMmHw?;LH|Vsay13fk z%3!`I{%x?hC?sFze>CX(Ys6Z}m-*if)-0t=%OvnD7O5ieEC2$}B04JwJPXq@n;&U4 zqlsT#NG^nK`)cgx_o%kh0Ic`B%x4Mf{jS_?Db7=&tn*o-%J(wA0a`}QFH|=XXaE2J M07*qoM6N<$g3GkjlK=n! literal 1078 zcmV-61j+k}P)Px&@JU2LR9J<@mcMV?Mij?CNAg5kB4w!-D#Max$4vtC2haiz8o)q-4guPsOMq;d zgAPTOuAP&qYyX9=Svq#;)TPK!phf{Vb^JSa;lQ#j%cS_@I#8r7n{;RcaUMXB$9q4% z_wM`N9XxuVc!#2O{^`P_2kQ2dZ{8h{$vbzI-D)Vi)wq5TNzlnVcNO>VDZABBGv9r2 zZ9uf-qhvd<^~#=bu5N76X`dQ^lnpei3g2 zfCkXp+!e{Yvj^;U;aHBn!^QkryyyMo5{q5j-zsBQy|FXHEv`*gp1gECuM9{x4)|dv;u5#-&)Z1)G|g z&P_95ol@?&6?t@f!^-tsHdgjCV`*7GA?AQHZsJ&qnjPC#`va=|L8_ztaO8bfr)CQr zOW};0%rCSu`$#T;WX}#=!A2PGlw&CzOED*dOq)3wq&ff_p^=jK${aW?hpynDTmnB1 z)*%E!kRYYTvTuN9Q0)&=5O0!8aUfaELAgXL@`mMX-7+ziYwv{e7d2Nb%I zy;I5$5mG1e0+6F~rm53R@!2$|Y;}b`5U0I2X3*AyG_6kLW!khN4~FO0*)r@0*=2Y& z4h(~JvLREh zths`2FBrt~cKtJcF za0Yf(UWPN-@*Rx_kVw-<3_Nm@ooKhW8O7@!fd8R%48AN!;~anM(}!J%Lo9`qH}vLNsy zY!htd6ZqivL&g9XD3t|GA~+NLO;YIMSf8w_iX}L572!mMrt))jw?iFc|CmI7Z~NfF w7=`cpr$GRm{ysY{8vIfK5)egoiv$PwABpwc&#&uJApigX07*qoM6N<$g1Dyho&W#< diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/fill-3.png index f85e14854039377a9237e81122e9131136098ef0..25825757fd5dae3aea808c5c9ae72d67fb380b07 100644 GIT binary patch literal 480 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 M07*qoM6N<$g3GkjlK=n! literal 1078 zcmV-61j+k}P)Px&@JU2LR9J<@mcMV?Mij?CNAg5kB4w!-D#Max$4vtC2haiz8o)q-4guPsOMq;d zgAPTOuAP&qYyX9=Svq#;)TPK!phf{Vb^JSa;lQ#j%cS_@I#8r7n{;RcaUMXB$9q4% z_wM`N9XxuVc!#2O{^`P_2kQ2dZ{8h{$vbzI-D)Vi)wq5TNzlnVcNO>VDZABBGv9r2 zZ9uf-qhvd<^~#=bu5N76X`dQ^lnpei3g2 zfCkXp+!e{Yvj^;U;aHBn!^QkryyyMo5{q5j-zsBQy|FXHEv`*gp1gECuM9{x4)|dv;u5#-&)Z1)G|g z&P_95ol@?&6?t@f!^-tsHdgjCV`*7GA?AQHZsJ&qnjPC#`va=|L8_ztaO8bfr)CQr zOW};0%rCSu`$#T;WX}#=!A2PGlw&CzOED*dOq)3wq&ff_p^=jK${aW?hpynDTmnB1 z)*%E!kRYYTvTuN9Q0)&=5O0!8aUfaELAgXL@`mMX-7+ziYwv{e7d2Nb%I zy;I5$5mG1e0+6F~rm53R@!2$|Y;}b`5U0I2X3*AyG_6kLW!khN4~FO0*)r@0*=2Y& z4h(~JvLREh zths`2FBrt~cKtJcF za0Yf(UWPN-@*Rx_kVw-<3_Nm@ooKhW8O7@!fd8R%48AN!;~anM(}!J%Lo9`qH}vLNsy zY!htd6ZqivL&g9XD3t|GA~+NLO;YIMSf8w_iX}L572!mMrt))jw?iFc|CmI7Z~NfF w7=`cpr$GRm{ysY{8vIfK5)egoiv$PwABpwc&#&uJApigX07*qoM6N<$g1Dyho&W#< diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json index 555c2d8f78c..aca22de7671 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-NC-SA-4.0", "copyright": "Made by ra.Y (Discord)", "size": { - "x": 32, - "y": 32 + "x": 16, + "y": 16 }, "states": [ { diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-1.png index 41cf4142b40403a3171a48d97c17c55599f01d22..cc38bd2d9d8f46afc292caf379950b9320c3e8e2 100644 GIT binary patch literal 956 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 XWRxFHu1UhS00000NkvXXu0mjfF+Rh6 literal 1976 zcmV;p2S@mcP)Px+a!Eu%RCt{2nr%#5*BQru7Yz1I!nI>uV(fUlL@}fx)j*VG&<47#O{-N&zf_8* z4L($=qOeX{_kp2)*e6D|rjwE^QC4MI!j@`M)<}3sUlMhrZIZSOElkZ=5|jkTF`xv3 zu?yxU=Iq187aQ|pP)(5Czhv3>yxr&ba9*Bs4)Be>(MoFDrMqQItus(mErbvv{GAB9 zR7GxD^M`wWdwY9IIw95h5kiOyd1V41{GCc#Nq#Aj zjW1V12q8(5G~aW)sx7Qq(0MJlE~Pww+Hwp`q%P!@iNWHUsI=M7@n|vl)vA@|Uv(p( zy}eyjR8&Yp2r*b(L-w^cmeTuQ&Z`gr~%vTA(rDELYId!teKM&;9-VbC$DOt=exzQK+x4pVz)Ha99h0 z1K5gl_{j&Y(x0E-Edt#`TKY@_*Mi z)cktx`o>qDDsNs+`?qi3rg4oqCjD0*cW}P%s>b?UZi)E)&K&?aPaKW$K`QY_!O!kh z1@j$!fW{f2#idEqxlf4r1B<2~Ju-NpIMB_$<*IR*T~WNXg;gRl21r)^pZ?+3%w`9bU)u#lt|8%1r3v*@S;?N#EzRRS z-Hv4wE~4R=_b#dYcu%)uPwAHC%F0RzI_(c>m5m%|IwX8P9{?>a zEm~eMG^w?h%=|u|kGBt<)Y8H}2!SedFTKdwGrgK!vsGSRPDe)v4Gj(AO3OJIyw3z9fI3YM z4~}YOQ-R;(@$jHu9RQJo0YJB1N+%~nrbejiowDpAvjZY5O^Q2=~$f zCTm%cUzd7YKjKNnfX!AHo!+ZD#pm;BBLSeIvXsuwPJkW3V33N+Qd-_o>!bp|$Kye- z*Hc$lCmyB+@pxt?8tHGvJ4KBcBm0flVqVm3d>;VI({FO(=V~NuQ4HKP*I>yVNEF|K z8tAiN?D;^m|M4I0 zR}~`5GWYJ?qdO;uwQJXM@ZdoSpx*g?k?j0m{a`D>U=Xj@i`{NPmSv6~KQ002J|24j z1~a4?0I2!!vesZ|gHCODO>dMD?_6>x3@{!!Z6@uH(bd%zlOKlndc9-Hm!SsvlksZ&x@Qa^l9MQ?w{lzbFL!SDC;!`+(`gc+@Kt=;71lc$ySY^0&$ZgLz|Y}upl2oq&_S#d0NNx2WvKgPr_;&5&P)LMs23@U z!nxLNzWcP5MC!9o`%x4{g`Xv_*BkZhcDptBa9SkvTZi{cE|*Jyy7xcrZkLjsU&%6J znBMxCOeSh;Yb8+mb>Tu+?_80FE&0L)Y{^&$fc;DLD0Je)2_ml%u61@({Oy^Z|JkSg z*c^$uS?={r0T4b*&l(B9hM9b~J9;{v4c{Lej)DfXQ!zQ>awM7gU;SB~*6AZp1m*OM zx$gq3Cc6MIXQ|oi*G;k6X5xvB>h|Z<#rrXJ*68&yX_3-r=oZWekTWwEEdx-nA*8K= zF1H+&_r`61O!+q_CSuOQ_seSmD7*DVj1N+YKdzfFtI00x*?P9+8#E{Uw)JjY#wJ1~ zd1f|RLYgf{KJ-zhR}V$zyA@kMG0dyIUDDgO$Hhb0qNT@k8<@=ei+4*PLzjWgydFgk zVNui|so&>)B=_i6lU>M}nNhaf?7uEyEmF_A=W)bPrjetYc8G@&X`hQwT<=U~{@mC2cPZ(@p?pJ0eOCLs9Gg7vpgqy(cw)Tphq> zRs$UGU>X72xNBB~dZ2XIMfOUo-AQ0000< KMNUMnLSTZOvDx_m diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-3.png index 1d02fd5edf704da03a9c71127d26f242762cff60..6be478ea81296be9926263ff9bab1a5b949849cc 100644 GIT binary patch literal 900 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 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon.png index 1d02fd5edf704da03a9c71127d26f242762cff60..6be478ea81296be9926263ff9bab1a5b949849cc 100644 GIT binary patch literal 900 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 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/icon_empty.png index bd558c2fc9dad66287c2c1f52da2523b47589667..dde6e4001ba8ea8a00613918aa287a465851b79f 100644 GIT binary patch literal 970 zcmV;*12z1KP)Px&gh@m}R9J=Wmr+ccRTRg6cm3L~2<^yltA#qd1uG1;02|vXk@=t_i!sqS7TrR! zjVQVWc`?e9Z!Y>Y=VHK@nFfuqJcwCh!lDv0*=ig_%1DP|Ay8d$7uh+}d2}Jk6b$O=yEi4ubUv|DNUcc;GcYfoU=kfV`)W)Y)` zWh}8M-qaP!$NPskC}TwC^}rGUy;CN>@`tkS$F5gj>S=qoJL|ry4o&tLjYbX@$8fvd zs^8^u@u0zk$xs5o?fUx|^ZvB%e0yajR;!hpgJURPPrA8dtr4Fu&&vvJA*G%Ka&x*n zMj{dR6lu@8e{i4wBjEJD1MMv*Po4+rSHky|ZEXjTbABjR7#th~!0-2Sd@d?JU0#;D zP=~fwh)6x3-UKLKVSR}D+i{ePU^J^lc6}N)V*D1?4>)gZPhUoOsjtS&?Y7VH^odU sAx4r>Mv_t7@i6ZA>K|ji`Tsfl9T~1Yv0O%aO#lD@07*qoM6N<$f{Dn}Hvj+t literal 2027 zcmVPx+rAb6VRCt{2nr&=T*BQruH*sQLAlJq*!Ldn`z%T(qw?tWrOh;0-7P=w&sVeHW zwrZyNXI&3y zX=xGF)zy*^LiCl@l7GFK$+Z5Li>n1dm6ZM1{JiWO?fNqjo^_+ZO!Lnw_;baT;`z?M zP06N-z#$esqOG?+oi#pq68tj)fAHWz;rIKs`<|Yj$Ck5Nt=hGsC~VudZCv{zz!4<_ z2e6eD@clC20JE9@u`hU`uv`Gx7Y?h&)V!GV;i>93=UW?+J@t*8<=;dMLpMnZzFhAK$7< z?Lz=~OILC7dPjr4WT|H=hNYs@JGcJs#a|x!-el^8I@*d}Dl2i7mzM)-&+_?vG&VNI zz@F{CD!JWmv1!w$7~Zx0YxYEYhi z{_`o5jw9pFt>};a$(Kr5|M_#PHdicnJ+diA4u^xAH*d0K%NB9?@L>s{yQhl~0RTK6 z4{yHl6S3#OZs|m4iv;P<58w|B0PxPP{la820dS(TMbgzRUL)ecBa)YdRpX3C^deRTTNM%Xx+IP zD`+~d*2x5ZkH>>vucyAgUW{f1@p#4t8tM0C>qV^?BLA&75?o{efujL-rV>tm$BoFX3IzJATSmNb&otqs8^UX zN4s8PP!jSpnP1xG_@;O+OBdAxoLXkcsrG;yUwN0NpZ$Q6d_5M$Fe$j{Qm=mqi(+6! z{T?l?tE-F1VlNN~aPi_r?)~NOELitdWLf6!-MbVN6fk%0T=wnTCjn#v|5M*tO)wb5 z>-A!{+mU6NBS(%%0J=|x?t{S$St?lV#}~B+h8OD82hZt>dHL}RozqJHm!Ssvurv18J%UAshNJpiD) zdi%1(QxyV(ndh=}G)s>hA%+;dt_~|6Q*8J~J{v>mP;zeawp#MWG76tF@yo=?>R;+S}dlTKB`Y1|VsCU6q&P zQWQmnkCWFMyLRgA?9|{RY0=Po4(yiPZnpq6_CL|tBBeXOl4r#5DD*R#Ow`rYNucuU zB89HrzAOz`N`xC&o-+>s`{(Lb=ah z*#&?(PtBe`?;%TVCZ1lD2f(rO_Y&&N(d!e^qNUH#CCvwrb8{yw15mm!tj&S$&e+)e zt#*Gx`L~CM6ZXP)%X0y!{NhrA4>E~ArIRqL$u8{qdRCPfG$;J(FHI(mRsF|QcI#O5l86kE5$QCv6uY@S{; zetxPwd@@Qm{s|kvJVTJsNbI~97EF{}%`T@ze+$nHvBA002ov JPDHLkV1l3x{q6t& diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json index 4c56cbd9ad3..700d25dd06e 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-NC-SA-4.0", "copyright": "Made by ra.Y (Discord)", "size": { - "x": 64, - "y": 32 + "x": 32, + "y": 16 }, "states": [ { From f1aee2c52b10a5e34471607eebe852e3d7c18a2a Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 15 Sep 2024 19:10:13 -0400 Subject: [PATCH 14/17] Extra fill states, sprite cleanup, conserve mat% --- .../Objects/Consumable/Drinks/drinks.yml | 2 +- Resources/Prototypes/_NF/Flavors/flavors.yml | 2 +- .../_NF/Reagents/Consumables/Drink/drinks.yml | 18 +++++------ .../Drinks/beesknees.rsi/fill-1.png | Bin 324 -> 312 bytes .../Drinks/beesknees.rsi/fill-2.png | Bin 346 -> 345 bytes .../Drinks/beesknees.rsi/fill-3.png | Bin 306 -> 335 bytes .../Drinks/beesknees.rsi/fill-4.png | Bin 0 -> 271 bytes .../Consumable/Drinks/beesknees.rsi/icon.png | Bin 306 -> 271 bytes .../Drinks/beesknees.rsi/icon_empty.png | Bin 314 -> 282 bytes .../Consumable/Drinks/beesknees.rsi/meta.json | 3 ++ .../Drinks/ginandsonic.rsi/fill-1.png | Bin 405 -> 482 bytes .../Drinks/ginandsonic.rsi/fill-2.png | Bin 405 -> 454 bytes .../Drinks/ginandsonic.rsi/fill-3.png | Bin 399 -> 475 bytes .../Drinks/ginandsonic.rsi/fill-4.png | Bin 0 -> 386 bytes .../Drinks/ginandsonic.rsi/icon.png | Bin 399 -> 450 bytes .../Drinks/ginandsonic.rsi/icon_empty.png | Bin 400 -> 470 bytes .../Drinks/ginandsonic.rsi/meta.json | 3 ++ .../Drinks/goldencat.rsi/fill-1.png | Bin 349 -> 323 bytes .../Drinks/goldencat.rsi/fill-2.png | Bin 345 -> 323 bytes .../Drinks/goldencat.rsi/fill-3.png | Bin 341 -> 322 bytes .../Drinks/goldencat.rsi/fill-4.png | Bin 0 -> 318 bytes .../Drinks/goldencat.rsi/fill-5.png | Bin 0 -> 313 bytes .../Consumable/Drinks/goldencat.rsi/icon.png | Bin 341 -> 313 bytes .../Drinks/goldencat.rsi/icon_empty.png | Bin 342 -> 316 bytes .../Consumable/Drinks/goldencat.rsi/meta.json | 6 ++++ .../Drinks/torpedojuice.rsi/fill-2.png | Bin 949 -> 932 bytes .../Drinks/torpedojuice.rsi/fill-3.png | Bin 900 -> 932 bytes .../Drinks/torpedojuice.rsi/fill-4.png | Bin 0 -> 917 bytes .../Drinks/torpedojuice.rsi/fill-5.png | Bin 0 -> 898 bytes .../Drinks/torpedojuice.rsi/fill-6.png | Bin 0 -> 900 bytes .../Drinks/torpedojuice.rsi/meta.json | 30 ++++++++++++++++++ 31 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-5.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-5.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-6.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml index 151a758255b..90ee9aa1a9a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -83,7 +83,7 @@ - type: entity parent: DrinkGlass id: DrinkBeesKnees - suffix: bees knees + suffix: bee's knees components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index d540870c321..ddc84c1aab7 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -6,7 +6,7 @@ - type: flavor id: fast flavorType: Complex - description: flavor-base-fast + description: flavor-complex-fast - type: flavor id: greed diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 290994b1ae8..f3a5baa5a72 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -36,17 +36,17 @@ Drink: effects: - !type:SatiateThirst - factor: 0.5 + factor: 1 - !type:AdjustReagent reagent: Ethanol - amount: 0.3 + amount: 0.03 - !type:AdjustReagent reagent: Desoxyephedrine - amount: 0.1 + amount: 0.25 metamorphicSprite: sprite: _NF/Objects/Consumable/Drinks/ginandsonic.rsi state: icon_empty - metamorphicMaxFillLevels: 3 + metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false @@ -65,11 +65,11 @@ factor: 0.2 - !type:AdjustReagent reagent: Ethanol - amount: 0.4 + amount: 0.3 metamorphicSprite: sprite: _NF/Objects/Consumable/Drinks/goldencat.rsi state: icon_empty - metamorphicMaxFillLevels: 3 + metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false @@ -118,11 +118,11 @@ factor: 0.8 - !type:AdjustReagent reagent: Ethanol - amount: 0.6 + amount: 0.4 metamorphicSprite: sprite: _NF/Objects/Consumable/Drinks/torpedojuice.rsi state: icon_empty - metamorphicMaxFillLevels: 3 + metamorphicMaxFillLevels: 6 metamorphicFillBaseName: fill- metamorphicChangeColor: false @@ -158,6 +158,6 @@ metamorphicSprite: sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi state: icon_empty - metamorphicMaxFillLevels: 3 + metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-1.png index 008e675fb55c9751cf0670af9183bf3bf1fffeb9..bb1b998278d1ce2e2d8d7e7816aa46f2a5e1131c 100644 GIT binary patch delta 285 zcmV+&0pk9|0=NQ@B!B-&L_t(IjbmUKa^P@})!RHDga3zntlpBWInT%7KLY~;!{-&o za4|+?1=~8p8Qwg7@&DcL|F}*0{gr`%fq}7L?pX!~1_lNuWH}7YzrP|d46t%De3vqS zb6JoLxMW-R-0IUDNrun39q`bs>ek!mZx|RD=3*Maz`(#@8Gkr^%gt{;H=}s1%zvg= z*T!@P1_lNp1_s-wPhY|1m>7rvzQ#=NaLExgU|X60%)jC5E6FwhpX~$lE4B!2;OQb$4nuFf3k0002~Nkl7%T&) zZ@KyH=Vo;AZDsy5y}CB0GcYjNK7INMyBF{QUt^|s*u;r4U|X60%)jC5E6Fwhm+eFu zfX{ZK48UhQK?4Zc&cJ{r8h?Mi?j!MXfe!-%14B}gJ_Eyxx|zuGANhkB7#Nsiu^Pb4 v#3Z$Q_mTfUKO#KDY2!Uv=I1?O&Tu{e32SD9Oc>sS00000NkvXXu0mjfFJ+B> diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/fill-2.png index 4e3c32b78554b03b68e9377c031ae2a5ad2d5bfc..9ce4372e960df21d763e2e3feaca9f74fbe2463f 100644 GIT binary patch delta 319 zcmV-F0l@y+0@(tPBYy!PNkl`TdoFfq{XsVD4E41_lNOCS*Ab&A-1QFbuGAGklja zfOA=p4Y*`m_uT5!97%@HxE=7&tm@X==WiGo80KOcz`(%3V1F4neap>nKR2Uzt;~O> zSJ%dL1_lNOAqEE9r%zwO<(L?V0KUdd?{LWxG+nq7N0H5sy4IpGY0|S;o z{QdR1kHpIbJ`4;D3`s@$3=A*oW+KafT4*K{%WSeB_sBICBAq7nqrtq;~H<^8e?Dhd2$mC(Hc2C(Ien2LQRWXFC4O RyaE6K002ovPDHLkV1jmcl=%Pv delta 320 zcmV-G0l)s)0@?zQBYyw^b5ch_0Itp)=>Px$6iGxuR5*=eWFP~4USZ5|`Qd+tS0DeA zqa6bBd<@9feYnT!EsV`Vj?D%#KN+zau&pDU;my+*|KI(_npLzVR+&9 z*XuqKFBkYAizOB5GcdfUo5{ey!0?ejn1O+TIToh@w{G2M`0@5VPS`TdoFfq{XsVD4E41_lNOCS*Ab&A-1QFbuGAGklja zfOA=p4Y*`m_uT5!97%@HxE=7&tm@X==WiGo80KOcz`(%3V1F4neap>nKR2Uzt;~O> zSJ%dL1_lNOAqEE9r%zwO<(L?V0KUdd?{LWxG+nm}|V|d~B*XuqKFBka0 z_(?_j3=A*oX2SR%`GXl47?@*m8gT2@eTE-z-{W-A7v6^q3=B%RU7)6>$nfo@AWj25 z^2;-vxq!zD11{?VW+o=7-Mf$c|M}q|P6O`AGC%JLbB6N)bEj>=DqgJ-00000NkvXX Hu0mjfV-=K% delta 280 zcmV+z0q6eD0-BYyw^b5ch_0Itp)=>Px#>`6pHR5*=eWFP~4USZ5|`Qd+tS0Dc~ zFp*;bZ^T)K6^H-*Cr2*>0|NuY;U25EFg6RRn)7@N{u{{rWW;K~wvKRyH&0*ufA<@Y z>wbS_n7bRnMF|58&A-1QFbuGAGkljafOAn?aLKmrxz(pRl79@Jv0HxP)O`lYoY}YD zK7Yf&z%Uon00ssI20jH}h97S?U^T!lK#t+d#}jH#|0!X20RsaAgPNKm!?%}$*qy+@ z!0?e@p5e>|1RukITet2r{CN8wrvYDhA2Kj7jJkk!E?{P2lG?rd$p4=o9^y3Mo-Fh8 eo-k)P9{^IVbP<7Jos-}I0000sa)wSEt^CcuCo+U{g z0DHLSs zZ-2Mo{c-5`gvQ3iE38|J8I6S}UwL=e{onsT9|V>&eovV>|9gw&;hzl7`B|y$hg;4A PeaPVH>gTe~DWM4fAUb>V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon.png index 8bebaa9192a062a005529c2948e8e4316bea065a..259535120afea98ddd347987bb8623b7b5729dc6 100644 GIT binary patch delta 243 zcmVek!mZx|RD=3*Maz`(%3r)=QM@Z;?UoCZjKJfZgV zpAvQ#FfcGMsHrJ3e0wQ~(}0is@(gD#Aov&t+`4t2;m6zeI1Tv1`;dWwVble*a{)6G tlhp3rNB;l(@DQf~_hgx$_k=ma`2a(2YGsGRgwFr~002ovPDHLkV1jY$d0GGf delta 279 zcmV+y0qFjZ0-B!2;OQb$4nuFf3k0002&Nkl%7HVdhm^Lz~c8_4`*#A?8{j&O!IPhb3h_ZyGv zet%_{yBonp2?GqxzrP|d46t%De3vqSb5UGy$+qsf)u%a<41b@oTYloyeFn*#*|*+4 zf5X7QFc;GR1_lNOJ_TQfA8$8cHNY-Fj^WG46KYTYDPea30|NttnwlcRx0iz0oxs4r z@R47h;midDAH#rKx9&6ic>5lw0bh6@GB7ZVx`1{rU}j>H+P(Y8|DPWo;xyo%Ec5f8 dFlRU)08*`Vfe>Mxli&aV002ovPDHLkV1g`*eB%HB diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi/icon_empty.png index e2f7e29966fccf5a9dbc1cbce91e9a4a6ae48634..e8b4b304ec2d9d2acdee63584a1fce00efea1287 100644 GIT binary patch delta 254 zcmV;;9M4D11{Ot zJ-7NaN0Q+)ZU;OxtGe~}`5OiXhPjvqFfcGMSO!kta`W5I&37nXEAyY})wMC5fq{WR zh=IZO>C;zmIVJ`ofUhyrJ6v)E4cJ!ZKl5++`bx45z-K!_0|?np&;UZV<28U7+wmGe zjO`2zXi2$z&3*%7HVdhm^Lz~c8_4`*#A?8{j&O!IPhb3h_ZyGv zet%_{yBonp2?GqxzrP|d46t%De3vqSb5UGy$+qsf)u%a<41b@oTYloyeFn*#*|*+4 zf5X7QFc;GR1_lNO%fRVdZhrf@8C`r^ng2|$u8rvo3=FnUpT5HG1$@BQnCTrhaiR>^ zR^~tRZ}|F3vJJpxJ5dJUvz;gd@Yzn#07AACG=Pxp3=9kmjL4kwHTxN4WW?U_-A!9xNK z5)W&NiY*Evj$)uFy%6fs#X&>`OFFb>R&jEZ4pIYwK)|RtD6urg3I$6bSxV}VLIS7?tmj!EJ6PX(B6ac09gbI*}N6Eya0OVgL zRe+OM&jmnlcvJM`E`{^1_f31<0F|iJX zu$0NPO&Hev%a^WKa_17t8=rK@_Q0 zZufsp$k9rm-f~YD#}J9Bt$mJshYdJb9yZASbh#22p>8RgK-?kKhMnDXc;%~Pm4lZY2$=_^XtiC$4pR;!(oXdFJ3KwpvptrR z@A3Qp{Xf4~u+X4?Nm%(-vis?lOmP&L0wCNM^Z~>Mngu{p|Bmpg z31QFF-0NPO&Hev%a^WKa_17t8=rK@_Q0 zZufsp$k9rm-f~YD#}J9Bt$mh!M+`Vz7cxYz>rmr0*i^&#u6{4)xn)acUjMuNJd?r8 z4=HyE=R8doxtGf>gTe~DWM4f D4t~a* diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-3.png index 6ed033801b955d1c3ac3cc79e24189c236dd54ac..17eaee814b7adb8bf51aa02aa8d958533bca5533 100644 GIT binary patch delta 460 zcmV;-0WF*vI5rvG#6dJA5Xj&k99mS2XA1?(L9&$UkU|Gb zX^~8p^Eq5E<;*2G^}D_Ad++o63pSccWQCn?Cr7i3+d`z9hJPXl#o*Hf&mxM&FK(AP zDdi|vKU@AZWbm@DowTEfE98%vo-5>!W&8y`ylG6>;><(>0^sXnJ_fLtOR|?s0-!xF z!~o7FhXue;d`pDYnsD0Hm0Hm90B^l60ABn(zZ*C1rxIE5+#zUq6<>m_i+JQzpdJ#1oyu(H&mx9@pQu1Vt!vP?+hP@|^v&Y@s3t#e;{B zY1jjKbWHTW_Sj%OTx7aL_29h(Mt{nWe%ZzU&$0NPO&Hev%a^WKa_17t8=rK@_Q0 zZufsp$k9rm-a=0o#}J9Bt$mJstp*$}iH_O34%L|R_+I`!|C9Gssk=YQJ~J`9G`so# z@-BF7-Mf53%e{%ywZ$2|7^k@$Pz~a`SkpDfxxgpHc*pfueA3z*W+cp$)ou@%n`G_f wX1BgY@TAjrg|Mp?SKgfX#a*Hw^K!C%fgb0~wDOD2K+73CUHx3vIVCg!0L?7I2><{9 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..88169286dcc951fc69b1b3d999c86b61015df294 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfgaDrqR{$YW{hJv9GCdo{zzzT>EpAJZ^1FesQVk`{(U)4lWF-A!@BYQCoxNKJ#Pf z?oL`#zU=h0%kM7RS*Kb=ZZ__?XLj^U?yGBY(LFsCOE)avaqryQS-xc_D%PKw`Ttj5 z<^M%%{$ITM?Zt!tU;uOoP(1`0BtG^pKgkLdGAIf13ub_*Ac|BgxBI^)Ff>PCw}G*x?ufk z<1;mf>;r)u-DN4;G)MSZ)I_Z>%+~^K lrs$^sO|kNO{_pI6xq>sC3l~?pm;o(k@O1TaS?83{1OSqP!sP$} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon.png index 6ed033801b955d1c3ac3cc79e24189c236dd54ac..43df9c2ee5395040c6b1608c9da36656b853efe5 100644 GIT binary patch delta 435 zcmV;k0Zjgn1HuE48Gi-<001BJ|6u?C0f|XOK~y-6y^>8RgK-?kKhJF5TgFX!4$4~g zgh`T@a&Q!-99Udj93&1zNpcd7ZgLPit#%l4AY>ktqSba$9Htydw01I&zr)j}XM47s ze2?G%@BjI|f{8}G>%z=8lO@-~Um;Sap~xQ5+~sAUS26g3{eK9zAs><0o#9Vb1>^1# zmMj5Qg2}YE5=^pI@8@bYyI_Me+1n%lhQH$%^pbms0A((XGMAR+--dhu*uqhLh^=Zu6wgir@G19^Y;>Cf zZQ&?|u^{K_rhn8nv?l(I6tE7hV>aF)I|WwJC*@B>R;mZpom)a7itB# zF5gCZdH{zpW4yLX2jpo}0@!-)6Jymu3G_`kwNiE~<_&@A>^qkd=vznwGL?d)G}x)( zzbIhh@G>2r7of-0NPO&Hev%a^WKa_17t8=rK@_Q0 zZufsp$k9rm-a=0o#}J9Bt$mJstp*$}iH_O34%L|R_+I`!|C9Gssk=YQJ~J`9G`so# z@-BF7-Mf53%e{%ywZ$2|7^k@$Pz~a`SkpDfxxgpHc*pfueA3z*W+cp$)ou@%n`G_f wX1BgY@TAjrg|Mp?SKgfX#a*Hw^K!C%fgb0~wDOD2K+73CUHx3vIVCg!0L?7I2><{9 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi/icon_empty.png index 784b7fd0a2d1c0dd76581ce245c2cdd8a73b3992..eb74c06fde1165e7d79651be461f27bef1e7b823 100644 GIT binary patch delta 455 zcmV;&0XY7U1J(nO8Gi-<001BJ|6u?C0i8)iK~y-6y^=wQQehN@zvpN(X$a<{z zh(1bV6pa}ehL&P96g`pLv}qAhLE$df%`ltV4J{%BK@dhK+Jr@>6BLG^n=ls!Es7|_ zRq^^;ytJM^WmcW#`R{-3x#wOmK{~Z9%y=_crac^1L>ea)Ie#Qhucg?GD+a!}-=a~? z(dxZ3{F!iYHE@)yrHDQ3SBIQE>{qw^1rF{_8a6Q3<3Rz?xtmu3D!B}mTn2#VrGg63 zy?jOhM3ZF^sSSj6)_gZyb^tnKd^)u)-v0uv`gwYY01lsq!>3K~jcN`6TeGc)7^w}! z!kwD{{E!p;Jbx816|^u!40(}!+&5rkeUj4T) z_V&Eq{c&9aeG4OjaSTOi9m7t&hA&k6)JK_9A8>t;tu5X xv*P4!r-`hS{+3(xUObaP&!=_bn_2(=jNi5UgHRKrSk(Xk002ovPDHLkV1l>F(}4g0 literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Ig2?0JKt^z_b zI&y~DYR+pk+~26%Pw}+67i;yh)%^1cV_#F_JRgHax%THKdEDBV{Nhs6_s`qq99$Su zL)2P*qP7Ojedfo|-JP_geA($~m)~8svre^$+-%%&&+O=z+*jA)qI-HOmTp+S0NPO&Hev%a^WKa_17t8=rK@_Q0 zZufsp$k9rm-Xc#I#}J9Bt$l`k4F(*pi3?2U8th_N_L6nS|F2V4neO_r?LU(|gO%vL zE&T^>@oDino{au%b9d*2YRz}SOjo0qh%CA#VA+0P#toM%XYTqeUBBW8%cB=F3|T%4 yypFu|xm1-WP_2SR!T9)MrSxa24;B}+#g{FKc83B#|+oe`-lYK~xx(eb3zrz#s?(;I14VFC(z-djFT)v7a>a4ye~=_ zp{lVbdQ(rMptJA9u4MyoJ{q7tlB(ki`^Z`XB~@60cuHIoV8-{;GG+S#1YHZTkx!lt Q9RL6T07*qoM6N<$f(g?^asU7T diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-2.png index 812f4051b15f52fccf1f3496ebc1717466e3a21a..c05bf4bf32e898948346f254bba96a38089b3ebd 100644 GIT binary patch delta 137 zcmV;40CxY`0>c83B#|+oe`-lYK~xx(ZO_XJ03iqk&{huKmJwLH{{JWE+8bshEDw00000NkvXXu0mjf+{`-L delta 158 zcmV;P0Ac^b0@(tPBnkm@Qb$4nuFf3kks+ghb4f%&R2Y?Q&%p}BAPfXh4`r5&M-ifz z;{X5TPGU=8yE(+K9hGRK>592uG)`EKp?hGPlh>k@ z5vm${qBr$43Of5v>^e38pIZfMX}^-HWBmaBLOdnb1eo#pv`pE)DuoO{q&1by00009 M07*qoM6N<$f`_X`T>t<8 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-3.png index 3f0fe5744abab02cbc53b3c51f1f4f183cb290f6..1a1552dbae0c61ed75d9f05f34a93bcf4139e5fb 100644 GIT binary patch delta 136 zcmV;30C)e@0>T22B#|+oerZWWK~xx(jgP$!03is2ow!g&V}fqJ|4Ux+cev#mgY*lr zn9^4!TV~He0@VVLBnkm@Qb$4nuFf3kks+ghZ%IT!R2Y?Q&#?{!AqWIeiwg-uX@fQ! z|Nkd%2KQoeyA%j72DG(jgqdBYi0Z3^B#LlCh!*n~0qdjlif7(5F7q0LOktlB_o9*^ zWo>(6cJ^=(7S>K!JT}--0edA@pMS7d&{MQV;EwZY8nb@^Xu%BLNQ2Ki00000NkvWt IM6N<$g00Fv#sB~S diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..d133dbe7c247195e7d43900f159419661e2405e4 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}T7XZ8>pn028)Yu9uB>{ptY}Am zK#9Gjy@t^|4bvyqF5kY`BUnj%VmpU)L{{R2~!09{P zv$sTLc38QjscF0XXK;}aQO&T(*&5LCt+eXJ_GyP&GlAy6yI|hM|HT7nqf$wbUoZnu zCw`#!ck+Iq>Qqk`#}J9BbNj9N4k++A&zz9t7NWVK@W1!BrB97ZR<}C+X?Zl^Qn;%A zRH3+%OOGvoEN<{xn$K!DZ^myWt`CbiO`AoQTz&SJ=PTFb&MU7^O=&pBD$)E>WS7mq j#=RENlA7D>d^xV>y=>u;?7ZU+3Ks@XS3j3^P6pn028)Yu9uB>{ptY}Am zK#9Gjy@t^|4bvyqF5kY`BUnj%VmpU)L{{R2~!09{P zv$sTLc38QjscF0XXK;}aQO&T(*&5LCt+eXJ_GyP&GlAy6yI|hM|HT7nqf$wbUoZnu zCw`#!ck+Iq>I6?0#}J9BbNe^)F(`64&-ICN6EFGvzy8yyPOCd*y^Oz-bf$fpdR2Gx zhbu1o;@tmfDRlQPR=6O#BmWQsw`vNTp-2ARHKqUn delta 154 zcmV;L0A>HV0@VVLBnkm@Qb$4nuFf3kks+ghZ%IT!R2Y?Q&#?{!AqWIeiwg-uX@fQ! z|Nkd%2KQoeyA%j72DG(jgqdBYi0Z3^B#LlCh!*n~0qdjlif7(5F7q0LOktlB_o9*^ zWo>(6cJ^=(7S>K!JT}--0edA@pMS7d&{MQV;EwZY8nb@^Xu%BLNQ2Ki00000NkvWt IM6N<$f~a6Vy#N3J diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/icon_empty.png index e6cdd5671a1b860ce16c8b2e5fc416e038a2cd73..1530481d1f97ca703b5189bbfcb3e99731034d31 100644 GIT binary patch delta 130 zcmV-|0Db?~0=xo{B#|+ocw6rp)y62%k3W#KFD~R%nx-WtN15Jn-gdjCnZ|70ZWKb}*6k!RdYy*fqonD~) k0ef+7rA*QFX@;=s3z!fJ>xq%~wEzGB07*qoM6N<$g8ZE~1poj5 delta 155 zcmV;M0A&BX0@ebMBnkm@Qb$4nuFf3kks+gha7jc#R2Y?Q&%p}BFbD+D9Lg+?#}F{N z^#A{I9n(_St_P!!ph;`*Z~!M1UVW96coClvviZ8hi9UN?v51T239B)T5cairEh?GP ztg$CX&z{DF!LbuZ9vgtqt%B^8vO0bNe?d>t8i5&~Pp4(JFZXH-T-5gNf&c&j07*p# JPDHLkV1oQRMKb^Z diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json index aca22de7671..4d25b5bd818 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi/meta.json @@ -21,6 +21,12 @@ }, { "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" } ] } \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-2.png index b268f5fedcfc3e8a7fedf65c37427a3c9da4accf..a83effc4986ec68f3828db0897b08cde350771af 100644 GIT binary patch delta 911 zcmV;A191Gc2c!p(BYy*HNkl-bF-Mwhrk_K(>X?L1pPnVd(Qd3-{IWDJ>Liat8hwuc7I-fmY!}YrIi16zEVi| zE!C8TODTmAg7!k~{?G9XR)ED!8b`+wq^Daho&Hkfi)r8b96-)j@%;W%-q^L`7o-4} zw$wBE>@F##Ly>)>@mf@KhD}u!l+@I%3R6`T ztJNw2B9Vx0w}07eSS%LC#>VtLXL_zmfMpaKDe-y>!3%FY$0B2>A z&$Y5H^OIFmt7dVJ&NkFtI5seJD4(x&{hbT7wY3C;L0(NE&h-t*ljlCdZnyJ8*C*or zOWrl-x14;FP$)!w(kMjd)@E)YWs@+_BsCUyrI~!alYe(ko$azTzZCd8xaaM+F1CO1 z^(*;&`x4U^TUxU17>~yZ1OhDi0=SOu17P<0lu)jXtT}(@(E|WTZ9ynciFL9~5m@%R z0npq&e);}1N8F7c_qBDb-iv^DYItaWtfX#ZTgM7t=-mUY&$|_>tB(ONGcyA~Z|@aM zp%4HKbAL%>5%}dd#{qB!|3JBJFaqhE#S?QHyDh`){^sD&{Sx>Ycn|W&xD}%Dr2ZO< z#a4s}AsHzGKN^h!uq~BF8BHyU4^5@=1>YchWRm#28CU|Kd(z5_hnwz~Ltgcq@nNx8 z*i)Xw@AvC=uh+{HsuinR0l@9XM;HzMw&r|SO@9pzhl3maqbQdr{M>QWiSL%@Wwo)C z%0LRaF*_aO@i;wad^j8I4-5|tWLr(nhM`=czrP=Va5&7N*@XCZd0Cp4qd1*TOjkxI z2LFv6JFwgBgin2ScMRG#RAN#D%PDHLkV1hCb#`XXJ delta 928 zcmV;R17G~42ek)~BYyw^b5ch_0Itp)=>Px&Z%IT!R9J=WmtSmCWf+H_&z`m%+)i1X zSUWl_bEz8xvQ3v+7Y7<;L1Lmoh&X2q#wc>JJKdExMxu!ciBLf=Fb#U)b}}J=li5=_8{HQ3Lykt#p=Ft{Gu5!m(5^*>rJGmPc9t&S`@13+Vm7a z-c#}X{!78y)#4Y$fO8w0n0RuVlu{yu5HV+aUjCJhEdX+JHmk?V4MqSwCFbi+J^ye6 zsyWO0+Dg{eH-9b(Q&km<#UcTs(WoA`TCHfB#@N`H-ZRpFQ359tSg4d7pz%Br$E{BA2X=K&;TMz65 zK&EDeaMwI7_bLKyrwf3T%ga}175vq^*|Y!AyYZLQzRsgPZkKYn{*BK7h(scULLp9n z^aa%~w0{E797+m#^^b!5pw>diLD!1#>-IhifHUx?P%aycKqhbT_;iXL+Ignk=a;;DXHZ7dbK*l&ncU$WV!KR|m@xwj z0Q5~*c;@xie+=(G=0(#qwpS$a`Fwi3x3`yS)qjFTtpwmk%l(W7uC6-YSznLcZs*Ft zD9VrHK5p6@#rKOdvd&mWl|PMqAU7Qoi3I(}yf~U|_Y4mXMgWjgVW?0T7#IK`91hbt zH7~wfT$HB87!HR6)6XN6g1=|W7Hl>f;UnMN8iUq#RhSe|&4RKuCiz<1gM4~=@}9wk z)PK=zVe5u+E?$s%qo^W13qVG#)W=|{`1(O88V>_dx1pA`=3MxLm+YeZ-bF-Mwhrk_K(>X?L1pPnVd(Qd3-{IWDJ>Liat8hwuc7I-fmY!}YrIi16zEVi| zE!C8TODTmAg7!k~{?G9XR)ED!8b`+wq^Daho&Hkfi)r8b96-)j@%;W%-q^L`7o-4} zw$wBE>@F##Ly>)>@mf@KhD}u!l+@I%3R6`T ztJNw2B9Vx0w}07eSS%LC#>VtLXL_zmfMpaKDe-y>!3%FY$0B2>A z&$Y5H^OIFmt7dVJ&NkFtI5seJD4(x&{hbT7wY3C;L0(NE&h-t*ljlCdZnyJ8*C*or zOWrl-x14;FP$)!w(kMjd)@E)YWs@+_BsCUyrI~!alYe(ko$azTzZCd8xaaM+F1CO1 z^(*;&`x4U^TUxU17>~yZ1OhDi0=SOu17P<0lu)jXtT}(@(E|WTZ9ynciFL9~5m@%R z0npq&e);}1N8F7c_qBDb-iv^DYItaWtfX#ZTgM7t=-mUY&$|_>tB(ONGcyA~Z|@aM zp%4HKbAL%>5%}dd#{qB!|3JBJFaqhE#S?QHyDh`){^sD&{Sx>Ycn|W&xD}%Dr2ZO< z#a4s}AsHzGKN^h!uq~BF8BHyU4^5@=1>YchWRm#28CU|Kd(z5_hnwz~Ltgcq@nNx8 z*i)Xw@AvC=uh+{HsuinR0l@9XM;HzMw&r|SO@9pzhl3maqbQdr{M>QWiSL%@Wwo)C z%0LRaF*_aO@i;wad^j8I4-5|tWLr(nhM`=czrP=Va5&7N*@XCZd0Cp4qd1*TOjkxI z2LFv6JFwgBgin2ScMRG#RAN#D%PDHLkV1k39#>D^t delta 878 zcmV-!1Cjis2ZRTZBYyw^b5ch_0Itp)=>Px&K1oDDR9J=WmtSntRTRfRm;U;zKipat z2h^5I3W2&YAZ&)rNiy(33=k5G2!=n2!3Y2Fus7I~FUAF*h>k^`FiT8~+r#FINx?`A z78+#T}|{n-QV|~dw)JB=idCzz3{)4&SpQq zV2!1-TSP?u?R>42@VkayfQyJyN^!hY(f>Jq$qF!&&*6Lb9i+2c=Gwnh3;7&h_X z_O-3{RxcWU=xBRuN0Zi8Q}Z4G|>{7 zNKZL{IRLsxUA%g%@u}fG=Ylw$PIgvh2#3R#-qqE`3x*4qQP|mg+n;4HdV9(Ff!bPp zJ|DM2gJ?gDg!$9AO?^8*B{lX6ypb&OT%kLr(|>7t&IR!|c%B#@yIweIG7*O=jZi2A zKs+Aj=)|o0W`17u`6Pb7AN@){<>0@$c{3i5hxpmA9=1XE3NN|_hC@;Dj4nrZtmM<) zu_p#EWUn{4*s`XQtCyvy6;)-Y0mvEERvRoA-?|7TQgHxk)@)$8qadF?;8QIZt}P0_ z-e(=KZd`rlwCV$?ceo0Iy#m8#2f1(gmy5sbuM6{{i^HxlGHH^}FYYlD@NUAtT4yX- zsQQPyS1_EorN;7Ebu%~1&D<H~;_u diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..99dd9928c5d41ed5f68d0abc125a592b7ace6ce5 GIT binary patch literal 917 zcmV;G18V$KVHgsV5+gA>=)-2Rj-^bn8(q65cC0Jw)|T4OhbEU4x`0bXl? zzc2rLbI*6-f0a(j&ra#r(laQfl=9!sS4s)LuA1_2DWwoX&|9kR{~W($1}x^X*x!5u z=^2zu$G#H9YI-+60Z{N%Jiq@^w6?+8=vZ)OCVv7bL)= z!cfq|wq-p4H-4Mv(AA$rCHVqwIRxOSOW{se_nRMS2(7q_+jOF><@DPlzxEW%b+5U3 zy1BWTKp?;i8N|u+Bl7UckFeQn{Lufgc<A>Y<#W*fVNOd$Sc>%&TriN3;@o+A40igFap_v#Zz->9@EB{bC0ch z18$dcB$i0&_wjiAjv65(;}zh?Vle>fGg*|0%%b?fR3)GCj)DeEj;~N z$KQqz9rvPX8ar!J__W8#bGb@X@btjX~?WI!p?vWTa{JeM2=D z&dY*PRFhc%Agk8uW3WVQIM@> zOFm$%LNypc{;Ahjihtkj3v<#W%|?Z(xiq=l>V9UNbz5;fWMU?kcm3Vn>$n=dEM{^U rF_uj-mQCVI$ML1_{4iFU|DV%eK}#QQ_&wYd00000NkvXXu0mjfti!^} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..fdaa7fc1e6f128a1369a326cfa9af789c724d857 GIT binary patch literal 898 zcmV-|1AY97P)-0*C;Yad7vLhIlu{foSM-05U$z1)<#Tx6If3*I z$V$)Ws+7<1UC#p)?MmNoKa}*{D1KQAaCv7l)6eY}5kV=X62A7L`PX)~0?3|x-n3O) ztN`>?m~U37g*gFmN~=0uYbKO}o?S#BR4UF)?AroE^L-0M95( zQ4H79+W@%p%L4CBey=LYS8%UF0A6>R-b{6u?a8`Z56$8}oo{KnbZYpgj#6`nH{ZR~ z*w{!U65*9B>cW*_Iep<{TrL;icAZflT<+g+e*5V+iAJL|r>#nL?mED2MB0>vHp#HG zKgaaZPToCxzU$L7Z*;FUiBbxF`7`b9h2xk?r3i<^tOUaNPQDDl+>KjGyFRwz{Cy{n z0U()0r9GuK$?KZJe#j3%#vkCvZ+bZ4Z|&ahu3b0$SVvD+uV3q~uRjIA?CdN6Lqk{5 zqfr1_=F><8_%**z0^p1Mfp)`U1#(4;r{*&}YaeC4cXZte^!l~#L@I5LlgZ=*K1vB= z72qcl2>^Cyb7xT1v4Gnla9&QH5(Y~7sao5wNzFu9BdTSN#a29#A&>d5$ z6ocmicw1a+hDV1BM@{BpP@@qH1_6l0Vsy+ctFKm9MPE(e^?K2-j!_Bzt9$q2a=D0| z{o-C5bZ&K{Yhc(ERhxBr>%e1tGBmSha48*baj+Y(@Q6osUcA08_-?1qd~uCr7S#wyv&~U3SgSBBR**kU|4Q*U-M=s| zy4b85Q}Y?}`StzG_}qK&Zr7Pf6srFIp{-2DZ>pJmR*mMC8O<#d$|MP89=sSU&HvBo YFB!EGbBgdq6951J07*qoM6N<$f`#3(6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-6.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi/fill-6.png new file mode 100644 index 0000000000000000000000000000000000000000..6be478ea81296be9926263ff9bab1a5b949849cc GIT binary patch literal 900 zcmV-~1AF|5P)Px&K1oDDR9J=WmtSntRTRfRm;U;zKipat2h^5I3W2&YAZ&)rNiy(33=k5G2!=n2 z!3Y2Fus7I~FUAF*h>k^`FiT8~+r#FINx?`A78+#T}|{n-QV|~dp;-U-u%wJ@V}MLWUTMlu{}g zXfB#RxOO{$Y|7^?tJ%M`ODYk?obKy9q(`h1+2y?**ffIWGm>Bp?Y1jIfoWJG7 zAppdjR@z3jOy1HI&fQG_m`y=``L3OVd-k=h_Es+%e&}d>Ye$pTR#WpH0ORB10QB}= zL65}%Xqe0(W#Cu+J`6x0`Ul#8%?{*>7LQDt>~daWvg6XC6X|>{7NKZL{IRLsxUA%g%@u}fG=Ylw$PIgvh2#3R# z-qqE`3x*4qQP|mg+n;4HdV9(Ff!bPpJ|DM2gJ?gDg!$9AO?^8*B{lX6ypb&OT%kLr z(`kCn1@Sj{o){jxUN~wp5r-;`P$&dIJRaxh#H{*eeqQwXB!0gi{YpRO;J>+fGaiqJ z_}Q->wn6s_FS-VXLs9XJE=P8(z8=H_Of3EMYT6*nITISZ@A* a&K>|E!VG6gbPF*60000 Date: Sun, 15 Sep 2024 19:11:51 -0400 Subject: [PATCH 15/17] sonik->sonic --- .../_NF/Entities/Objects/Consumable/Drinks/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml index 90ee9aa1a9a..761d49039ee 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -19,7 +19,7 @@ - type: entity parent: DrinkGlass id: DrinkGinAndSonic - suffix: gin and sonik + suffix: gin and sonic components: - type: SolutionContainerManager solutions: From 6601a0a5b816f96c023bfdbef1eeb420605cc8d9 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 15 Sep 2024 19:14:32 -0400 Subject: [PATCH 16/17] Minor drink description rewrites --- .../en-US/_NF/reagents/meta/consumable/drink/drinks.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index cfd3a313a47..87166bd67cb 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -5,13 +5,13 @@ reagent-name-gin-and-sonic = gin and sonic reagent-desc-gin-and-sonic = Why did the hedgehog go to Saturn? To collect its rings! reagent-name-golden-cat = golden cat -reagent-desc-golden-cat = Legends say the golden cat sold a burger for 100000 spesos. Has a metallic smell. +reagent-desc-golden-cat = Legends speak of a golden cat that sold a burger for a fortune. Has a metallic smell. reagent-name-pineapple-blast = pineapple blast -reagent-desc-pineapple-blast = When the trees start talking... Smells tropical with a sulfuric note. +reagent-desc-pineapple-blast = For when the trees start talking. Smells tropical, with notes of sulfur. reagent-name-torpedo-juice = torpedo juice -reagent-desc-torpedo-juice = The joys of drinking and unristricted submarine warfare combined! Has a strong alcoholic smell. +reagent-desc-torpedo-juice = The joys of drinking and unrestricted submarine warfare combined! Has a strong alcoholic smell. reagent-name-bees-knees = bee’s knees reagent-desc-bees-knees = BEEEEEEEEEEEEEEES!!! Has a stingy smell. \ No newline at end of file From 5f858c4fcf7d26e76e8257091a929bfc0bbe5b22 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 15 Sep 2024 19:20:01 -0400 Subject: [PATCH 17/17] Remove fart.ogg --- Resources/Audio/_NF/Effects/fart.ogg | Bin 8479 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Audio/_NF/Effects/fart.ogg diff --git a/Resources/Audio/_NF/Effects/fart.ogg b/Resources/Audio/_NF/Effects/fart.ogg deleted file mode 100644 index d7391c6b48fb3fb0b2fc882c6a42a3df29e0b8bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8479 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