From eb8599d204d51527539e1dde4898960b4080d341 Mon Sep 17 00:00:00 2001 From: iaada Date: Fri, 25 Jul 2025 15:01:34 -0500 Subject: [PATCH] trash drinks gets trashed (fixed) --- .../Consumable/Drinks/trash_drinks.yml | 211 +++++------------- .../ntcahors.rsi/icon_open.png} | Bin .../Consumable/Drinks/ntcahors.rsi/meta.json | 3 + .../absinthebottle_empty.rsi/icon.png | Bin 453 -> 0 bytes .../absinthebottle_empty.rsi/meta.json | 1 - .../TrashDrinks/alco-clear.rsi/icon.png | Bin 222 -> 0 bytes .../TrashDrinks/alco-clear.rsi/meta.json | 1 - .../TrashDrinks/alebottle_empty.rsi/icon.png | Bin 473 -> 0 bytes .../TrashDrinks/alebottle_empty.rsi/meta.json | 1 - .../TrashDrinks/beer_empty.rsi/icon.png | Bin 522 -> 0 bytes .../TrashDrinks/beer_empty.rsi/meta.json | 1 - .../TrashDrinks/broken_bottle.rsi/icon.png | Bin 656 -> 0 bytes .../TrashDrinks/broken_bottle.rsi/meta.json | 1 - .../coffeeliqueurbottle_empty.rsi/icon.png | Bin 497 -> 0 bytes .../coffeeliqueurbottle_empty.rsi/meta.json | 1 - .../cognacbottle_empty.rsi/icon.png | Bin 536 -> 0 bytes .../cognacbottle_empty.rsi/meta.json | 1 - .../gildlagerbottle_empty.rsi/icon.png | Bin 483 -> 0 bytes .../gildlagerbottle_empty.rsi/meta.json | 1 - .../TrashDrinks/ginbottle_empty.rsi/icon.png | Bin 617 -> 0 bytes .../TrashDrinks/ginbottle_empty.rsi/meta.json | 1 - .../TrashDrinks/glass_empty.rsi/icon.png | Bin 209 -> 0 bytes .../TrashDrinks/glass_empty.rsi/meta.json | 1 - .../TrashDrinks/ntcahors_empty.rsi/meta.json | 1 - .../patronbottle_empty.rsi/icon.png | Bin 475 -> 0 bytes .../patronbottle_empty.rsi/meta.json | 1 - .../pwinebottle_empty.rsi/icon.png | Bin 433 -> 0 bytes .../pwinebottle_empty.rsi/meta.json | 1 - .../TrashDrinks/rumbottle_empty.rsi/icon.png | Bin 471 -> 0 bytes .../TrashDrinks/rumbottle_empty.rsi/meta.json | 1 - .../tequillabottle_empty.rsi/icon.png | Bin 603 -> 0 bytes .../tequillabottle_empty.rsi/meta.json | 1 - .../vermouthbottle_empty.rsi/icon.png | Bin 544 -> 0 bytes .../vermouthbottle_empty.rsi/meta.json | 1 - .../vodkabottle_empty.rsi/icon.png | Bin 518 -> 0 bytes .../vodkabottle_empty.rsi/meta.json | 1 - .../whiskeybottle_empty.rsi/icon.png | Bin 534 -> 0 bytes .../whiskeybottle_empty.rsi/meta.json | 1 - .../TrashDrinks/winebottle_empty.rsi/icon.png | Bin 504 -> 0 bytes .../winebottle_empty.rsi/meta.json | 1 - 40 files changed, 55 insertions(+), 178 deletions(-) rename Resources/Textures/Objects/Consumable/{TrashDrinks/ntcahors_empty.rsi/icon.png => Drinks/ntcahors.rsi/icon_open.png} (100%) delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/alco-clear.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/beer_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/broken_bottle.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/coffeeliqueurbottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/cognacbottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/gildlagerbottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/ginbottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/glass_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/ntcahors_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/patronbottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/pwinebottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/rumbottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/tequillabottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/vermouthbottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/vodkabottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/TrashDrinks/winebottle_empty.rsi/meta.json 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 0267a69709de2ac8bf24f4607e1287c13529cf2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmV;$0XqJPP)_wOtvW{{l*7#J8B-txOLaPl)SFfc40 z7zZ3acb?(UnX?RX{p@6$K~WUg8W}QFr=?J01Op=}&2m@*EI1)?_Q|tn81j*`R!521 zsfKk~R|gVnCRtHXwDKW?ory8Sp)-i|cjMMAa*QHB3T7=^&R}O^%wT6?Os)|O3=Cw3 zKuv#g%p!&**B>xkVPIfjV33PuXOLsiWmxNRO`TM;2E0K+mIGiVAT46o@3JdzA_!cZN5?a{C+*Tse zW7VM5Fv&&3otK@bf`exVv)kf^iFejXRxuxG{@gBN`D}tL>yxMsJ~kUJH(3UTAVFmp U-y7b4fDUHxboFyt=akR{0QVYD82|tP 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 05d0e0330f012153bec176ec84de1c35d875b6b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 473 zcmV;~0Ve*5P)lI`!GB7YOFmS(TW?*0_rmq7S7#J8X z`3&>+vCbyPEVAo@f2^*nV2SU~^Cznq7>igP) zP((!9bZOH-3t2)z9jsNKii%=Fim#~Sa}Z0{o-6NB=-KXYzx&;D&$*YY)$4V<44>}!G8a=H@=g&eKR=fsxN9VzFKbYgwf44i&6x&=@(W;KtVF>cBq*qSlku4<3~>ek3ggXGC-~EVpqQbQfv4f7((aW78rCYeqtj8>1#~;P z;B;wb2_to`_X5X1zaNahygK8Wz^;g2w-YH9z@7#E?H-5&HGpFyhs)9|czzX&+b~Bt zGZY@qd~dgS@ok+cZZ;(xQ3i69%|3sGv5gps=UKY#9xgcvQ8$PLhQh;S+Y>C6j_{!H z6}_6L-#H^esnx)TyZ6~HPOBi~HE^_eiYu)Q04L~yu*(8J@~?Opoa6208}w>kijfI4 ztW_$(IkN2uzWnwxlPog-`msnrR0Ac9)H{2FXOR^a&sX^6-)2o)6t$uF2uc|Du>RhJ zbOT^WI4WIGQ<%FGn&fY&+sTF9#q5-7QSE^R48o{1l@$F&_KFdHw`K}^dCgm@R-+5K@jvpRNyJ2 zZjsf+#6@>w-F%;QW?N@x=dDBGeMUzw{$QAS4$m_mp5OEQo*7|!dYXd_aW|cBj^6Nx zhpzeu0(k#+%J1mxB$LVT>cyMT2sv!Wb$yXsVFt@`Flwc+!-NN1%w`zbkZ^p7rJfU^ z0ijcnN|qR!xJLi@2zvR;{sTO{g-TVSQmvzSXZ9cP^x1RfavDn&laHT1hXx2?>cEFb zxBb&n9>)jQg|rH<=Q|mjd?ExLEAR|d-d*;OlV{b0x(kX7mIK4RB_2Px8+bd0N`d8q zDnVQX+y8fkjZlD?1j7Hj?S+3igs1~c4c(l(HGtTD1Sc^-j8)nTI%K$TT``p-uX*jQhtp=NL; zdy4XkPE2m#TXBxM>Z94~fdPRR;r)AA9!^}sZ!}OO_*I%hauygK%yP1IA5!3M{Xs9T zaP~qMt%KcE|8()==LW7_L8(d61H4!gTb8gA2Fvvvq6&>iZMUAkR>Oehk-wnvhDnigpo!FoqDrys(?)g+xR*(H~G3BWUb$u>T?Y1G<C2b6o1~ph^8CRCYXKJLdo&6k@h^n&FNFD%%MzOFSqE@0 zx=d&D3#C_E0Jz_jSX%U12VhTs2f(`)H6a|SUm^fe5&pe<6ZajL330NYrrdSG;plCt z)CE62?*LFRs+{xP5ZMrSL0(te1C#*@MxI)^MXlW8==ir7Kq&>8Z*>5!%($!t_^|b! zC(m9|C>8-QzJ6kNFJ~RVUdBmgJxMNKG~d;lvS5m9;G|N;GbIoGP&Uck@af}6|Ll65 ndIdmqG8O@hQ~&p&bR0Sb+N6J&ER>GO00000NkvXXu0mjfyC>XB 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 c10f4082561604e3fe0a38c27af7d8891d08cf13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmV+z0_XjSP)E0jRWDI|kr>XZ&D3NAMO z0f&8o&^{#KS!kE);3btnkK>4MaXN=25|o1XOH3%_JKeqGzP}Im`@Y{jO$dQuYHX<0 zM*t&$UI3(&CB|5iF_x54mZ&}ts4u3|>4|(kzX$+^VH_)^NIn{M4m2vcAU6L7^^-%K z{W`*A{Jlo;`F}Go0_c~>yCAbsL;Tc&?}AIJ4ZQ`4x4Yj@ zy(ik`)0f&zV)f&|0s19!3jly~o&tbswK`aUNF?&jw(Ysy)kKils6i>E>AId(N@c@( zg>FHoIAbhX{Q3}&#vg-oo>EF>bzKh)5b9shUA$Z_?{q)ooTr2kTT;qWG#Y(%SI?e8 z*r?=!MkN;jfDmG%F=i>Ry>?VNy zdj;rdWr?Bb{b?2ddyX#$G@sA_nan%QGz-B20LQ7f06Z7X3m?Bvel7#Ja{vKi2rX;> z^$**I@44_j7XVQF{E2iTBDY|@utq9)Q=~6&a|ZOHP=n}Slg_fN7v1+^1`+vG+%FCN acYFl`JhC~W5A^8(0000!k}Z3G ziAei}tBhBe7V}9IuuquFy~a2!=J})N-@`8RB>d1RG@JMEy7;Cuk{<*lN)N1HZrjEz zqT-S(3dEX*%@gN{P2ALXaI1Q|m1%0o8Hss!ERTYWZ40h{WB$W3f^AZk*h$3&Ymy7z zzMIM&1+qN)+<^lJ0%BtWx4b;?@vBK`15m%IUR_;&Z1(Sr>!03w8Jvziy(5K_ZEAjD-ePXOt66Ez>4GZQz%;(`$+3 zSXwJ7Az?N-SuAqv!&S1!M!g!Kz$I(*~$JG=Cf4@H3eYD_U=~P}L ztu&t9_x5Efn96ySHQajtzgt2=0;Ef(x%2J2FF6T7aAQuwBL7vDA(~x@kwu@Lu}i;r z+K~K$X~P>2Ed@=kb@z8|?rLmQl#8u7zV7ZXkkeM~JgQ>dux3}otb_xrlNqWUdT;Mq T{^&X|@)$f_{an^LB{Ts5#lF^C 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 4be9d1fa206600be3cdcfe3ef78c89b2839a6b77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 617 zcmV-v0+#)WP)#ev${U6;YZ%6?Wm$Qt&IRd*rfH65v)LJdL?TgcHk%?HMcM_Zy1wN1`|q6#K)-WOt8OG^Deyj7!TAXx542Ko ze6KsT@M9wET1y1bO2rukTHU?Gu?XPOqb0m2)PS$Mw#yccgI&6{dG-KfFV@#oRZZ8E zky2p61b){*ExX8_w_oQnnT)Gzaj?rsy~d#@G?0X-2DIfZy)%e%RQLA)m|3suC`$BP z004ryS9%c8qyk+V`g=eWfo*fD)JnyvKVAVkZCJ}Lf?yPjQ?PS4hZj0EP`0EpGJvD} z!?79=6rroj=ua=6LZNWIe;?WT3j-*8HH|EDwVJu_9@C%j=0 zi_2@%J-+_K!%4{rKOAROF0pE8Y-~JuJZL%B>>qvF-*0=EW*-oKxPsYD*5Fk`Ap3++ zA-kU^*O?~peR%LkaqHu6y^X7RPj2N9m-t`;R?uU`z`#q#+_ z=n#Ne4&_=+>gY{lU|>l5@czB&db87aLClHn|g7#J8BN4sXD4j5<$006O)drZuK Rski_D002ovPDHLkV1h1Q%H99~ 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 964c96d1982916b6dd0415d2e79dd270df4f6b3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmV;i0Z#sjP)W-a7ma} zR788&5U1F7zh_=T-|66Zzx%xJ@B7}n7ihQJ_^B0Nzy22h)}#ZoR&kt3lmKXS%iJ_C z0}BO6>K2V|8G!I+R9Z%@1(`&Nq;9E{@IM3p0Luw*TDl%a~phj!1GqT8XfY?kY2wr`(ho!k&WL60MPZ> zz5o5~MN&o%0AQLa3?l}Bt%&);KyoTpWNa!-!2Fq!IzN zTDO>HY66if0tygdcCLj(DV$je1{Qy&vsr4NG_*8f4?3-1^}YlkqBU( b@;w7zoO^BZPL-No00000NkvXXu0mjfPM^H3 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 723c599e48e4a0ddd7c2d7eb8f5ff74db16f41d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 471 zcmV;|0Vw{7P)PfUB!Y9`d4^LjDnrINlZfB zMTVe6U>+j;3%qq$mkjH+XR;CWT()=P{k|Wb@4G$E%XD3bmoek%>i+;v01U&>WLZ{a zSym0h(5N~->cng|>o1i`X#hwh5}na#MABi@uVC2KtXN#Z@a+Y!{XSO36r<>Pz6Zz_ z9G+gac%IL#3rWl_w~we6IL-iLOms5ea|=iS;c&Rg^L!2fEX(Rjk~H8r?$Q;2$;AN( zP9dCFAOLutd{C>^LT&;~CH?_C2e4fWhF#5?9GhnQ$9v`M+Ez^KnopzG=}~3q02hVA_x;Iv#(e+)sFbUyl&el8XnWx4@c{sE5R+h 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 0d59bc4fcdba5cd25c9d0572d2a200cc9ef8d927..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 603 zcmV-h0;K(kP)(Id(gbEG{qJy`nEjs8ZE`nll z5xXQBB4m&R^rC~&E?E-IiKR*;hc1QZV6Is0(D%-Giys{C@gDF0{rUd?d+*b#)hc1e zu28f8ClG{yWm!|YuG_k<+m>Zbsp9NbJ=p8@ZbqZgvjC3c3k!bF?sp!4QJ*r(CxH& z^mMs!^5VHdcYO`uu?(KH1lf#9Vk}8A7N^^3^S1qwWGqfLW6DAS0VK#~Ov?3Vn{(BW zCNNhl;a|aiJSdg`5MRGBJ!}F1M`EM&_ly9r(rPg~IRU`EN<|t=n!w%MQ4(WG+z(v< zX7=yf+UcwH*Ke002ovPDHLkV1kjv7R~?w 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 e64c61c8658506f6a5e950cf1255909bc81b58ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmV+*0^j|KP)piVfsSu`J3Dx^0 z!2bYnRr+H3{)3>azXyQE(JAKBCt61Vy83%)9G(7NORcRGBLuIl!8ZRIRFn2U|6CP z`Y0Afz&J4605CBA>^(L}l^?Em1fUwNuDxA;m)hU=SXs?spstLlHzIcvlWN(8)zy96LC<-f-toXeVd4F3xUUtX>w| zK(WCrigLq&6d{~AWU$Cx99n91%U5j_d`t3P`2O#g_kZ8_Da*2ma>OFt{T-km0Nb|r zOw(L5O>@n*?LDc^urx52%Z(R{#T9^THhbdxzDP$&v*6FK@4@HA6)u}i&fO{>7xGG? zBR&Cb>xlSOideml)@Z>yz!^`~k820RVSD z=0pG@3*x1-M{~dIwj0u*0090?C;9*N3(&RzA%NI|p_9KP9FK(K;g{WLEbz+@NhrO9 zB7ocVNi@fMWWn9i2nZnhI)PZd4uB7Xy@dNaJKguEmGH#@CJqm4Go4lpu-bVlrLGHw z!gg4_x7Uo4$>eUU)w<|it5hn}0J^S!NTpJPx$&`Cr=R9J=Wm$6GDK@`S+BbI@b*NBCwgd;bbD#T(zVk;cj2{vg`T;m@g1kxmk zT3Kld?Zry5h$I|b+#=DO1gsJySc-^lKNco2YQW4}H3&Xf_A$$R^YMLe-eXm{TxOIp zHqz6-2?QbFdEUP3x{I#sE_$A~FU1*`ZcL}sKl1tf0zfjE{O|j|2uDe8K{mT#CMPFo zx32(LSy@&R9I*wrH`fF6Pb2VNA+CYr(!ohM9R34PtJUVEH4s<_>q_@vV7l|Z=-Ob6X>{sgXcAHjrh$vjgE6K7kM&S2 z7Ju0Qjl2e|EXZaz%v(+8?*5jo?aiUPqID5QwPtQ^cHpylFGFO`3l zk0)?muLH8C6PUo>-p)ziG<+7_iI~gfe%oMvtzi@jg))QIUyk5-JU+Av;{Ss8ijiCJ Y07|5&p6`0pa{vGU07*qoM6N<$f-9`?=>Px# 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 45fa94abd9e48c4def4d9c6ddc600a2c0f3d3d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 504 zcmVe1=1fKl~s7XUI0qX7AZ|?DR8xS;Ha!hg(8P*;9o$xV3IiD!^N)d(guj%UIGw{ zo)QY3(l@+pGRl?p2#9=OZT*b>!+WZ09o$4?#P9BSe14^G*f^Kr2rSOd>o&VRc{qU0 zZpT_`LE?zHmx9hl3-AVyVQR`C9K8adxCopLg_#%7)>Vf~8vr1FdrAM#zUqXG3s6{C z*<*aLmFZ<408RDzqI`-31VWMIw`Z;wfYGTKaBKwJX~ z>h@ZD1$@Q-PQcPkViu^|C%VA60C5Tep$MxxiMC6n2E-BQ(VRGI6UO72>m?R7?g1hJ zCr4MD9C?y!<%CigPQmf{3)fF(bZZmWPi9K2&6HT1dH*OUa`BmY0qKTVfEvZALi8k? u9Gmzx_n+Th0NB{xGW;YH2}mchUIX85&yHmJ%vr_&0000