]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add sake bottle (#26776)
authorPursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Sat, 6 Apr 2024 20:16:47 +0000 (14:16 -0600)
committerGitHub <noreply@github.com>
Sat, 6 Apr 2024 20:16:47 +0000 (13:16 -0700)
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json [new file with mode: 0644]

index eaa4c839af21718c6c4e2c08ee327e7ccf2fa414..bd8b04f982b646b3e039be299af7700d7d7ba1ce 100644 (file)
@@ -38,6 +38,7 @@
     DrinkWhiskeyBottleFull: 5
     DrinkWineBottleFull: 5
     DrinkChampagneBottleFull: 2 #because the premium drink
+    DrinkSakeBottleFull: 3
     DrinkBeerCan: 5
     DrinkWineCan: 5
   emaggedInventory:
index e2361cfa6ee73dcdf543376c18d78042dd107908..b6455735cc103c3422777e3997737941ee4958c3 100644 (file)
   - type: Label
     currentLabel: tonic water
 
+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
+  id: DrinkSakeBottleFull
+  name: small sake bottle
+  description: The regret of the next morning seems to be nipping on the bottle too.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Sake
+          Quantity: 50
+  - type: Label
+    currentLabel: Sake
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/sakebottle.rsi
+  - type: Sealable
+
 # Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards
 
 - type: entity
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png
new file mode 100644 (file)
index 0000000..53b96d6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png
new file mode 100644 (file)
index 0000000..5727361
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json
new file mode 100644 (file)
index 0000000..6009794
--- /dev/null
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, recolored by PursuitinAshes (Github)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}