trash drinks gets trashed (fixed)

Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml

@@ -1,260 +1,153 @@
 # These can still be used as containers
 - type: entity
   abstract: true
-  parent: [ BaseDrinkOpenableOpen, DrinkBottleGlassBaseFull ]
+  parent: [ BaseDrinkOpenableOpen, BaseDrinkEmptyTrash ]
   id: DrinkBottleBaseEmpty
-  suffix: Empty
   components:
-  - type: Tag
-    tags:
-    - Trash
-  - type: SpaceGarbage
-
-- type: entity
-  abstract: true
-  parent: DrinkBottleGlassSmallBaseFull
-  id: DrinkBottleBaseSmallEmpty
-  components:
-  - type: Item
-    size: Small
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
-
-- type: entity
-  abstract: true
-  parent: [ BaseDrinkOpenableOpen, DrinkCartonBaseFull ]
-  id: DrinkCartonBaseEmpty
-  suffix: Empty
-  components:
-  - type: Tag
-    tags:
-    - Trash
-  - type: SpaceGarbage
-
-- type: entity
-  abstract: true
-  parent: DrinkCartonBaseEmpty
-  id: DrinkCartonBaseLargeEmpty
-  components:
-  - type: Item
-    size: Normal
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 100
+  - type: Tag
+    tags:
+    - DrinkBottle
+    - Trash
 
-# Containers
 - type: entity
-  name: Jailbreaker Verte bottle
-  parent: DrinkBottleBaseEmpty
-  id: DrinkBottleAbsinthe
+  abstract: true
+  parent: [ BaseDrinkOpenableOpen, BaseDrinkEmptyTrash ]
+  id: DrinkBottleBaseSmallEmpty
   components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi
-
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+  - type: Tag
+    tags:
+    - DrinkBottle
+    - Trash
 
 - type: entity
-  name: alcohol bottle
-  parent: DrinkBottleBaseEmpty
-  id: DrinkBottleAlcoClear
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/alco-clear.rsi
-
+  abstract: true
+  parent: [ BaseDrinkOpenableOpen, BaseDrinkEmptyTrash, DrinkCartonBaseFull ]
+  id: DrinkCartonBaseEmpty
 
 - type: entity
-  name: ale bottle
-  parent: DrinkBottleBaseSmallEmpty
+  abstract: true
+  parent: [ BaseDrinkOpenableOpen, BaseDrinkEmptyTrash, DrinkCartonBaseLargeFull ]
+  id: DrinkCartonBaseLargeEmpty
+
+# Small bottles
+
+- type: entity
+  parent: [ DrinkBottleBaseSmallEmpty, DrinkAleBottleFull ]
   id: DrinkBottleAle
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
-
 
 - type: entity
-  name: beer bottle
-  parent: DrinkBottleBaseSmallEmpty
+  parent: [ DrinkBottleBaseSmallEmpty, DrinkBeerBottleFull ]
   id: DrinkBottleBeer
   components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
+  - type: Tag
+    tags:
+    - Beer
+    - Trash
 
+# Large bottles
 
 - type: entity
-  name: cognac bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [ DrinkBottleBaseEmpty, DrinkAbsintheBottleFull ]
+  id: DrinkBottleAbsinthe
+
+- type: entity
+  parent: [DrinkBottleBaseEmpty, DrinkBlueCuracaoBottleFull]
+  id: DrinkBottleAlcoClear
+
+- type: entity
+  parent: [ DrinkBottleBaseEmpty, DrinkCognacBottleFull ]
   id: DrinkBottleCognac
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi
-
 
 - type: entity
-  name: Griffeater gin bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [ DrinkBottleBaseEmpty, DrinkGinBottleFull ]
   id: DrinkBottleGin
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/ginbottle_empty.rsi
-
 
 - type: entity
-  name: gildlager bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkGildlagerBottleFull]
   id: DrinkBottleGildlager
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi
-
 
 - type: entity
   name: coffee liqueur bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkCoffeeLiqueurBottleFull]
   id: DrinkBottleCoffeeLiqueur
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi
-
 
+# todo make a real cahors bottle
 - type: entity
   name: nt cahors bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkBottleGlassBaseFull]
   id: DrinkBottleNTCahors
   components:
   - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/ntcahors_empty.rsi
-
+    sprite: Objects/Consumable/Drinks/ntcahors.rsi
 
 - type: entity
-  name: patron bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkPatronBottleFull]
   id: DrinkBottlePatron
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/patronbottle_empty.rsi
-
 
 - type: entity
-  name: poison wine bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkPoisonWinebottleFull]
   id: DrinkBottlePoisonWine
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi
-
 
 - type: entity
-  name: rum bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkRumBottleFull]
   id: DrinkBottleRum
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/rumbottle_empty.rsi
-
 
 - type: entity
-  name: tequila bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkTequilaBottleFull]
   id: DrinkBottleTequila
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi
-
 
 - type: entity
-  name: vermouth bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkVermouthBottleFull]
   id: DrinkBottleVermouth
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi
-
 
 - type: entity
-  name: vodka bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkVodkaBottleFull]
   id: DrinkBottleVodka
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi
-
 
 - type: entity
-  name: whiskey bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkWhiskeyBottleFull]
   id: DrinkBottleWhiskey
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi
-
 
 - type: entity
-  name: wine bottle
-  parent: DrinkBottleBaseEmpty
+  parent: [DrinkBottleBaseEmpty, DrinkWineBottleFull]
   id: DrinkBottleWine
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi
 
+# Small cartons
 
 - type: entity
-  name: lime juice carton
-  parent: DrinkCartonBaseEmpty
+  parent: [DrinkCartonBaseEmpty, DrinkJuiceLimeCarton]
   id: DrinkCartonLime
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/limejuice.rsi
-
 
 - type: entity
-  name: orange juice carton
-  parent: DrinkCartonBaseEmpty
+  parent: [DrinkCartonBaseEmpty, DrinkJuiceOrangeCarton]
   id: DrinkCartonOrange
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/orangejuice.rsi
-
 
 - type: entity
-  name: tomato juice carton
-  parent: DrinkCartonBaseEmpty
+  parent: [DrinkCartonBaseEmpty, DrinkJuiceTomatoCarton]
   id: DrinkCartonTomato
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/tomatojuice.rsi
-
 
 - type: entity
-  name: milk cream carton
-  parent: DrinkCartonBaseEmpty
+  parent: [DrinkCartonBaseEmpty, DrinkCreamCarton]
   id: DrinkCartonCream
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/cream.rsi
 
+# Large cartons
 
 - type: entity
-  name: milk carton
-  parent: DrinkCartonBaseLargeEmpty
+  parent: [DrinkCartonBaseLargeEmpty, DrinkMilkCarton]
   id: DrinkCartonMilk
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/milk.rsi
 
 - type: entity
-  name: soy milk carton
-  parent: DrinkCartonBaseLargeEmpty
+  parent: [DrinkCartonBaseLargeEmpty, DrinkSoyMilkCarton]
   id: DrinkCartonSoyMilk
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/soymilk.rsi
 
 - type: entity
-  name: oat milk carton
-  parent: DrinkCartonBaseLargeEmpty
+  parent: [DrinkCartonBaseLargeEmpty, DrinkOatMilkCarton]
   id: DrinkCartonOatMilk
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/oatmilk.rsi

Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json

@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "inhand-left",
             "directions": 4

Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}

Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/meta.json

@@ -1 +0,0 @@
-{"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"}]}