From 847acd640135c4281786f6d3a97596fba4614156 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 24 Feb 2020 00:44:15 +1100 Subject: [PATCH] Fix gun sprites and names (#734) Addresses #606 Sprites fixed so no short versions used (for now) and some of the extra states were removed (clarissa). When I originally PR'd pascal case wasn't the decided name so I also updated the IDs. --- Resources/Maps/stationstation.yml | 8 +- .../Prototypes/Entities/Weapons/LMGs/lmgs.yml | 22 +++--- .../Entities/Weapons/Laser/laserguns.yml | 6 +- .../Entities/Weapons/Pistols/pistols.yml | 70 +++++++++--------- .../Entities/Weapons/Rifles/rifles.yml | 52 ++++++------- .../Prototypes/Entities/Weapons/SMGs/smgs.yml | 26 +++---- .../Objects/Guns/LMGs/l6.rsi/l6-0.png | Bin 529 -> 600 bytes .../Objects/Guns/LMGs/l6.rsi/l6-1.png | Bin 600 -> 629 bytes .../Objects/Guns/LMGs/l6.rsi/l6-2.png | Bin 629 -> 634 bytes .../Objects/Guns/LMGs/l6.rsi/l6-3.png | Bin 634 -> 633 bytes .../Objects/Guns/LMGs/l6.rsi/l6-4.png | Bin 633 -> 637 bytes .../Objects/Guns/LMGs/l6.rsi/l6-5.png | Bin 637 -> 0 bytes .../Objects/Guns/LMGs/l6.rsi/meta.json | 9 --- .../Objects/Guns/LMGs/pk.rsi/meta.json | 9 --- .../Objects/Guns/LMGs/pk.rsi/pk-0.png | Bin 620 -> 689 bytes .../Objects/Guns/LMGs/pk.rsi/pk-1.png | Bin 689 -> 717 bytes .../Objects/Guns/LMGs/pk.rsi/pk-2.png | Bin 717 -> 718 bytes .../Objects/Guns/LMGs/pk.rsi/pk-3.png | Bin 718 -> 723 bytes .../Objects/Guns/LMGs/pk.rsi/pk-4.png | Bin 723 -> 725 bytes .../Objects/Guns/LMGs/pk.rsi/pk-5.png | Bin 725 -> 0 bytes .../Guns/Pistols/clarissa.rsi/clarissa-1.png | Bin 431 -> 0 bytes .../Guns/Pistols/clarissa.rsi/clarissa-2.png | Bin 461 -> 0 bytes .../Objects/Guns/Rifles/ak.rsi/ak-0.png | Bin 635 -> 658 bytes .../Objects/Guns/Rifles/ak.rsi/ak-1.png | Bin 658 -> 0 bytes .../Objects/Guns/Rifles/ak.rsi/meta.json | 56 +++++++++++++- .../Guns/Rifles/black-ak.rsi/black-ak-0.png | Bin 630 -> 652 bytes .../Guns/Rifles/black-ak.rsi/black-ak-1.png | Bin 652 -> 0 bytes .../Guns/Rifles/black-ak.rsi/meta.json | 56 +++++++++++++- .../Objects/Guns/Rifles/sts.rsi/meta.json | 56 +++++++++++++- .../Objects/Guns/Rifles/sts.rsi/sts-0.png | Bin 581 -> 611 bytes .../Objects/Guns/Rifles/sts.rsi/sts-1.png | Bin 611 -> 0 bytes 31 files changed, 257 insertions(+), 113 deletions(-) delete mode 100644 Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-5.png delete mode 100644 Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png delete mode 100644 Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png delete mode 100644 Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-2.png delete mode 100644 Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png delete mode 100644 Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png delete mode 100644 Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-1.png diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 7f2bf0ab29..26c4a75c41 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -106,7 +106,7 @@ entities: grid: 0 type: Collidable - uid: 1 - type: LaserItem + type: LaserGun components: - parent: 0 pos: -1.47174,4.550247 @@ -121,7 +121,7 @@ entities: bounds: -0.25,-0.25,0.25,0.25 type: Collidable - uid: 2 - type: LaserItem + type: LaserGun components: - parent: 0 pos: -0.6748645,4.487747 @@ -3177,7 +3177,7 @@ entities: bounds: -0.25,-0.25,0.25,0.25 type: Collidable - uid: 269 - type: smg_c20r + type: SmgC20r components: - parent: 0 pos: -2.524035,7.579326 @@ -3201,7 +3201,7 @@ entities: - A10mmSMG type: BallisticMagazineWeapon - uid: 270 - type: smg_c20r + type: SmgC20r components: - parent: 0 pos: -1.94591,7.485576 diff --git a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml index 0b78d032a7..c3e211e95c 100644 --- a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml @@ -1,7 +1,7 @@ - type: entity name: BaseLMG parent: BaseItem - id: lmg_base + id: LmgBase description: A rooty tooty point and shooty. abstract: true components: @@ -24,17 +24,17 @@ - type: entity name: L6 - parent: lmg_base - id: lmg_l6 + parent: LmgBase + id: LmgL6 description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/LMGs/l6.rsi - state: l6-5 + state: l6-4 - type: Icon sprite: Objects/Guns/LMGs/l6.rsi - state: l6-5 + state: l6-4 - type: RangedWeapon spreadstddev: 30 automatic: true @@ -48,24 +48,24 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: l6 - steps: 6 + steps: 5 - type: Item Size: 24 sprite: Objects/Guns/LMGs/l6.rsi - type: entity name: PK - parent: lmg_base - id: lmg_pk + parent: LmgBase + id: LmgPk description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/LMGs/pk.rsi - state: pk-5 + state: pk-4 - type: Icon sprite: Objects/Guns/LMGs/pk.rsi - state: pk-5 + state: pk-4 - type: RangedWeapon spreadstddev: 10 automatic: true @@ -79,7 +79,7 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: pk - steps: 6 + steps: 5 - type: Item Size: 24 sprite: Objects/Guns/LMGs/pk.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml index 6da20a4e5c..0f2c3b6d84 100644 --- a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml +++ b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml @@ -1,7 +1,7 @@ - type: entity name: Retro Laser Gun parent: BaseItem - id: LaserItem + id: LaserGun description: A weapon using light amplified by the stimulated emission of radiation. Ancient inefficient model. components: - type: Sprite @@ -31,8 +31,8 @@ - type: entity name: Laser Cannon - parent: LaserItem - id: LCannon + parent: LaserGun + id: LaserCannon description: With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes! components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml index 32789e89b3..b6ab4d6943 100644 --- a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml @@ -1,7 +1,7 @@ - type: entity name: BasePistol parent: BaseItem - id: pistol_base + id: PistolBase description: A rooty tooty point and shooty. abstract: true components: @@ -20,8 +20,8 @@ - type: entity name: Clarissa - parent: pistol_base - id: pistol_clarissa + parent: PistolBase + id: PistolClarissa description: A rooty tooty point and shooty. components: - type: Sprite @@ -52,8 +52,8 @@ - type: entity name: Clarissa (Silenced) - parent: pistol_base - id: pistol_clarissa_s + parent: PistolBase + id: PistolClarissaS description: A rooty tooty point and shooty. components: - type: Sprite @@ -84,8 +84,8 @@ - type: entity name: Deagle - parent: pistol_base - id: pistol_deagle + parent: PistolBase + id: PistolDeagle description: A rooty tooty point and shooty. components: - type: Sprite @@ -120,8 +120,8 @@ - type: entity name: Deckard - parent: pistol_base - id: pistol_deckard + parent: PistolBase + id: PistolDeckard description: A rooty tooty point and shooty. components: - type: Sprite @@ -155,8 +155,8 @@ - type: entity name: Giskard - parent: pistol_base - id: pistol_giskard + parent: PistolBase + id: PistolGiskard description: A rooty tooty point and shooty. components: - type: Sprite @@ -187,8 +187,8 @@ - type: entity name: Giskard (Silenced) - parent: pistol_base - id: pistol_giskard_s + parent: PistolBase + id: PistolGiskardS description: A rooty tooty point and shooty. components: - type: Sprite @@ -219,8 +219,8 @@ - type: entity name: Gyro pistol - parent: pistol_base - id: pistol_gyro + parent: PistolBase + id: PistolGyro description: A rooty tooty point and shooty. components: - type: Sprite @@ -256,8 +256,8 @@ - type: entity name: IH machine pistol - parent: pistol_base - id: pistol_ihmp + parent: PistolBase + id: PistolIhmp description: A rooty tooty point and shooty. components: - type: Sprite @@ -290,8 +290,8 @@ - type: entity name: IH machine pistol (Silenced) - parent: pistol_base - id: pistol_ihmp_s + parent: PistolBase + id: PistolIhmpS description: Pewsh pewsh components: - type: Sprite @@ -324,8 +324,8 @@ - type: entity name: IH sidearm - parent: pistol_base - id: pistol_ihsidearm + parent: PistolBase + id: PistolIhSidearm description: A rooty tooty point and shooty. components: - type: Sprite @@ -357,8 +357,8 @@ - type: entity name: IH sidearm (Silenced) - parent: pistol_base - id: pistol_ihsidearm_s + parent: PistolBase + id: PistolIhSidearmS description: A rooty tooty point and shooty. components: - type: Sprite @@ -390,8 +390,8 @@ - type: entity name: Lamia - parent: pistol_base - id: pistol_lamia + parent: PistolBase + id: PistolLamia description: A rooty tooty point and shooty. components: - type: Sprite @@ -427,8 +427,8 @@ - type: entity name: Makarov - parent: pistol_base - id: pistol_makarov + parent: PistolBase + id: PistolMakarov description: A rooty tooty point and shooty. components: - type: Sprite @@ -459,8 +459,8 @@ - type: entity name: Makarov (Silenced) - parent: pistol_base - id: pistol_makarov_s + parent: PistolBase + id: PistolMakarovS description: A rooty tooty point and shooty. components: - type: Sprite @@ -491,8 +491,8 @@ - type: entity name: Mk 58 - parent: pistol_base - id: pistol_mk58 + parent: PistolBase + id: PistolMk58 description: A rooty tooty point and shooty. components: - type: Sprite @@ -523,8 +523,8 @@ - type: entity name: Mk 58 (Wood) - parent: pistol_base - id: pistol_mk58_w + parent: PistolBase + id: PistolMk58W description: A rooty tooty point and shooty. components: - type: Sprite @@ -555,8 +555,8 @@ - type: entity name: Olivaw civil - parent: pistol_base - id: pistol_olivawcivil + parent: PistolBase + id: PistolOlivawCivil description: A rooty tooty point and shooty. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml index 31e090e3a3..74d6c945cd 100644 --- a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml @@ -1,7 +1,7 @@ - type: entity name: BaseRifle parent: BaseItem - id: rifle_base + id: RifleBase description: A rooty tooty point and shooty. abstract: true components: @@ -19,17 +19,17 @@ - type: entity name: AK - parent: rifle_base - id: rifle_ak + parent: RifleBase + id: RifleAk description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/Rifles/ak.rsi - state: ak-1 + state: ak-0 - type: Icon sprite: Objects/Guns/Rifles/ak.rsi - state: ak-1 + state: ak-0 - type: Sound - type: RangedWeapon spreadstddev: 2 @@ -45,24 +45,24 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: ak - steps: 2 + steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/ak.rsi - type: entity name: Black AK - parent: rifle_base - id: rifle_blackak + parent: RifleBase + id: RifleBlackAk description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/Rifles/black-ak.rsi - state: black-ak-1 + state: black-ak-0 - type: Icon sprite: Objects/Guns/Rifles/black-ak.rsi - state: black-ak-1 + state: black-ak-0 - type: Sound - type: RangedWeapon spreadstddev: 2 @@ -78,15 +78,15 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: black-ak - steps: 2 + steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/black-AK.rsi - type: entity name: Carbine - parent: rifle_base - id: rifle_carbine + parent: RifleBase + id: RifleCarbine description: A rooty tooty point and shooty. components: - type: Sprite @@ -118,8 +118,8 @@ - type: entity name: Dallas - parent: rifle_base - id: rifle_dallas + parent: RifleBase + id: RifleDallas description: A rooty tooty point and shooty. components: - type: Sprite @@ -152,8 +152,8 @@ - type: entity name: IH heavy rifle - parent: rifle_base - id: rifle_ihheavy + parent: RifleBase + id: RifleIhHeavy description: A rooty tooty point and shooty. components: - type: Sprite @@ -186,8 +186,8 @@ - type: entity name: Sol-EOT - parent: rifle_base - id: rifle_sol_eot + parent: RifleBase + id: RifleSolEot description: A rooty tooty point and shooty. components: - type: Sprite @@ -221,8 +221,8 @@ - type: entity name: Sol-Para - parent: rifle_base - id: rifle_sol_para + parent: RifleBase + id: RifleSolPara description: A rooty tooty point and shooty. components: - type: Sprite @@ -256,17 +256,17 @@ - type: entity name: STS - parent: rifle_base - id: rifle_sts + parent: RifleBase + id: RifleSts description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/Rifles/sts.rsi - state: sts-1 + state: sts-0 - type: Icon sprite: Objects/Guns/Rifles/sts.rsi - state: sts-1 + state: sts-0 - type: RangedWeapon spreadstddev: 2 automatic: true @@ -281,7 +281,7 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: sts - steps: 2 + steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/sts.rsi diff --git a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml index ca0f273daa..cfba9ac129 100644 --- a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml @@ -1,7 +1,7 @@ - type: entity name: BaseSMG parent: BaseItem - id: smg_base + id: SmgBase description: A rooty tooty point and shooty. abstract: true components: @@ -23,8 +23,8 @@ - type: entity name: C-20r Sub Machine Gun - parent: smg_base - id: smg_c20r + parent: SmgBase + id: SmgC20r description: A rooty tooty point and shooty. components: - type: Sprite @@ -54,8 +54,8 @@ - type: entity name: IH SMG - parent: smg_base - id: smg_ihsmg + parent: SmgBase + id: SmgIhSmg description: Pla-ket-ket-ket-ket components: - type: Sprite @@ -86,8 +86,8 @@ - type: entity name: IH SMG (Silenced) - parent: smg_base - id: smg_ihsmg_s + parent: SmgBase + id: SmgIhSmgS description: Pewsh pewsh components: - type: Sprite @@ -119,8 +119,8 @@ - type: entity name: Mac - parent: smg_base - id: smg_mac + parent: SmgBase + id: SmgMac description: Pla-ket-ket-ket-ket components: - type: Sprite @@ -151,8 +151,8 @@ - type: entity name: Saber - parent: smg_base - id: smg_saber + parent: SmgBase + id: SmgSaber description: A rooty tooty point and shooty. components: - type: Sprite @@ -183,8 +183,8 @@ - type: entity name: WT550 - parent: smg_base - id: smg_wt550 + parent: SmgBase + id: SmgWt550 description: A rooty tooty point and shooty. components: - type: Sprite diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png index c4979a921e7c1d700481fdc6225effa423ba2332..2ed78d7823976f040ffae9b7e2be39fb66e6b27b 100644 GIT binary patch delta 576 zcmV-G0>Ax{1lRFb9|h@MQg|A17W`ifqNzN`K7<@H_`q6;q>>yl!qa zl(-2c_{&!>6o7GYsaW<^RRAD_hU2)AQP*|4 z-J_ucspYJn&#!TCa0q~H+an2O#X%RM*7Nx_TCMl!x{htz6H%_edHZ_cn37t~`i7Ci zvU(HMcDqL;lYcq@j^lTB-TEuH(86 zCnq-Pbe7Hf#(+3@<5lMh0N=%r!JK9FP*o8c#~lc20e-!P!Q=p&^$q1&{dw$WqiGtR z=S0S+UXci!Y;H9aS+(3R*{GuQc>PiAW;6mYUcDq8C-yuCw|9!QcT75+1;E-n<`$_7 z58qUPzd5-n*vT#{#WYQ-m6{)?r$@alfATE|1(>D&-T#3(z#QPe0r&|aCo*#c!e5gB O0000@fx0=UAO??I5rf8?qvb-J%1SXNnD3Q_`~Bp0f3Bf zUM`n0pU=@~G_YQ8uwHLMH<-=dys;3~YPMZPp#T6%RoM16k{M%IEIz+8P%P+fy?%=K z_YVL7=iKK|L@Z|^YQ0`R#mmbp7-Qg^2Ux5>_ny3rkzzr24WokPautYnvG|0hF#v#V zZ$q8RFpNrM=6?Vnm&?L5r=V2z<}#6g@4#_v93P(qjzFF>&1tN?Ds;kilbq$wZ;37_RW zU;Fu<`|+-=*|yC%F)>!}v4B`WEFcyzOu(I`d%-CDr_j_WE`Q{U0f6sIbln)r3hKIC zS=B~$sDwXy{7?f(DCd@CQLEKRr_;1rZCb5%wy*Xui&X6IT;4_!Bq(&Ll+4LB9r6k4q|mSq7%vhvg2Kbm<~ zjMPlJZgA7`X9LGfhz%)hp(kQ6<`Fj#8a}9s*S6NOQeErxA zpX+YWD5z%5W^#dAYqo8Z&E$^Eg035!U$~6d-0iU^Cx6fId2O4yxht%%uQ5NraELcH zUPp>6S5~!zS`_ldKnQ{7NnF=qdU}SH(sHP{d*exY0)TzvduVGkn&`R_$^9AV#sqYZ zVYhRDmC~|yzw{t7GoB~$yxxeC$t1on2lAjS4#U8`@Y0$?$UVsAv~IH-QgTlM>gM30l%|JmFaIlvu&F~z8H)$(+8cF q<9rJu1&kB_?*Bk6AQtf72>1ycKSoy*U(-JT0000J(C1lR;$}n<~&H*egUZdUKMF?%^K=P&@>oBRR;LgMQ^je<=FhXc7 zFIkqDb?ZZ#BHwcIb+sG{_E{ZZ^@Gy*VQy(Aqc_B;o-cZ#)lOgfzfz}h?J7O4vl z-&BCVxi~4<$u29!G)=0Nnjfd9N4+h7@+}Ajn5F*R|A9Hc9N@nJ_z58=GIIpNUy}d; N002ovPDHLkV1j6w7a9Nn diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png index 93a813859f4a007243d9f74eab8f77abe7a94f80..041dfc3ce203884cff40b979246b9f6bbdf8b6c3 100644 GIT binary patch delta 609 zcmV-n0-pW#1o{M!B!59kL_t(|ob6V>Z__{&{;o1p&z2Aqz5)ZHb)h?jiJ`4LFh)p8 z2Bt*H6sZNKN(~Ydza%Ckn3G8S1rhDwjRM_DY0Q8Gu?!_8G(#IMj#_FiolJPTTvSMryyb!mw!u@2mr#6gHmmz6cGDH zvrf_)6vXd8xJv*)5ylO}K)c;WE|-Jvcj5cp#0$2zUV%~#ak7PcF%mjWQ^9#KR5He3 z+q=IaFnw+|GR-AyZ|?vAT-WV0C_EP4>N>-tn+#{?zT@ikPw+ffJ~z!Jv|7)>7=!D& z2c&rZF@FU>pSO%Lxwh?H=z4F@c>qc^a30`;_XWVD)Cu^07lvT~K%x|O;`KxH zlPpy+QL5qmwM%eXZ@_sV!#!or;q9{*G95>S0sy+sb?GMQB@UT$cM^dvqDKyHkx%JycYQqgQ{n&S8QML zO`cg^samEUMtuYZy%$Ue8HXW9;OwFE`kib|&vtPN(}xz{NCLleNTlg+fLNA=a;Xxf vnd!s2Ds;kilbq$wZ;37_RW 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 delta 595 zcmV-Z0<8V91?&WnB!4qWL_t(|ob8q|Xc|!%$A1^hl2Qz0F@r=9ir{jXK_rmb>=}}! z&@K`pSV}}L93nv?wrMdS20;>1OTqbm^81XMSuUhRBlId${o1_Tk&n- z^+0sVjrF+|-?oV=RjQ&?sS0VBPN=BmftBX6F{z&nV0w0eyQ>TK4>D4zQWdeyHPmF` z-%8*_1dx6EYA`oh5PQX4o85|97CmxBEsNFlDD~P80Hl@3^1bycRjNX7wOL({I*L0k z9+~m;_zRAUM}N%B&D(OkK93pet+s6}twffE_xCvHcLQ+p?G}Ki{zbwO895Z-^~;o_ z04v$u)dlYl^8l#Hf}`lO(>mdZ41gR8{1FiJyZPR{wI$y?StPc(X4>ThITSEsYo3!6 zPLMQBBd?@Q7Xb7&Ty_kmXBW&>oSoKfABH0`A3uBx9^ z?&6+1dK-S;OffSzPc9pi5*ry|CI4Tz`U#y7^t%cA;qYsRTsAf|sTKD&qP&t8(WUO@ ztTha?nM{Daj>F)ujmS#g!>Cse58MSka=raLtRFrz}SCC hCITh`CIZGT;1@0^;e{Ls!f*fp002ovPDHLkV1kQ~9mD_t diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png index 28d858a66d558ba555c36bb069d48d13326f4cbf..b67be31fe135b3dc313b8be1bdec18135e95aa71 100644 GIT binary patch delta 693 zcmV;m0!sa{1v=N!I!{=f5m=bU?mNF+izRaI8^3P1&*0svJ1kAF#h;)GH>Hs+lav|`Ua z1Ea&^ioOx-ojMAiqr>AWs6Z&J1VUj&_?MedbOlRR>h(B;Vl#l6dIN`hJIu|yg+M5* zIEMOhIcHB-0xcr|&-DG$Sm&%VS-Le*nNGQyW&B z1xsrS5AKd>0(4*bM$e5}*53Z)&6mqOUho0na?WZ(Z>(=&wOIhLw6+`rm`yr9ZXc+E z_b;^J80ycbOG~$mAue9+;YWOp7m0hS%oJxrOF|?P!G9-CK`qlY7!=Uy`d#mA;_7w57g$?$c*in@j- zydH-zGJoh+YE7Av38zOrr!vl|y4X-lW|I!H2^Ln;cs&kPY)8A1cgqr8{d%ICiL-bg z1N=@taYC_oW;bUno}sS6z{sFmfovU}GcL{h;amU;&2uVV{jQWEdNfURGr_KuIy1nD z--4XEB%fTS*Dt%zZ2U)nG4G@hi)V<%OE+4fb}pq9*1o5IwR$)@1?5!Pe@H3-6@Usr b*#Uk5%KQB=ei<_C00000NkvXXu0mjfv{XXs delta 665 zcmV;K0%rZq1+fK?B!75GL_t(|ob8rBXc|!*$G;a$hLoVi#SCKPpjccELogC>E0{fl zSqkkUA%dkSa^VmW$zfxQ0WnA=fh^6?#UV7K6xtXBaVZp}C>+!S6_N^0!t0=(cY68T z6qoxh_wM-J@B4Yb-+S+lDijKsre>zj<4FDD_(WhZ9J$9>ee834>0Ea?<&g8a#=DoXSpod*z}-M{s{n})?Mx!`<2P%iBK1@vFTBT zJ5C=-&dJFfW-P)I|W0k_vSZt1qm0Zh59i{{6HL z0C@i{pt|qJMHLE#i9IS`#R)b-%%*--eqYXD-na-p?xO-*Q8GvOCKB!i<99M1N;ht( zCOfT%oqq-nPdnh_K1J;6iWOf^1h~Cs6ic=Hc#i(?fMFK$wqFf}O` zt0gq?XRh&}*#m=JFilPUheQL=05pK91N;TMdlL6hWrw-t00000NkvXXu0mjf33M#+ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png index b67be31fe135b3dc313b8be1bdec18135e95aa71..000ad1d3087411c8241d6bd1b98089586a7da544 100644 GIT binary patch delta 694 zcmV;n0!jVN1A;YoMP#BZZP>>)W0@;HkLa>5T5r!{8G-QJtd1*?@!iN~#9_Hrm zb~7zwFZ;jTa}M7<|KIt(bI!d&Bod*Nswk;@8K4YM1^_Dm$A6?g*SJzRHtL-av|=wk z10zFYioOBtojUTLBST{h(B;LNkD>Is?ZCd(6$dg+M5* zI0pL=owMgFftC?~XX}If6_ObbO5ZqKLX&YsST^m zf~B>ECl5z80d8OaM)$31*5Cf*&6jIDTkruOI%hSZw>EaL+AIKAT3b#5%qATlcaK!T zhgaHg4EE*HrKP*Z5Vg(S{D`fy5`U!1OkpOpBt#++e1ER-TowQ%8Iq|qRdt5kDz-Lu zR4-a>7M5Q>r=#7N8{6EDW2|cjVE1!^bn3gN>D;_KSK>;@nB`vy$yAzY|D@m&gUYLy zYv`LAkP#i!NO_^ug9T^?PxdhZdszMPtWFd{370` z0Kb#ZHLln@Gn+FSOH)&CV0gf-K&Fn)X;JfjxDv=N!I!{=f5m=bU?mNF+izRaI8^3P1&*0svJ1kAF#h;)GH>Hs+lav|`Ua z1Ea&^ioOx-ojMAiqr>AWs6Z&J1VUj&_?MedbOlRR>h(B;Vl#l6dIN`hJIu|yg+M5* zIEMOhIcHB-0xcr|&-DG$Sm&%VS-Le*nNGQyW&B z1xsrS5AKd>0(4*bM$e5}*53Z)&6mqOUho0na?WZ(Z>(=&wOIhLw6+`rm`yr9ZXc+E z_b;^J80ycbOG~$mAue9+;YWOp7m0hS%oJxrOF|?P!G9-CK`qlY7!=Uy`d#mA;_7w57g$?$c*in@j- zydH-zGJoh+YE7Av38zOrr!vl|y4X-lW|I!H2^Ln;cs&kPY)8A1cgqr8{d%ICiL-bg z1N=@taYC_oW;bUno}sS6z{sFmfovU}GcL{h;amU;&2uVV{jQWEdNfURGr_KuIy1nD z--4XEB%fTS*Dt%zZ2U)nG4G@hi)V<%OE+4fb}pq9*1o5IwR$)@1?5!Pe@H3-6@Usr b*#Uk5%KQB=ei<_C00000NkvXXu0mjf0^~yn diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png index 000ad1d3087411c8241d6bd1b98089586a7da544..b73ea287838aa6133c3cb9b01404026ac1f03964 100644 GIT binary patch delta 699 zcmV;s0!01J1=9tPB!8MoL_t(|ob8rhNK;W9$3Iup2QwxJq0rDV3}Y`t8FL8sAjy0T ze9)Jm2!<#uLXpLgA;Yn>P#BZZP_Q5$f>nf$5y5aoNPp7_UG7j`rarGj$|VD+sA=G6Z-?m_j}#0? zgkzu=_wdyDN}xpq;GMXeA3HoHCIjOtyIt;(NRzwVA<@%kXJh>n08+QD3 znK8FCbMN+urhv}N-{`tl$@1GDy!mp8N3(ta+{06vqE}Zou-eQ3m|L2E2{0LTeB3%v z1@B*I#WB#Eu}cd#3}LF9x;Wfi=Ee3Ml{2|cXhDibqks5aqZtC0CYAiINjg2_$&|Ppj>)oHLL!-BGB7T=+#&J& z*%JE3Iutn$z|r2$u}C>i+jRq18?LA}|F9?n@bH0C^WJMZkb7;iPjT8EB@SQr%c!cY z$LDoO&VPQ7s5GYXHk=spo{Kn*@?1hKn2b71Mwnep;`2IGv27Lu?-mp~diBKCwhQ3~ z&gg`G*Ql_!A0N&qOM6t+*5mB=2xq@XWY_Wa%g%y{)A(&8$|g@EH~U>BK@2#w$i&tJ zyGo*90jD~UCRgI8m#Mm`t6<_Y1&sK{r1i}d>olAB2Q3@BN&;)o(?7}{PHsUlQS=8% hNkB#z|3daI#F+p9002ovPDHLkV1g}8TKxb3 delta 694 zcmV;n0!jVT1A;YoMP#BZZP>>)W0@;HkLa>5T5r!{8G-QJtd1*?@!iN~#9_Hrm zb~7zwFZ;jTa}M7<|KIt(bI!d&Bod*Nswk;@8K4YM1^_Dm$A6?g*SJzRHtL-av|=wk z10zFYioOBtojUTLBST{h(B;LNkD>Is?ZCd(6$dg+M5* zI0pL=owMgFftC?~XX}If6_ObbO5ZqKLX&YsST^m zf~B>ECl5z80d8OaM)$31*5Cf*&6jIDTkruOI%hSZw>EaL+AIKAT3b#5%qATlcaK!T zhgaHg4EE*HrKP*Z5Vg(S{D`fy5`U!1OkpOpBt#++e1ER-TowQ%8Iq|qRdt5kDz-Lu zR4-a>7M5Q>r=#7N8{6EDW2|cjVE1!^bn3gN>D;_KSK>;@nB`vy$yAzY|D@m&gUYLy zYv`LAkP#i!NO_^ug9T^?PxdhZdszMPtWFd{370` z0Kb#ZHLln@Gn+FSOH)&CV0gf-K&Fn)X;JfjxDl84g~FJOhJpok5yUPe5rTD5P6QDmh(sKGk)tUp6E9+My3nnC z+n2iju$w(M-#Lf(JJ0hz?>R3=3WviK5+wy?FA69MC<*{d|9{7(UdOP=UK{j`NNTbF z+=2eSA)&1SYpaILZ-3vALXOFNPp7_9nL^brXIIV$|eIStE%H*dy~m2m*fwI zgsry==fK42N}xsr;2yi58#^!|#(kp-yB*GeNRd070nyoQWp(8f08)pg?bv$xgCQYD zV{~>~RmIKvW`EM-+kJPK_03RGU8{)E*4L!Rax|uxOC6Rrp*@-#^cn!>-|Yc#PT!2# zV#L_g$b-9sssgTF_(uDcau(ix=gpV%Jf8Lf;2fAx6}_~$irHcWz}VFIOMpSI;p6(A zB6#;~Gq&EYv|Vbrp$k&k(9Zta0nF6Bbm_Io@&>vp69DU!ni zxPcQoq1Q1itgVNK^XdFH71g!adtAca;}V&5Y`S$bZ{iew+lVsBQ^?MKOO6u(_DxYD z%YrRAp0|Kw9Y~SOvE$2B+0dRh@reQkJtNY}S~ilEwcLZ2i7h#fx%1f{We-QUppYo| jgQO^+D4-~y-~xUEzK{NH$_Ljz00000NkvXXu0mjf*+5q^ delta 699 zcmV;s0!01Q1=9tPB!8MoL_t(|ob8rhNK;W9$3Iup2QwxJq0rDV3}Y`t8FL8sAjy0T ze9)Jm2!<#uLXpLgA;Yn>P#BZZP_Q5$f>nf$5y5aoNPp7_UG7j`rarGj$|VD+sA=G6Z-?m_j}#0? zgkzu=_wdyDN}xpq;GMXeA3HoHCIjOtyIt;(NRzwVA<@%kXJh>n08+QD3 znK8FCbMN+urhv}N-{`tl$@1GDy!mp8N3(ta+{06vqE}Zou-eQ3m|L2E2{0LTeB3%v z1@B*I#WB#Eu}cd#3}LF9x;Wfi=Ee3Ml{2|cXhDibqks5aqZtC0CYAiINjg2_$&|Ppj>)oHLL!-BGB7T=+#&J& z*%JE3Iutn$z|r2$u}C>i+jRq18?LA}|F9?n@bH0C^WJMZkb7;iPjT8EB@SQr%c!cY z$LDoO&VPQ7s5GYXHk=spo{Kn*@?1hKn2b71Mwnep;`2IGv27Lu?-mp~diBKCwhQ3~ z&gg`G*Ql_!A0N&qOM6t+*5mB=2xq@XWY_Wa%g%y{)A(&8$|g@EH~U>BK@2#w$i&tJ zyGo*90jD~UCRgI8m#Mm`t6<_Y1&sK{r1i}d>olAB2Q3@BN&;)o(?7}{PHsUlQS=8% hNkB#z|3daI#F+p9002ovPDHLkV1htuTLb_A diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png deleted file mode 100644 index 61951f164c383d0b3b954005f808ed2189638a2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 725 zcmV;`0xJE9P)>`p$SCNq31Vu1JVG)W(njD~^* zbrHlaBoTsjQBDLAB8WsBe37FmDibeaak|j0ecPA1{;-=pH{Usj_dCz?KJPg%M+%3- z6cQx`WiJXS3MdKyO8>{EUdOP=UK{j`NNTbF+=2eSA)&1SYpaILZ-3vALXOF zNPp7_9nL^brXIIV$|eIStE%H*dy~m2m*fwIgsry==fK42N}xsr;2yi58#^!|#(kp- zyB*GeNRd070nyoQWp(8f08)pg?bv$xgCQYDV{~>~RmIKvX42!^eRr7k%}`NYtBBFo z*QCdCG^UtK9hNqsJ(?Tz8UW_s?E!F3-;CK}#MsoxgS&&O08M*Ed=7T$j6&6o2$ zp7sLZ9GFlQy|lQB*j0uQu)} zoXK`V4N^E9#_JePy8s}^Af8B4R#lhIVrg+z@uS&dz|_} z6FaJ;lT)sAiA&*-EVCuV6G_H>qmsiJ5HFw4qphz&j>Z5u*xo!88I93$O~<9Wi;B(P z&qV=v^w6$)?^PYhzBZYsIOUEUgRi?KR8-gEaoZ$&k4u#6lQ|oX^}A0+oI+_fp&AT& z4F)|-&n57U-s2LP zb!@tIGjHM)e%pvL$y3PAeoKxM0rpK%BFlm;Ii9zGV;xA5%dz9jRN2s;H}Q!A20bIv z%36|@wcLZ2i7h#fx%1f{We-QUppYo|gQO^+D4-~y-~xUEzK{NH$_Ljz00000NkvXX Hu0mjfwGmgN diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png deleted file mode 100644 index 263beda755756f646b15b3a5486f926317168cfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 zcmV;g0Z{&lP)AH?x>R_kt6+i`00qi}1EDe0tKt=XO#nC!p z*?_CncWUkFdBV~5AJWYGvV_<7H*_wq!Vv%_suu3+%ThR>TT4t|rnu?#VzJJer)z;z z0J1dj#jc3CwFDt{Yy<$YE5=Nd`uzGxJOiEU3o1Zn38Lw5wVG>Bkkn#fg>zLKQ&Ybd zfCdv)t-+_(_@m<#Oddoo000a}N(#btJStT1jwJ(`moQ6$AOHYNa|S|e)EYeM^%LCP zDqH|r#F!aiI8uB;5MY|KaLskR%n}qaW(G*A-985)c9`a%JdY3eh0SvTvQBRpMrpGw z75WxLPyQzWuH(Tl3=m>()RY-O)yACbcyJwWYY&+@x=sh<_7q zJK=2h6)HCb0mIP%H`leqF@F1SGyvn9Hzg78pC7oty$d1$yeeuiuqlbb_r#i__try0 z5JHn*mM;L*eqxepK|e+kTXVk7V`5D~sU3;{z}NYZXGE0_|PRj9*{w2USvCqDGxIuAf00000NkvXXu0mjf Di2Tbu diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png index 0a2e483e6cdb2c8822aa7d3e2ca8b770b7e27037..1bb1bcc76ea7189226c81d79cd7fb373c06565d7 100644 GIT binary patch delta 633 zcmV-<0*3wj1d;`iB!5{+L_t(|ob8uCXcJK!$G*Kp-8AM1taCN}9oJ*}S1rDv2D0t6m^*XSXC$`LH1E*G9)hPC_FF59S`sfzn9^$jRSYJuO0g%oX zStuMtaDKWCAoF4i_S*VN3VXYXRbN{41Mu5M)G-ncwyoOGP29P66UyhWRy%c@+lzMX z?J5q_3!gq>c7L>iIRFRRsiUu|QSAE^7`kb-@dWuC{M<^wZf-Z?3OQD!0N-nH$8Oi$ zmk$UL4n>j zQ?067d!f?R!#u=_7jK^C z#ep8Y6fvlWP09v?9d;-L28HfmrBWtd?C5&1x8BTQGA6BrL8d7bGIB7;JULb^gXf{- zEiWyr)WA^ko$}uQz5n-nUlMpk(=?o=B4_Fz0)zk|KnTz;Kz}x0rZr=q){K3c&6jCE z``vwlztC-iZ8^9+dWjp$@ssDR9kaS&3fR4Ro9prP(Ou$tD9`R=c_9N1Ae%2! zIW9q(9`69iz1V=aw!DzR&bH3#volcuQO}Mh2I5l3scp-_y$5%ofBM4a1;4qs=+(}) z&Y7P3_yLoHEq_b_*fWp0wT3BRH=@I~95&}B==N~OECH{%*T|L3ok$11HQuy6CKrG(8UdYPJDv%jr0|?2E9Myf7|MsZi-yXIt&LQlSDhrJN*CDpXi3w&lRA zy#@e?!y{<5esWC?4;(xkYQZoCW^9-Oj34K@b!u86y??-odm(YZWWyA&d2|8d@CekD zLgt>VP+@QgV^>B2w3B)J<{i?jb0qh8k^5_uSF1e@{o-ESL~H;PF<^58P*c6>`!V#3 zXqtwtqi(V1pc07ON@qy1Dxz2wPhFT>SIOalgGSv#qizLa4tV~8 wKb4YLqPcZ75c9qOg4Vxz9|!?Lfd2~MH=|hmtjkLdZvX%Q07*qoM6N<$g8n)vKmY&$ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png deleted file mode 100644 index 1bb1bcc76ea7189226c81d79cd7fb373c06565d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 658 zcmV;D0&V??P)R>?y5rTNALn@(#LWd54gFql1j6{Os zVoI99Y}ve_QYwiYg{xj5aODOMsgtGAPv;1wX9EwYMw$SUd~OJ|GB%XmJHx(l5K7`ln8lUE$)p>XSXC$`LH z1E*G9)hPC_FF59S`sfzn9^$jRSYJuO0g%oXStuMtaDKWCAoF4i_S*VN3VXYXRbN{4 z1Mu5M)G-ncwyoOGP29P66UyhWRy%c@+lzMX?J5q_3!gq>cC>*x00-Ksqpzw_?E4fL zx@ooX1o<5N+)BW1Za3lzIaZ_q-)nHkZr9wG4+uq`yJk_Wd4luP!0&n!z|hUMm4{pr zc9R{30~KQIdJQ z>bPsfSBb8MZaFU8Oke~v0bqLzkmB9xy%@ShWLd^eY?&=B`f;GukuM9-FHhm*$2S1L z=F1HdTis*;I;PMs0JWQQxmTY|M2Q$#WB3a&NcjL*=Bh@|jI~zP0W@#Z`wwq}C({?e zjbw`C%L4Lc;mnSi*Ah8CYCTv61wnz{HdC#tTYI6?1FKi{^fu%v@Jmsv>V0oS;^oIg sjI1#Z)Q`DmfI;ft{303x{8s>f0Jd-puFEnRy8r+H07*qoM6N<$f?$#^wEzGB diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json index f6ca6d93d4..cfc00ed2c9 100644 --- a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json @@ -1 +1,55 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "ak", "directions": 1}, {"name": "ak-0", "directions": 1}, {"name": "ak-1", "directions": 1}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "ak", + "directions": 1 + }, + { + "name": "ak-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png index f32d56b9acabbc759e06d2baf21979ba215b9b1d..2dd6de65fc315730d61e20d205f6c9ec59d29dc0 100644 GIT binary patch delta 627 zcmV-(0*w9k1dIicB!5#$L_t(|ob8v-YtvvH#-DfQVnIYI!?IPz1Q`sWY(nXOu*=ZN z4$g}(gfKmnArl6})ln!6#@2%!gQ|G39(u61;wiUvhuBh__V5o7uvA#`jj*r;=x@zLOf1IoF^vONKJj7=Yv9_`U4j_@t z&|oNlz|=$&z~1YRaQ3aO?BHNuvHRy{gH3bp+zm9X+R!Y_FU&ys^3`q^+~&?srw;ZN z&a@=w;T^t;%YT;uxp2gd)m0OxzZDpoWw)^eSq*k?C*U-98ZiY!&J`&r)sEqg-Knaf zVt(O)tBPXR2~14@zkbvK49#j6&nepQ&~F}L$gql z-vIzTULVfResV=lsuo84!_ZaJHr7=WwQt|Kaq-<{(ti$|un!WplUX5;*N0eCB;ln9 z6|P*vt=nS&>dAa~{|Q^0VG>@7aHl4|8)<9k7IzG%Cr2?oIf~?)&xl3Ew#B+Jbc;xm zgpKuWIyW1HTsT5LSA@sw!)fiNQfe*yZbA)s-N zb=5pK)@({y15iJvj~?F#OQt7)m#>ydK37COS3Gy%-rE>CsWx6L{elpH&Nfq}tl4{^ z)eEarb@XeBQbh!q#(kil%h>9(fBdAB5(K#uEOj~3|x(lIeI*KJj+-f+|x%`TiJpGAd@Q+ zHXcK4a@+%u-TnZ3ZEa->`+G92&&{x&Gq>)DfkM7SW6@O;HSsL~ zAQX<^^z?_L$#K)faC8WoVo+mEG0^(@&9N`Nv&{4YXMe0866;I08im3U@F|W-EG0?s z(iPmeISQbi%=>pA@%mMQNh~EDuO_{d>}lwh;~7p(j9_YF1i3e#z^AyL&H6EPixC6? z8|#~7ZiaRrW~n&3C2H1YW#cW~6czQn`BO#_TT795+og>M9y_bs*+|?G^l~xW!eH r-Q@>j-WR~2^>6+U_y9h@e+BRxS`r0Wp;jf200000NkvXXu0mjfq)H!6 diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png deleted file mode 100644 index 2dd6de65fc315730d61e20d205f6c9ec59d29dc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmV;70(1R|P)#snD*p=?6wf3VBY$qvqoFoZBYlpzxa!_`qJ493=j9fPWP zu^xJ`x8fqOBNQSJqTm!JiH$2o90c+N`Jsm`ka#Y$M^ZXPu@38i6lw5 zNDW=6`v717FaQ_;bPJG3W~f{^q;lbqCXyN2&3rabaCfwtU}zTnV>h__V5o7uvA#`j zj*r;=x@zLOf1IoF^vONKJj7=Yv9_`U4j_@t&|oNlz|=$&z~1YRaQ3aO?BHNuvHRy{ zgH3bp+zm9X+R!Y_FU&ys^3`q^+~&?srw;ZN&a@=w;T^t;%a;JTaKw$(RTHPb6&RXj zx3L6S4R&uQ;52s{F$F`;6)7myj^U2osj8u3e&Kiu$|4pO8wsRSSvwX(vrv-X0RTK+AI{Exaz#$67DoKT&{fkm)>RX= zZ{N9b@!e(84xF$L61J0BA&=LGSX3n8r3e+ST*Ix~V*u*Oe0cu}Tbp4LUW#z1CcYbK zYv>kt45ueYF+DkoJU7-#Sp!f%rjH)q2TP_WfS0e9Nj_IZ zK36<<;NII9IjJ^YEd7EIfX+5krL5U|q16kkQ+4!f$WmaBqEgm+-iV}|KPKYhDrG>u mn0F1(PyL%;L<4~T3g8dA{uEzmXOY4H0000RKdkMbkHq0WwPlI6NdyXG@QAH1Zf6A&PmQ8x$DvV zXc_|*xo7#_y}a-HeC~PQd+$U#o#s4s;auHq02{ytumNm1#FzfL5;#)Ld0+=6y#1!`$ie0B~9gv1nNIVjc`lpeiY|O&FhJtASRp;&ge4 zuFtegviS5FUY{EPRjCnOpCS4DEk|mJ(ecZaOO=lG*Ka3YpBq)F;q|$B^7yuJ80PI_ z&VTyS(l&YTrhj=I3^n?wN{x#{5b%!x?Q6MIv5d_V3{3#dCD7_s;tAP|P>RU9RPEQf= zj|nLv>uR%~HMLlCO#S;008ZAWmD#p?q~j)pMsxxH2!C5IKM?SbiEQDUZZ&=|J;j^X z@7P$AL^qReau`o+ZCqX6)bHL3k}VvP%M^(xWFbZ5<9GMcFjubn&g#_}pp&^(R>-;e zxPGv&0C4}|9p>iax{<Ym)eR)HqD`cJn60Kme9jW<@SjB$p|k zI@m~IZ$mfVk2hdBi270Z(Sm;M#&r(%6$ZKly(;-CCO&`6^lc7*nZO|Q@Ba_j0RKI} YACyM?sUg!)0000007*qoM6N<$fS~= z2c;r}Na0#Up-|du2?Q*qX3!X^1sChkLAT(PF-uIB1QmLmcMUnD83Z{eIfv%1M{|j7 zDMaLc%kSOe_j}*Zeed0SqEe|a%(yUA^#C9M2mk_r0N^A5a(`B_7ZywQd5XT+{NSz^ z8dUV9RtLc9w9i%C&`kHaFMuN+j>G`?n+y3|Mw~=Em7c=T%I=(Su4Au&)oBxs#K^79 z^(?aZ_!;p;6aYgr$*s*%dj5_BLuGvOGP>I8n}7Wd6Hi1jG?RED%EJdYM92~Mvw8Q^ z=bpLg+t=K2Dt~=gV`wH9M?gxB0sdK6Tb|xsQt2t6`w6U0n?g}>EtIp0ZFSo0Y?oa( z9KdiS<~ndZYK?t#wFS_V0d}^JtT(hWQZD1a2MR?+tS)cZ*R_1Nr}O;>0LSyv%DnF$>AMNx&^jqO#^&pfNPo!*QEPm&y~1~AXL$SOJ?l?p zF-T-kgq%0_POdI**tf2ys5SPfSDO@yijcF)(Z73Xlq**gr`75Y&`;bOUdYV-1$(bM zzH{#;kDe54$A!~|?@8#0>uRgV9e~nSUi>^T+54*TYW*c=754>LTA3I1YLj}kIk3@z uC~f7>EF}(}gJ@Xs@85<2KmhRH1N;GLw(V8L{LaY$0000UpyZ2%j<2CxBafL;Kkh^#LxCiOv@zSw$i&gbaX>1#FzfL5;#)Ld0+=6y#1!`$ie z0B~9gv1nNIVjc`lpeiY|O&FhJtASRp;&ge4uFtegviS5FUY{EPRjCnOpCS4DEk|mJ z(ecZaOO=lG*Ka3YpBq)F;q|$B^7yuJ80PI_&VTyS(l&YTrgmUEb91-U^Z}9Fofv zi6>+sMdagm_tG#|uKLdE)fu3Zxm8xkx%s$$u&)4c|KT0x=Ht4N!dcb!Bs9#+rAkXW z02^zP_<7VgO!jv3Cd5DhmR4p(E>k3zDV{pmNMUa`-;Xz7If(jE_|bxX?Z$Nu_7w)Y x1idQxDkeUE%=B#zf0@7_^zZ)<*Z}`Mz#o)G{HY<+Pyhe`002ovPDHLkV1gcr9{vCT