]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Revert "trash drinks gets trashed (fixed)"
authoriaada <iaada@users.noreply.github.com>
Sat, 26 Jul 2025 00:24:13 +0000 (19:24 -0500)
committeriaada <iaada@users.noreply.github.com>
Sat, 26 Jul 2025 00:24:13 +0000 (19:24 -0500)
This reverts commit eb8599d204d51527539e1dde4898960b4080d341.

Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
Resources/Textures/Objects/Misc/broken_bottle.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/broken_bottle.rsi/meta.json [new file with mode: 0644]

index b458f0ae215648f518f2d50dae388d6a8383a90e..12240adf474e1df4dea6ef2ce889cc4f3c5e2c51 100644 (file)
@@ -15,7 +15,7 @@
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi
+    sprite: Objects/Misc/broken_bottle.rsi
     state: icon
   - type: DamageOtherOnHit
     damage:
diff --git a/Resources/Textures/Objects/Misc/broken_bottle.rsi/icon.png b/Resources/Textures/Objects/Misc/broken_bottle.rsi/icon.png
new file mode 100644 (file)
index 0000000..56c2b98
Binary files /dev/null and b/Resources/Textures/Objects/Misc/broken_bottle.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/broken_bottle.rsi/meta.json b/Resources/Textures/Objects/Misc/broken_bottle.rsi/meta.json
new file mode 100644 (file)
index 0000000..db0ac60
--- /dev/null
@@ -0,0 +1 @@
+{"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", "states": [{"name": "icon"}]}
\ No newline at end of file