From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Mon, 3 Apr 2023 06:42:37 +0000 (+0300) Subject: [Drink] Robust nukie drink (#15051) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4443850de32287b40d527d0f936be2f777c42f62;p=space-station-14.git [Drink] Robust nukie drink (#15051) * [Drink] Robust nukie drink only syndie. * [desc]grammar fix * [Meta] newline at the end --- 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 0000000000..df48b1d7ff Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png differ 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 0000000000..1d1398764b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png differ 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 0000000000..d61a6ad309 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png new file mode 100644 index 0000000000..b9968d8a9c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png differ 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 + } + ] +}