From: iaada Date: Fri, 25 Jul 2025 20:01:34 +0000 (-0500) Subject: trash drinks gets trashed (fixed) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=eb8599d204d51527539e1dde4898960b4080d341;p=space-station-14.git trash drinks gets trashed (fixed) --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index a1e95ad845..134a0c27d2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/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: SolutionContainerManager + solutions: + drink: + maxVol: 100 - type: Tag tags: + - DrinkBottle - Trash - - type: SpaceGarbage - type: entity abstract: true - parent: DrinkBottleGlassSmallBaseFull + parent: [ BaseDrinkOpenableOpen, BaseDrinkEmptyTrash ] 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: + - DrinkBottle - Trash - - type: SpaceGarbage - type: entity abstract: true - parent: DrinkCartonBaseEmpty - id: DrinkCartonBaseLargeEmpty - components: - - type: Item - size: Normal - - type: SolutionContainerManager - solutions: - drink: - maxVol: 100 + parent: [ BaseDrinkOpenableOpen, BaseDrinkEmptyTrash, DrinkCartonBaseFull ] + id: DrinkCartonBaseEmpty -# Containers - type: entity - name: Jailbreaker Verte bottle - parent: DrinkBottleBaseEmpty - id: DrinkBottleAbsinthe - components: - - type: Sprite - sprite: Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi + abstract: true + parent: [ BaseDrinkOpenableOpen, BaseDrinkEmptyTrash, DrinkCartonBaseLargeFull ] + id: DrinkCartonBaseLargeEmpty +# Small bottles - type: entity - name: alcohol bottle - parent: DrinkBottleBaseEmpty - id: DrinkBottleAlcoClear - components: - - type: Sprite - sprite: Objects/Consumable/TrashDrinks/alco-clear.rsi - + parent: [ DrinkBottleBaseSmallEmpty, DrinkAleBottleFull ] + id: DrinkBottleAle - type: entity - name: ale bottle - parent: DrinkBottleBaseSmallEmpty - id: DrinkBottleAle + parent: [ DrinkBottleBaseSmallEmpty, DrinkBeerBottleFull ] + id: DrinkBottleBeer components: - - type: Sprite - sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi + - type: Tag + tags: + - Beer + - Trash +# Large bottles - type: entity - name: beer bottle - parent: DrinkBottleBaseSmallEmpty - id: DrinkBottleBeer - components: - - type: Sprite - sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi + parent: [ DrinkBottleBaseEmpty, DrinkAbsintheBottleFull ] + id: DrinkBottleAbsinthe +- type: entity + parent: [DrinkBottleBaseEmpty, DrinkBlueCuracaoBottleFull] + id: DrinkBottleAlcoClear - type: entity - name: cognac bottle - parent: DrinkBottleBaseEmpty + 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 diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/icon_open.png similarity index 100% rename from Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/icon_open.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json index e91afea62f..08a3a6b849 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon_open" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png deleted file mode 100644 index 0267a69709..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/icon.png deleted file mode 100644 index ef981a53fc..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png deleted file mode 100644 index 05d0e0330f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/icon.png deleted file mode 100644 index 0731fb54d7..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/icon.png deleted file mode 100644 index 56c2b98bba..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/icon.png deleted file mode 100644 index d7e4081ab2..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/icon.png deleted file mode 100644 index c10f408256..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/icon.png deleted file mode 100644 index 035c921d89..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/icon.png deleted file mode 100644 index 4be9d1fa20..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/icon.png deleted file mode 100644 index 00b2ed6152..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/icon.png deleted file mode 100644 index aeb4d6ea59..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/icon.png deleted file mode 100644 index 964c96d198..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/icon.png deleted file mode 100644 index 723c599e48..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/icon.png deleted file mode 100644 index 0d59bc4fcd..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/icon.png deleted file mode 100644 index e64c61c865..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/icon.png deleted file mode 100644 index 4b23d0ca20..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png deleted file mode 100644 index c0eafca108..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/icon.png deleted file mode 100644 index 45fa94abd9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/meta.json +++ /dev/null @@ -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"}]} \ No newline at end of file