From 4443850de32287b40d527d0f936be2f777c42f62 Mon Sep 17 00:00:00 2001 From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:42:37 +0300 Subject: [PATCH] [Drink] Robust nukie drink (#15051) * [Drink] Robust nukie drink only syndie. * [desc]grammar fix * [Meta] newline at the end --- .../VendingMachines/Inventories/cola.yml | 4 ++- .../Objects/Consumable/Drinks/drinks_cans.yml | 25 ++++++++++++++++++ .../Drinks/robustnukie.rsi/icon.png | Bin 0 -> 497 bytes .../Drinks/robustnukie.rsi/icon_open.png | Bin 0 -> 523 bytes .../Drinks/robustnukie.rsi/inhand-left.png | Bin 0 -> 508 bytes .../Drinks/robustnukie.rsi/inhand-right.png | Bin 0 -> 490 bytes .../Drinks/robustnukie.rsi/meta.json | 25 ++++++++++++++++++ 7 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 8a039e10ad..ba62fd913b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: RobustSoftdrinksInventory startingInventory: DrinkColaCan: 4 @@ -7,3 +7,5 @@ DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 + emaggedInventory: + DrinkNukieCan: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index a3a674598c..93843b36e7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -288,6 +288,31 @@ - type: Item sprite: Objects/Consumable/Drinks/dr_gibb.rsi +- type: entity + parent: DrinkCanBaseFull + id: DrinkNukieCan + name: robust nukie drink + description: An encouraging drink... very encouraging. It is filled with green liquid, after use it is recommended to consult a doctor. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Stimulants + Quantity: 10 + - ReagentId: NuclearCola + Quantity: 15 + - ReagentId: Ice + Quantity: 5 + - type: Tag + tags: + - Recyclable + - type: Sprite + sprite: Objects/Consumable/Drinks/robustnukie.rsi + - type: Item + sprite: Objects/Consumable/Drinks/robustnukie.rsi + - type: entity parent: DrinkCanBaseFull id: DrinkEnergyDrinkCan diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..df48b1d7ff5dc5a4e18f94d5b880f88899371cb2 GIT binary patch literal 497 zcmVb*b5TzI z9QGhLCn+~=u9B;ZL=MW$fl`u#C^rWs5!u~2P;&S=SQ~LLBi7-4YYy)<@B91oeKWrq zB_dQ(RTZu71NZrdF>qiEFgF zS~A((r}(#bk0h4ple80(U;PCDEh}?Oe(`=npRs2VfH43-YHc2X%hJO19LL56uLoZlPAXW2d4Pcc(bn%(?@jL*ng9T34BYz8U=y^OW zRFN8aqco+jTI1W?!JWa(S^&y8LtvQZH ztpSwD=`|Jz07xVprco&_Man&3ukb)mB&cStuZ;kVw_%&>s#C3{P literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..1d1398764b9a94ed9a514cbb6f5af4b385549e43 GIT binary patch literal 523 zcmV+m0`&cfP)A2e0P~ea0gN`E3Lq?3q`q7F`oqTf|9;4&D+S@6*-Z)=)wnB68_A+S)2%xgx*!?78;o%QtE37?h%y5=}l4(JRokG|S5i z#>edzD-Hsv0RZxEUIVaQKkwN>jhW~0uJX|$iFzEbLnbs?!5YE5Rkrk%zNLbxVwA( z006)0b^l%=hZ^9v=P^~SayN>|raYcm%X%*73}7^`S1FMIkW4zw9b?!QX?Va&?T~>? z(#-7ar~uU0u*dh!rnOS5_cs!^02s(5)h{6^75Ep?^dC_S5Cb$F;1mWo&2*=Vno0lw N002ovPDHLkV1l>1;D7)C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d61a6ad309f9fe16da7de2dcbca132c283a448f4 GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vna zPZ!6KiaBp*ZS*=EAky}~_+rX>@7-EW4Beuc|{EgfpmFC z*|{az3q6WupJXl6QnUQ3{;cN0TA6*npFRtk)$v`<_t-|(8xaiK7^Jxmh$SR5-eAhn zVTf+%WliATu#q8$(M+sC_rS7`jAAD3x@*_`-nurI;lSOetPCekJBL->`!e5jcDuS< zL(E)01_q^1kH6PXy&Rg1}e z|M&QEo<%?BC%jUcze8rOg&4yP>E4iMbi>5?+Kd$G9B;c20OdHTW zEG6&o_vD56OHqDl_uMtC7GLvkD@!r7>2=$Gck1)suMZh#)pECd7d-d9-+TIheQO7X zgmMcVo5k0x8CLwWYkI}ELV4?b#!z@@!EKmro-{E}H!@`!xEtNoi5xn^}$*6!RZw zmz=$3DBxw=KCMaDq(TwYWSi)ikoQ%uA81638 zmyw&l`|@dRh6CT9voqYNm=dz)>G@CGbGv_wfB*U`Vc&UiHim@l@B8)67Qgv_M$JcN z$&S)J?EF9U8DH}*dvVWp`iGTbn-_dsXBYp)@4^{_9;GFf?k*>JDP((B@6oQ0wa&X)78&qol`;+0N@PKlmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json new file mode 100644 index 0000000000..eff71e3c14 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} -- 2.51.2