From 63a7d2d43310ac79b9992d46a9eece8409fa01dc Mon Sep 17 00:00:00 2001 From: Swept Date: Sat, 2 Jan 2021 03:54:30 +0000 Subject: [PATCH] Fixes gar glasses. (#2869) * Initial * Fixes inhands * A * Oh yeah and they slice real good too --- .../Prototypes/Entities/Clothing/Eyes/glasses.yml | 9 ++++++++- .../Clothing/Eyes/Glasses/gar.rsi/meta.json | 8 -------- .../Eyes/Glasses/gar.rsi/super-inhand-left.png | Bin 209 -> 0 bytes .../Eyes/Glasses/gar.rsi/super-inhand-right.png | Bin 209 -> 0 bytes 4 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png delete mode 100644 Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index f69ebf0b50..a0e5f0064f 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -19,6 +19,8 @@ sprite: Clothing/Eyes/Glasses/gar.rsi - type: Clothing sprite: Clothing/Eyes/Glasses/gar.rsi + - type: MeleeWeapon + damage: 10 - type: entity parent: ClothingEyesBase @@ -32,6 +34,9 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/gar.rsi HeldPrefix: alt + ClothingPrefix: alt + - type: MeleeWeapon + damage: 10 - type: entity parent: ClothingEyesBase @@ -44,7 +49,9 @@ state: icon-super - type: Clothing sprite: Clothing/Eyes/Glasses/gar.rsi - HeldPrefix: super + ClothingPrefix: super + - type: MeleeWeapon + damage: 10 - type: entity parent: ClothingEyesBase diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json index 8f22126d1c..db2e9f2a37 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json @@ -46,14 +46,6 @@ { "name": "alt-inhand-right", "directions": 4 - }, - { - "name": "super-inhand-left", - "directions": 4 - }, - { - "name": "super-inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png deleted file mode 100644 index 3afeccddd0df5fc34518ae1c33a53dda10073a9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Gdx`!Ln`LHy>*(GNl}2|!o_JC zhwU^@S#9CTKGdy#x1;4M$DVR!#T2^&DJ7tC2C?Fdn=wUN`s{P^ebfIqom^QX6<+*7 zb-B089HoE8KiA*h#dhXAII(NCdDVC2XD1jz+8GkWV;{c_{KviL zvZ-{9N_B12`qY&-Z}*%uvv0iFW$^WX!`-vjY8eu8%g?G92wf|m1=i&0>gTe~DWM4f D$6--@ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png deleted file mode 100644 index f7c8a4501be25d8f773084d1f6ed8f20cd19cf0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Gdx`!Ln`LHy>*)RkbwZJL;JLh zW-AS?+9f?#MAm6U{Mpl;V-$R#``gKnsj(n~4jlAZ%Xs_i9^004*~NKpttEFVHkPaE zT;3C>WYivF&D(yxT66iC57!>n2gYSF3Rc-W>Tl&S`11j%6$orO?{81H?JVy z{LQ3~8A%dl?V|Ii8QszUaK>Ey(R!{0JH#0pzTaiI?_nrp