]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
[Drink] Robust nukie drink (#15051)
authorPuro <103608145+PuroSlavKing@users.noreply.github.com>
Mon, 3 Apr 2023 06:42:37 +0000 (09:42 +0300)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2023 06:42:37 +0000 (00:42 -0600)
* [Drink] Robust nukie drink

only syndie.

* [desc]grammar fix

* [Meta] newline at the end

Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json [new file with mode: 0644]

index 8a039e10ad7c53525e041ffdda2bae627ad79f42..ba62fd913b5030156209529da09ac01a7805b843 100644 (file)
@@ -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
index a3a674598cee4450af5a36ccedd3753c4a317355..93843b36e7135620ae4b736e92ebf9d24a6b88f4 100644 (file)
   - 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 (file)
index 0000000..df48b1d
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 (file)
index 0000000..1d13987
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 (file)
index 0000000..d61a6ad
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 (file)
index 0000000..b9968d8
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 (file)
index 0000000..eff71e3
--- /dev/null
@@ -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
+    }
+  ]
+}