From 0163f2af091dd03abae5a936048297a43f56961a Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 13 Sep 2020 12:07:26 +0000 Subject: [PATCH] Firey rags are not fucking drinks (#2037) --- .../Entities/Objects/Consumable/drinks.yml | 48 ------------------ .../Consumable/Drinks/rag.rsi/icon.png | Bin 472 -> 0 bytes .../Consumable/Drinks/rag.rsi/meta.json | 1 - .../Consumable/Drinks/rag_lit.rsi/icon.png | Bin 823 -> 0 bytes .../Consumable/Drinks/rag_lit.rsi/meta.json | 1 - .../Consumable/Drinks/rag_small.rsi/icon.png | Bin 347 -> 0 bytes .../Consumable/Drinks/rag_small.rsi/meta.json | 1 - .../Drinks/rag_small_lit.rsi/icon.png | Bin 670 -> 0 bytes .../Drinks/rag_small_lit.rsi/meta.json | 1 - 9 files changed, 52 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag_lit.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag_lit.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag_small.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag_small.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag_small_lit.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/rag_small_lit.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index 2d03a07a9f..fcce80914c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -1242,54 +1242,6 @@ - type: Icon sprite: Objects/Consumable/Drinks/pwineglass.rsi -- type: entity - parent: DrinkGlassBase - id: DrinkRag - name: rag - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/rag.rsi - - type: Icon - sprite: Objects/Consumable/Drinks/rag.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkRagLit - name: rag lit - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/rag_lit.rsi - - type: Icon - sprite: Objects/Consumable/Drinks/rag_lit.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkRagSmall - name: rag small - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/rag_small.rsi - - type: Icon - sprite: Objects/Consumable/Drinks/rag_small.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkRagSmallLit - name: rag small lit - description: '' - components: - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/rag_small_lit.rsi - - type: Icon - sprite: Objects/Consumable/Drinks/rag_small_lit.rsi - - type: entity parent: DrinkGlassBase id: DrinkRamen diff --git a/Resources/Textures/Objects/Consumable/Drinks/rag.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/rag.rsi/icon.png deleted file mode 100644 index 3c8c42bacccfb2b5274bddbe517c88013e2dc55a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmV;}0Vn>6P)NklAMBr}_2!>+5i+Ty8bMS2nZ{||d89*eyz7IEp1?N-GmlgvzJJQOM-th*ER zAem!Ap7+BufmbXR3;LYrhtp7uC26WSJ-HOSexLLm-Zm|DZD<E12wVKy&=3BQA4e$g)fYI!L{bzFkT2bIEtZ%o!g=j$V9@jb2q{BH2fT`9v zIYsD?e;?2qix3jmNlbeOSe_Z-+iy6v&x@D&Ry9NevQb7}DAH6gnNIGXhhQlr=&sx< zCmLW{gEN-q<^!wCo1cNzIk#1yGmfWw@{cV<1IkGeLLiK02SJY1{h&`*PlT^m1n&`P z!Thn^i0JVX0<<{2M%UFZL$1G!Mg8?NzO!7PpKZ+Pu?sxLjzalxuk+pSZ@*U$#MMP3 zf;!x|prQeF)u2?;>e_|n@**|{(RUs9J-ycP02lxRU;qq&0Wbjm3&0Pd2DF=6+X$Ng O00006?#*k$Q#vMq&?BHeU1#Z2WKw>=3d0qT7IKZXg#Ty<8F~P+P z>gp51&!QR1zBH;UPS8#fFJ0KS`Dc>Cr( zIJh8?zlTeuQuC}lJNT`{UIDxbLR?VGCXV$I1mc2WnCDJmV`JmrR7D&7L?SVF8Q;Pq zK;ZTe5aPn%ox9+99)t+zP9YMBaG6Yo0>JqA_#|LgC0vc4NF?T3MPW9;D~T}l3e?>^ zx^9VBU)|wMqXxrJF+9?D=KA8|B8^6)Tz%82RBFC%gcY^JR}>{)=hxTGy@1Jp;gP-p zK@dPGAo@ZW2n_-N+#Uk|#B=DH0pMiwvMk#^8QS5;a>;lw7@RE>3NIV)ZLS0+1J+k} z@@BOPvuc8ORiRdN0D%7DDGnDFfcO{yK$c~0W@d)gPu;F2*cLyVeJ#r}XBfsTaPbu2 zSlrGy;~WYvRv|4<#+cMx1MZ1 z4lfU;w*X*eGCj~L4s#D6q6m*f!1ElsJ>uE_Rl-9$kl=O;IE6<6AeKwoHUit>13>fU zTU7zG0SEhsFe?VMy)6_<-~YI#`c!!Rw@((?EMmFjyxmoB8Q=U83fI@MTr#dGO1#x1 zU^YP0DwI-C(HEkk%X`-K*QS>^x_Q`~M3j|d6aPXn8z4y%03D{fi_*^5TI02~=_T&q z^Dq4PRs=>zGXOHI9IO2NM}${~rsghs4-i-rC>DRBzduO3dIPoEX#;B1w(@}kfNfTQ zP5jHmTmi>N#~{R|t7VgFm3`JQ%(9EmJO;0eEPW1N2Xzc^IsvEEF~I2roL0vGrxS2m z9Rr+Bz-e_1a5@2})iJ>71e{jK0H+ghTK~NPzX33jxZMd+ZR-F4002ovPDHLkV1jt) Bd5r)7 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rag_lit.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rag_lit.rsi/meta.json deleted file mode 100644 index ae19bfdb03..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/rag_lit.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", "directions": 1, "delays": [[2.0, 2.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/rag_small.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/rag_small.rsi/icon.png deleted file mode 100644 index c49dbd49a1c7681d558a08b5cc8336e9da152d54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmV-h0i^zkP)tfFO%s*fLa}$%v zgf2sN`nv`A4*;sEz%UpXucvSv&20KA>b`H}z%Uq?G)ak~j3kK}jeYZ{0091ZpNIKQ z2qa3^mum!|wIq%T0F;*Gc~RSiMm=!iY9I%|ahxA%h&DIjXzUw9itC;-o31J~WaB9~ zj8u5YEM-$vuR^PPAPYAXYJi9zy8(DvWTH$zDfBIO_iiN{THl1mi{xb zvI`CStl;`aed|K&08ejMqKsCUvP3u@mlyd_h+jEI>-V0BKAtJ}IqT)(Xl|=xco^I8 tOl-phbZ|7U^K)zgEPw^D02aUkd;zv}V052^xSId~002ovPDHLkV1lSBlDz-` diff --git a/Resources/Textures/Objects/Consumable/Drinks/rag_small.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rag_small.rsi/meta.json deleted file mode 100644 index a2bca69076..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/rag_small.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", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/rag_small_lit.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/rag_small_lit.rsi/icon.png deleted file mode 100644 index 06c48b6381dc9e97ae9c53773098b01089632855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmV;P0%84$P)P5-mV90s}+~ z5RI8PK;|7FzOvv%=4D6{MY;5q_#tYV{9Fl$uPiw2RvXRcPqbPLH&zvgXFR|84a3m9 z+P&aj0?LJR`1IiiAqYXH{~pdX%^WWu55E_<44^aw*6aWPWEz5PcLu6ZsZ=JGic$Q! zuJ4TE=Q1EXM?t%;OOgai<$)?B5(!c$6dV9Zr_)=2e@PgJU)S{=uQ9j`D3^}N`*+90 zZFlTb*fzu3`qE$5^ZC4!OeTptY11@wt`WQ##cvpf=JLDW{d>Wg3|L!VTK4J>&rw|5 ze28|-2JmO{s;W-yWa#BjRWn*N8r^O*8jpMb=}*F$3@De5K6>@HAKk^t-X5TB002}~ zCE0A&ajQOwO>iiGvG`0?Rbt!rHZc4YAbvlFZa&#?P7{l0z5Ry!mv3Qz^ZV|>_2<4s zejNVui(hJY4sXZzuURz!IM}j0Q|tRp@E4U3IgTJ4meD0o0zj&onP~O<`2nDR@?I(6 zz6pAPDGc+t1fUKSi%21pn`R1_!Vsy);&QBB1AtUDqdj=NJh1+O2_)dni&w-sJONV} zI`vq*+nw~AXH5Q~@O=+(aaF(P0Kk=}tGfU&%>?xFw;99dm)6jeXkrHZFPQn~aA1IF z0iqEYAX