From 67999307f9b1a55c45712856161528cefe2b9bd7 Mon Sep 17 00:00:00 2001 From: Agronomist-NN Date: Sun, 9 Feb 2025 13:20:45 +0300 Subject: [PATCH] X-01 multiphase gun & antique laser gun bullet projectiles (#1030) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * oppening commit * metadata fix * metadata fix №2 Я не тупой!!! * proto fix * tags in the official proto * pomogite ............................................ * NO PROBEL!!! Pomogite... * noSpawn converted to categories: [ HideSpawnMenu ] --- ...dio_DeltaV_Weapons_Guns_Gunshots_laser.ogg | Bin 0 -> 9749 bytes .../weapons/guns/battery/battery_guns.ftl | 2 + .../objects/weapons/guns/battery/X01.ftl | 2 + .../Weapons/Guns/Battery/battery_guns.yml | 11 +- .../Objects/Weapons/Guns/Energy/hitscan.yml | 59 ++++- .../Weapons/Guns/Energy/x01.rsi/base.png | Bin 1147 -> 712 bytes .../Energy/x01.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 217 bytes .../Weapons/Guns/Energy/x01.rsi/icon.png | Bin 1161 -> 742 bytes .../Guns/Energy/x01.rsi/inhand-left-0.png | Bin 616 -> 778 bytes .../Guns/Energy/x01.rsi/inhand-left-1.png | Bin 616 -> 561 bytes .../Guns/Energy/x01.rsi/inhand-left-2.png | Bin 616 -> 538 bytes .../Guns/Energy/x01.rsi/inhand-left-3.png | Bin 616 -> 545 bytes .../Guns/Energy/x01.rsi/inhand-left.png | Bin 616 -> 529 bytes .../Guns/Energy/x01.rsi/inhand-right-0.png | Bin 627 -> 717 bytes .../Guns/Energy/x01.rsi/inhand-right-1.png | Bin 627 -> 547 bytes .../Guns/Energy/x01.rsi/inhand-right-2.png | Bin 627 -> 540 bytes .../Guns/Energy/x01.rsi/inhand-right-3.png | Bin 627 -> 534 bytes .../Guns/Energy/x01.rsi/inhand-right.png | Bin 627 -> 513 bytes .../Guns/Energy/x01.rsi/mag-unshaded-0.png | Bin 295 -> 307 bytes .../Guns/Energy/x01.rsi/mag-unshaded-1.png | Bin 195 -> 175 bytes .../Guns/Energy/x01.rsi/mag-unshaded-2.png | Bin 194 -> 183 bytes .../Guns/Energy/x01.rsi/mag-unshaded-3.png | Bin 195 -> 191 bytes .../Guns/Energy/x01.rsi/mag-unshaded-4.png | Bin 219 -> 194 bytes .../Weapons/Guns/Energy/x01.rsi/meta.json | 62 +++++- .../Guns/Battery/antiquelasergun.rsi/base.png | Bin 1035 -> 699 bytes .../Guns/Battery/antiquelasergun.rsi/icon.png | Bin 1040 -> 429 bytes .../antiquelasergun.rsi/mag-unshaded-0.png | Bin 166 -> 307 bytes .../antiquelasergun.rsi/mag-unshaded-1.png | Bin 168 -> 214 bytes .../antiquelasergun.rsi/mag-unshaded-2.png | Bin 179 -> 224 bytes .../antiquelasergun.rsi/mag-unshaded-3.png | Bin 177 -> 224 bytes .../antiquelasergun.rsi/mag-unshaded-4.png | Bin 196 -> 227 bytes .../Battery/antiquelasergun.rsi/meta.json | 202 +++++++++++------- 32 files changed, 241 insertions(+), 97 deletions(-) create mode 100644 Resources/Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/weapons/guns/battery/X01.ftl create mode 100644 Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg b/Resources/Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e50201e403d73103260c9637a93e43b218632beb GIT binary patch literal 9749 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 BjYt3h literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl index 84e1b56bf63..af6fe3f17f7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -50,3 +50,5 @@ ent-WeaponBehonkerLaser = eye of a behonker .desc = The eye of a behonker, it fires a laser when squeezed. ent-WeaponEnergyShotgun = energy shotgun .desc = A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. +ent-WeaponMultiphaseEnergyGun = X-01 multiphase energy gun + .desc = Nanotrasen's first attempt to remake the Antique Laser Gun. Has more firing modes on offer but lacks the ability to self-recharge. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/weapons/guns/battery/X01.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/weapons/guns/battery/X01.ftl new file mode 100644 index 00000000000..8f9492a2b73 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/weapons/guns/battery/X01.ftl @@ -0,0 +1,2 @@ +ent-WeaponMultiphaseEnergyGun = мультифазная энергетическая пушка X-01 + .desc = Первая попытка Nanotrasen переделать антикварный лазерный пистолет. Имеет больше режимов стрельбы, но не имеет возможности самозарядки. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index d003e02a98e..422bd5143c6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -578,10 +578,13 @@ - type: Clothing sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi - type: Gun + projectileSpeed: 40 #Backmen edit soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - - type: HitscanBatteryAmmoProvider - proto: RedMediumLaser + path: /Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg #Backmen edit + params: + volume: -2 + - type: ProjectileBatteryAmmoProvider #Backmen edit + proto: BulletEnergyGunLaserMk2 fireCost: 100 - type: BatterySelfRecharger autoRecharge: true @@ -597,7 +600,7 @@ - Sidearm - WeaponAntiqueLaser - type: StaticPrice - price: 750 + price: 5750 #Backmen edit - type: StealTarget stealGroup: WeaponAntiqueLaser - type: SentienceTarget # I hope this is only the captain's gun diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Energy/hitscan.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Energy/hitscan.yml index 2d917b87d55..4f399bea5e5 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Energy/hitscan.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Energy/hitscan.yml @@ -15,15 +15,19 @@ - type: Clothing sprite: Backmen/Objects/Weapons/Guns/Energy/x01.rsi - type: Gun - projectileSpeed: 75 + projectileSpeed: 40 + soundGunshot: + path: /Audio/Backmen/Weapons/Energy/Resources_Audio_DeltaV_Weapons_Guns_Gunshots_laser.ogg + params: + volume: -2 - type: Item size: SmallNormal - type: ProjectileBatteryAmmoProvider - proto: X01Attack + proto: BulletEnergyGunLaserMk2 fireCost: 100 - type: BatteryWeaponFireModes fireModes: - - proto: X01Attack + - proto: BulletEnergyGunLaserMk2 fireCost: 100 - proto: BulletDisabler fireCost: 75 @@ -37,7 +41,7 @@ - type: Appearance - type: StaticPrice price: 5750 - + - type: entity name: лазерная пуля id: X01Attack @@ -54,6 +58,53 @@ types: Heat: 22 +- type: entity + name: лазерная пуля + id: BulletEnergyGunLaserMk2 + parent: EmitterBolt + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: red + - type: Projectile + impactEffect: BulletImpactEffectRedDisabler + damage: + types: + Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun + soundHit: + collection: MeatLaserImpact + +- type: entity + id: BulletImpactEffectRedDisabler + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: red + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + - type: entity name: 45MW.TRG parent: BaseWeaponBatterySmall diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/base.png index 50d2f7838ba330c4be568eaafb293b5361cb54df..49f496713149dcf068eb91e7080398bcee9b4348 100644 GIT binary patch delta 674 zcmV;T0$u(42*?GHGJkVINmK|32nc)#WQYI&0&+=2K~z|U?UlW5(@+%0f2M6vTH{oW zQGUziGi7S;0gK|tSo&2CT5U8u&|**OQd#)NK!=#6}Cftb(=^n)C}>x zwTbPds2llD{x~1MbA0YG%rw(X|GNxzQL^m-z%(rY+MSk>;(v3knvdR;%N2^nqPh+K zC7_f-7a^qpz;WHwVl;qq@;pz!tX9{r4A5xoX}?IUAPr(Z=^>2h+wIns0scxnQI{Pk z-eE46W63N4aItWU<&{#V^GV;C%Enr)0tDr91%UmpUvxKO9XP&t!p-Ijq!g^(t#c~< zi4{z;SzakY-+w^>LX2!nwjG$JMZ427G{9guWUcU;t`t;ioA|y@A(zVxJ{S(iY`V?8 z*br7~n?QWPJlfhiO_# zLrAaJ)z_*M5ZME1D%o~WE>{r3M@oU?zJX`=VHemnw159beJfbZ=f`H^RQjBsopF40 zFc#Z!U1K6Z_1=15Sp`k4A$Tz6t01Bp42J-SA8q{^-hX(feKP@)lcz5g)vf)9pJ5lO z-iG#5a{=)!o4N-|wjEejA&V~tsuBs|^Qie4Ebz|b@JUJqP|6Ch9j@!QA*izXy}iWY z#~w>BFMo&4G%Zv?j_Xbbpaw50b%vjITGYa4uS9$o%soHlw)cx(#5e8dmI#nE(I^{xb<0!rBh>NUX)aD(x{mAhdcEu04rj)@j(^>_PRR>A_$RH;@$6jw z=giDm^yty!zsBR(HfCl|F`L;i3;kSy0j!o7^0yj7j!L0WfKe>Mt}*z1 ze$jS&7TkSd{r&xp+dv}aw2>k ztCfnd{uZ&ktwiUF6N}Vw>Ef^L0v>w&IfN9YImn%a(|;FFI$k>y@d|d+H-vw({{+6@ zXb4zYIwx!=_&UczRV-h+d{Dq=+l%FVO{0XXcU^J3Cjg?VGoq{Q~RgA z-~RLbw@&Lm?tDJGfaT>50(b^KTswzPiomlIuZfr4(#iX~B3d)RY3C!|(T@R;%Ne3m2PX+&aJ;I)6Q=Q86kO4eV^Cv6tJ!o|>af@HfER z+#C{#1WTn-Z2{EGo2XfT!_d+&^<9xUy{IF1D^IqFWGcaq-m6UUiYq#MH{!>p+5 zB5F-5z(Yx+0&}NvZ1BNBs-`8p@%o#PSH1+6D3aM(Se7L^oH=_2HJVF=N8g)61q?m* zD1XcB-hf2gU{EH4N&p2-?=()NUQ@3@4$5?9>IjB|P=X2`9()8Vt1DCyYf!==TweOE zIsQN?Ze`?|r|t{E5}c~V3lBGp+n3xx#m4}XlRW?RR#9lE-yimT=eNEmtIY0-gyUH@49 z9UeaRrYf>1)0cLA?JCK=Gb|tn5WhDj_MO{6ARr$8&V5ePk9+Mb{W|Ef!Y51UJJyHI z^d>fU{=(MvEgBz(ZWL$>6uOQQBzidAGQiw|LWKv61C zwkl9U;=E7>!&o@K&~dG<0w$*>pzBl`DOP_ZbwB`zi{Nk}v%)+4V7GEu=eGNO7yPTm ed-V7p0Q>_SeC1EY^C?RJ0000PPH}4)i_fPQXRS*3KOiVm$qS1?2`Wfqi1ZXhW6c)SV07p=jS%&oJr z+))sEF>~{lYnpNWN4;LtQ0I}9f>bIUSgY4-BX^;{1J-qBqEQx%9>nR~6&9D0p~;R~ zjfrf`s~G@Sfq!l9Y-*T54;-96;NrN28&^JKgSpO|7&QXu@ipUI7lgIG(W(zf;V=3|CQXTJ0FV;^h8@a8sMxN&E|LjH67~wGz7N? zd=-RWoo=^R^7*_;eOHJ)E; zh96hUWWBX_B6t_fylivL{zKj8JL+*83NWmrk6H~5_V;upS)eq;S4zR|?iLXK2!#Ti zc5E)q#yM)CA?CabM{T1@E|~1qI~RZoC}j=E={e--Y@S~~%Q`W@Iz;fD>4gAzmAK%| mu{XIH-2XT0000VGd00bUM zL_t(oN9~o%ZyQw<#y@-f8r#&diEEI8qVNh7OhOYvo1jpMhd>AP&_iKy5Gi3I{A zmMmBn2?@c51qcKZ3nYSyN)sVU(*&6ssx**i4V}dGcs!Z$^M7*g&5Yw|T&H9M3;(2< zb7t=AyXW3}F50wd^Izk#tb?(Mc?`?78~36La|Dn;-}G{Yf)Gktmn%Jkb<`Q~-xu4>lb{gKb- zp%)6MRT#V;iY9Sw6zp|jU0q$4yNyK3uf^x{SzdFB#iHdoSy@@JygK#$z#VqtvQZj5r4T1H|?!VCPM?eu(rDHste%oP8+eqIWjtoYNZCo7`99uCY|er-xm;%$Dt^S zsAI!tYDbO3`{ds@1xoOEy$H!cTw1(@T8$yIo)H2#yAp(jYj9|gc|4NX;ih3Cr{-uz zWo#&$u2?L_ve|4soEFR$VNa-9+(0-Sg4gRorGHYzPd}cmx3Tj8|IzG0g_2RBpksA; z4V&3bY${ob1TO(5CnwR_*~t=#gku5~;|eO~-_X@H7}~msoL10~y_zFiKs?dO4&EAP ziCYdbF-R+teMwf(G%;&c&BH}OqXcukcC6?29?GU$cB8Sgl$^FeroHjsZCU$?dU99f-j>E|*)Z^P{83 zAiwz=&c~laG#bUwzz~i+JPcjaMLnCA5r0Vb-7jVzB-Io!y`wbX$3J?Z#c0_0EdgPx#1am@3R0s$N2z&@+hyVZrv`IukRCt{2+&@cOQ5eVZUy2pulBr7!7MdxMEXGhW zn5oyPouqHUrJEphcW7UOOWuN`pp%P8qf4kx6@np4yI35G7EXus#*6vG&CNac%lu-w<}5#~jEzP67r*cF?5m^=D>-5E z@9ysO4*-k`(b)Fnj*Bw;ej)|BSz9Njf-x%v7okD|@%{<5a0O%=+w1E3`?d8S#98u7Yb6u>{KC>J`D?W=PGjG@)r(PDD-FIig?vHB z$H$5O8;P3ld7kO^x`WqAd}*vHt(8phLZl_%^}YcB00000000000000y+1qbAolDr; zZ%#FrV68jarS=RNf{`{U#0YA#_^ewew0p%dU&%OV00000 z000000En(-`u+HB6w5WI`Ei(GKA>g#efVw^%QchB<(%cmC1L?urc&M2Mtw_1hs}6* z6hg6FGt1emv-~(kD8SRR^?SD+D-X1uBsja^BHy`j&(=>ef7I+kT1|BVl76=SxcoHE zE{roYA27+J*?}au&bMLe`={&K0oVC+!FBJu>wEwJ03hZ50WzeGxh9gzE&u=k07*qo IM6N<$g5j-#v;Y7A literal 616 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 KPDHLkU;%=j5cZh> delta 591 zcmZ3;@`7c8NFAq*{xnRalspMJe;a}BSH zV*_WK>w%cUqcukiS1onFvaNS!3a1X!Jo#uw&lRD7A?-+Lb`Oi&z znHTN8cE7W3+V#ut4En7oAY+o_J6{U zzK4sXalg#pI(hQM&zU}E`~F`$e(Bb-nYw2dU*FsQezpIGy)2XY#l*xft#<1T2;Q5Q zpTcaSCYhbV=g6f0Dm+Ku`C6-h>159g6RB&y7jERt>opO-5#CfO{UFcAd3yaJa4>*F z0ec7mr4Da4w^$eBu&wjehU6!)2W}KGde&NkR`PYlrfHk9RM3{n{^?O@gSXxRw!SwEr}sPD0~)k%Gjoo%hxY(lOG+U%fk z`!}xkMfhwBi0HA1QzP0YT1)nLmFxh^u8LNFxjOgax&{C^JHK2zf$*KM4FI(IOU<&Y zN{)n*pOa-*#ed1Eg~`~%$NMXcq5%N#r#?o{qhI?pOQwjvpE*26Sj!vqq>oqW-`Omg ztFLAh4Rku4SpC)Ob>UC_)$_VV``65pDWVIZx*ZV_5fKp)5fKp)5p7SS`MAYgfGdLj zl2dXwxcO~x5^`>kr7wWfZKuoy#Ni6dZX%o0;dI-nDsV|(fONTlIKIBTo-Zi5Fij;* zE+CGdvI9v;-2rKG0dc6v4rC;Z>zkX~J24r1n9p8Txq$iXO-k(p?F~n{Jb)lO5X~VZ trR4l1%>~4FAq*{xnRalspMJe;a}BSH zV*_WK>w%cUqcukiS1onFvaNS!3a1X!Jo#uw&lRD7A?-+Lb`Oi&z znHTN8cE7W3+V#ut4En7oAY+o_J6{U zzK4sXalg#pI(hQM&zU}E`~F`$e(Bb-nYw2dU*FsQezpIGy)2XY#l*xft#<1T2;Q5Q zpTcaSCYhbV=g6f0Dm+Ku`C6-h>159g6RB&y7jERt>opO-5#CfO{UFcAd3yaJa4>*F z0ec7mr4Da4w^$eBu&wjehU6!)2W}KGde&NkR`PYlrfHk9RM3{n{^?O@gSXxRw!SwEr}sPD0~)k%Gjoo%&-XT7^vd75d(}_9il6ztXDi=3e|q(KdB3z>cKqtQru*Kne!BaU&hHO5S}rb~ zbERhH`7|x@|2v{WPjAoOQ^=ambKw5W_t*VXi>lX}eK!4+8y$1{Z1aXst&N63p6~XG z=g*t{qr!6ej(PQpi>B@GUQ_HBe_F>|d%@LrQi2m#T=(yby?bV_!7FP`yL0m2*|dI| zwFKUexqD`EsC4}49os^^Pg}oWSyp*XL~!EEzaf2bd!~f1cmDaU^wE>B1#|PACBFLB zoa^6T@3Cv%ZvFCX(>1aZeC=sf_P%lHwJUvY{oKYfS7GMIvzwRoxGjGBn!~Em^M6A& zP*}!G78V2`xv!JUSDk-oMSk7iKYG2h)PYF!{lT;;lX=8{ zF8zA%{T2EB?vlUf{8thG`|+0Tk6S;HoqHhfhW7%V=xu6x?^Pe%dKJgip3==2anJj} z)~kD2_|6J5ABbaG_34{X!OZzvryo!}8O!)a^}(^gd(xus9i_JJ>d={2JHJkEANQ@F u>vHxi&$2%qZ(XmS@qK^xb7r75>@WC*^m7G@_*jiVmU_DSxvX1C63VY1?iBKNh|NAmnhs~77)r&s#T=M z?TZ&bUf`4w2+$A{jP1Pj{`ULaoOkb5PkkX3b@q3_9nOqC6@|H$A@AR&m)PB_s??Y* z&CC>ac3L8DfXKWB%ps@3i{g>0$hpY}gEcwP%gXhAX zxiV8uzAj(4{h$H+`{(wSPXZ-SLIQgrZDGApx?^qjkI*>gRIj~Ux0vj#WpAi{5q$dG z;l=Avj#-_0jIZQRh%VE4=)d0SLI(E&sTix^AcwpZ-niM4U$io~H)MZ!8m#>9mPBOp z^`oo96;J%XAY_oo8^^vsu2mtrY)kk73)2eOKUJblF5U-r0GVl5R~uZ6eX!rOA~x;f tYJ-oHA8e`STvl6CDZ&PcvIBGE&mA?p@I7UN1uzvcc)I$ztaD0e0szV^3eo@o diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/inhand-right-1.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/inhand-right-1.png index a6b053d617fa8e405949df9bc3b162d8f5ff87ab..f0de217138803fabd5a0fba7224640e5e1a0d08f 100644 GIT binary patch delta 522 zcmV+l0`>j#1fv9yB!2;OQb$4nuFf3k00004b3#c}2nYxWdEbJN?WU7Uk!lxdohk^{rIR99 zV&Qg>g!tdaL`^xrEz!jL-Q4St^8rLeL_|bHL_|~S^5Uu>_kTSKFDc7DNTza92w@$+ zK3A50*Uyd?olK^3GNfq;M+C-(;p^g)socsHJU0RMCoiHgG#gdl77qYIh?SEtHvvKj zG}H=$s*0z_2j%WEC;`9^{{`k4?PG4J71+1(tf>hwXDVwHtaGK>SjlAb2VcA?lg-Og zZEUStvzBG6V1H_P>uFsk;t2pix7S7B_!MX78FboB-)x0UHZRRF|9pSJUQg?-HCMyj ziDI!RyS=V;yyzl7(9^p0#1ruZ%H{Irb?9kb+Hc@j|D_HhA|fIpA|fIpBBFhp;pb)i3N1*u>Z{5Pyycgfwk!2EUEjUIn)~o`7bf zs)%R|!1@f{se|rSuxIe{8lLRW*?XJ6=_W@j;IA3H6T9kF2spj)=JsB8+D(iGpH>Dx z8Vp?7?N@u@EMdmp z+}5ITY{!E~Cr)Wk=rFYFR#bY~WL=nSxZ_8eH;w+#V!mpl$mPwpVbmw|9)ZM ze!~q5D!4ZsdM@O@W6$e^(%R^~HnuuTSjrjierT0xWp|RjcZ%uqhdKW@G`!p7{)p$L z59icR&MVIEspb6b(XoR!qHfQ@+)oGgecNp9eQHgu^vAVRW_{m#U}p0FIhx)!nVugc zj1?5-+Xp`T$+~aS%6sYcB?`Bg1%xuzrM)e`Y89z*`{Koq7dT}E0yM+~V>@rXzx_Tp z=iR&2Q(s6$o&6nfhcly3MPaUG$oseHC3g3!Dm7+HGc!eGR5Pm(sQz8WMp$>HXmI{Pi`A*(|VOTIDH;JI*TuFRB^uglkMKWM=I{&~H<<&!`O zXkb9X0&6%GZ(+Srx?^qjkI*>gRIj~Ux0vj#WpAi{5q$dG;l=Avj#-_0jIZQRh%VE4 z=)d0SLI(E&sTix^AcwpZ-niM4U$io~H)MZ!8m#>9mPBOp^`oo96;J%XAY_mi%p1qP zKdx0Fx@=4M0SnU#**{gHO)lOCb^w`aS63TcjD4`*v?4a`;%bABlOJrU=3G`=Qz^m* bb?F@Wb4SfCd{5b6!2krFu6{1-oD!M<-JuDl diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/inhand-right-2.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/inhand-right-2.png index a6b053d617fa8e405949df9bc3b162d8f5ff87ab..38745aeb6012542370d730a724b268c2749b49f4 100644 GIT binary patch delta 514 zcmV+d0{#8-1e^qrB!2;OQb$4nuFf3k00004b3#c}2nYxWd51U*<(iSPF1i@T{2oa1k zcnxxg;u&}6U3&5TZ1?mX@ArIf@%saah=_=Yh=_=mv}B=Fk$>A>MUW!vKWfQB>DGFB zeth`lyWwS9R8B3*qgV{d;}kwWM(DH~p)EeA7UkRP)7tg#*-a2a002ZX9qQr%KnQ`H zT6BJm3#E#bcd+jM)%m_O#{*iUZ|v5*Sc{#d6JYL?eqXW1YRy?h)5|+wyh+o`veukg zr`D`x-6>c)-hWD7k=aZZ05BL15Is!c^h`s)*9py4(Dbr2*Zlo8!eTw$m+ndpD+ASP zRSt#&>)CEn7$|wg`o*)EEb8^T^E#BgA{So}R{y0AA|fIpA|fIpA|j$~o9At0Sjl8N65PdKLWS=>)jV;Jx^(UWKUFi5HjGvft}qI)1k@`004!+rkba z6PzTH0Or~LV(#y!jqcP&8N36b=v4?hgJ;H1L_`#rA4iG69uD=Gpa1{>07*qoM6N<$ Ef@*vDssI20 delta 602 zcmbQk@|k6VN7?N@u@EMdmp z+}5ITY{!E~Cr)Wk=rFYFR#bY~WL=nSxZ_8eH;w+#V!mpl$mPwpVbmw|9)ZM ze!~q5D!4ZsdM@O@W6$e^(%R^~HnuuTSjrjierT0xWp|RjcZ%uqhdKW@G`!p7{)p$L z59icR&MVIEspb6b(XoR!qHfQ@+)oGgecNp9eQHgu^vAVRW_{m#U}p0FIhx)!nVugc zj1?5-+Xp`T$+~aS%6sYcB?`Bg1%xuzrM)e`Y89z*`{Koq7dT}E0yM+~V>@rXzx_Tp z=iR&2Q(s6$o&6nfhcly3MPaUG$oseHC3g3!Dm7+HGc!eGR5Pm(sQz8WMp$>HXmI{Pi`A*(|VOTIDH;JI*TuFRB^uglkMKWM=I{&~H<<&!`O zXkb9X0&6%GZ(+Srx?^qjkI*>gRIj~Ux0vj#WpAi{5q$dG;l=Avj#-_0jIZQRh%VE4 z=)d0SLI(E&sTix^AcwpZ-niM4U$io~H)MZ!8m#>9mPBOp^`oo96;J%XAY_mi%p1qP zKdx0Fx@=4M0SnU#**{gHO)lOCb^w`aS63TcjD4`*v?4a`;%bABlOJrU=3G`=Qz^m* bb?F@Wb4SfCd{5b6!2krFu6{1-oD!M<%_|9? diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/inhand-right-3.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/inhand-right-3.png index a6b053d617fa8e405949df9bc3b162d8f5ff87ab..754bb3ff12cbb3b4ca4b0a89cb71b7217475cd66 100644 GIT binary patch delta 508 zcmVzINv_ z%q`UGbzuw)`+CujqChUm_7j(~5?Za6_Z)Ib7S2D2s{fLMh=_=Yh=_=Yh=^#{W_{c0 z<~3O1%qlFY$Gw@&4{YNmxMvlD`Ut?R y+jsW7?N@u@EMdmp z+}5ITY{!E~Cr)Wk=rFYFR#bY~WL=nSxZ_8eH;w+#V!mpl$mPwpVbmw|9)ZM ze!~q5D!4ZsdM@O@W6$e^(%R^~HnuuTSjrjierT0xWp|RjcZ%uqhdKW@G`!p7{)p$L z59icR&MVIEspb6b(XoR!qHfQ@+)oGgecNp9eQHgu^vAVRW_{m#U}p0FIhx)!nVugc zj1?5-+Xp`T$+~aS%6sYcB?`Bg1%xuzrM)e`Y89z*`{Koq7dT}E0yM+~V>@rXzx_Tp z=iR&2Q(s6$o&6nfhcly3MPaUG$oseHC3g3!Dm7+HGc!eGR5Pm(sQz8WMp$>HXmI{Pi`A*(|VOTIDH;JI*TuFRB^uglkMKWM=I{&~H<<&!`O zXkb9X0&6%GZ(+Srx?^qjkI*>gRIj~Ux0vj#WpAi{5q$dG;l=Avj#-_0jIZQRh%VE4 z=)d0SLI(E&sTix^AcwpZ-niM4U$io~H)MZ!8m#>9mPBOp^`oo96;J%XAY_mi%p1qP zKdx0Fx@=4M0SnU#**{gHO)lOCb^w`aS63TcjD4`*v?4a`;%bABlOJrU=3G`=Qz^m* bb?F@Wb4SfCd{5b6!2krFu6{1-oD!MAs=7zW@s#g>9Xgi;U*6xu13EQV6-;G|pE{)H~xocde*D|T`zLhKTXn;@hv-9)e? zh3gz0nf;UVlZFq|L7kQExnZPj9a; z5x>o^qwrxvXnF_5k_^YTb6&g=d4fYW;P=bRQ9{ zD^&%(UT^z4)S4>%e~?%Ir4Aw@A|fIpA|fIpqJ3NDZ81W}on_Ojupu7bPVD40v0$%4 zni6k-W7{Z}WN3N^*=|CxS0QbQH^3bBCAnMykmX4@;9y>bI2n9Wn|c+}l;{M+&ES*x zt6qgd(uwyEPhv7Qv6y{$8T?{4Pi(1w delta 602 zcmZo<`OGpwrJl3EBeIx*f$scmM~*) zZfnsvw&TI06Q{H%bQs!oD=NKgvMx+E-0>sbF;&S!ro>79fTNJ?I$K`X3ENIA6*y(N zzoms?`Igg8(WSQ!<_#c8s2Skf5h|B zhjZ#D=N0Go)N=mz=-9y=Ff;l898GVVOwSJz z#tI7a?E|0vWZgGu<-PR!5`|mL0zw(<(%zO|wTjfZeevSQ3!E|n0UBb0v7NWx-+rH) z^X}d1sV}6W&i)R#!#s@GnwTTFJ=vNu$}2tIx8@ZxnS$E;30##izuM3?D2 z^k46EA%lB?RE$+{kV9SyZ`^FjFIpMg8?rw<4OaelOCqxQ`q9;S-7ssx*$x-p(51@w`JYD@<);T3K F0RU@lbl?C0 delta 286 zcmdnYw4ABFGr-TCmrII^fq{Y7)59eQNGkxb0|zsZ^a*I41Ed&>gWR1M)}51i3FNS( zJNh~@Fl_AS{*%ZGB9|{L- zpCssqaqL=nftS^sW0^`2&+qATCwpwkn5gTe~DWM4fvwvav diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/mag-unshaded-1.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/mag-unshaded-1.png index 4b7196773ecc6ad1e2fe9e7a6d569214e53f4783..dba4e722d9341c80c3489427bdafd525a5ed53ef 100644 GIT binary patch delta 132 zcmV-~0DJ$#0j~j&GJSJGNmK|32nc)#WQYI&09i>yK~z|U?aeU_fG`+D;RhB7CYVU7 z0}X5pXu%COnsmd&FX9*wz|tm!+&5qDftlI2WwA*l39?!g`nSP8Uyxd)%^qFt!(&WZ mmjQq{3sXe(hMAd}{mTs$=@8P`EAAx#0000FmK delta 153 zcmZ3_c$jg5QGL3juOkD)#(wTUiL49^44efXk;M!Qd`Cc-ajG_-G*B?Y)5S3)!u{=q zgS-t20<0I;n=MN37fI$9aY?_@?9_2miuYmHXCb44CRc_JN84wdI;MI#IWRo>S=8fw zHpTtxqT{9Ga^3av3~b{an^LB{Ts5 D(yus1 diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/mag-unshaded-2.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/mag-unshaded-2.png index de3f621f484424120ae375fcc8dce56e9d9dac4d..e07e85a4cb7fea82ebb437c5b79fe397b9b09324 100644 GIT binary patch delta 141 zcmV;80CNAr0k;8=GJkVINmK|32nc)#WQYI&0AWc)K~z|U?b1C8fG`Y(;kV#vItlSc zZaq*3&t$;K>(rqjx>$#TAm6j)k7NjlhSFca$$ vBAs;k*`{ne?K+&)S0Ws#K5pYdZIXgskGof_DP4>fp#!>y85}Sb4q9e E0PMLqf&c&j diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/mag-unshaded-3.png b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/mag-unshaded-3.png index b0c11d67937deeaf809eb9255904a50beb99da86..2754811fb702c563aadb49607cd70101293e3f1f 100644 GIT binary patch delta 149 zcmV;G0BZlk0lxu|GJkVINmK|32nc)#WQYI&0BK1?K~z|U?b9&|fG`Y&;a~7Bf`bTk zcGSCgAa_Ua(oTY_ljo>IS8G89LEg8%kYq?eMC4=Hb!yHN_jR>N{(~Bp4gy0GJkVINmK|32nc)#WQYI&0BlJ_K~z|U?b0z0KtK?M;a}nm4xy4P zr=Zlifg8ApdpLsL>gb(h6)KJ0O(YU|Upp^vrWggh-^Qj}4Ixm20~OfbCeB>*@6!A|fL4FDFnF4-q%4tmOj$0000)5S3)!u{nksQ+GvundX5&ihME1B@M2E+%S*P%d}0CG cR&jo(uy~5z(lY^WIzTRir>mdKI;Vst07n8t6aWAK diff --git a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/meta.json index b923e958ce4..7f0cdb17b87 100644 --- a/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/meta.json +++ b/Resources/Textures/Backmen/Objects/Weapons/Guns/Energy/x01.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/pull/44216", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/484fcb08e8e2058b81059424fb5aa77034a3fcf1. Multiphase variant spriyed by Agronomist", "size": { "x": 32, "y": 32 @@ -13,15 +13,17 @@ { "name": "base" }, - { - "name": "mag-unshaded-0", + { + "name": "mag-unshaded-0", "delays": [ - [ - 0.5, - 0.5 - ] + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] ] - }, + }, { "name": "mag-unshaded-1" }, @@ -36,11 +38,47 @@ }, { "name": "inhand-left-0", - "directions": 4 + "directions": 4, + "delays": [ + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ] + ] }, { "name": "inhand-right-0", - "directions": 4 + "directions": 4, + "delays": [ + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ], + [ + 0.3, + 0.3 + ] + ] }, { "name": "inhand-left-1", @@ -78,6 +116,10 @@ "name": "equipped-BELT", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, { "name": "redtrac" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png index 003858cf9d9011a7a0c5c407ff724bc8135b9424..398032cf36cd2c872b3bc65256bae21899ddc6cd 100644 GIT binary patch delta 676 zcmV;V0$cry2)hN4BYyx1a7bBm000ie000ie0hKEb8vp7kqF#bdxcPP<)TIOhd?MoTWb?kix}KYh*}#LF8o(6 zY@;I>1JTUF$yODw`&~SD?t8p>Zyc_M&bjBF_kT{}AFBpX1E>KUAAr-% z%`SgqF-JdVceYRbRRF4`C4qQ6E{|?C4)^zqCJC;oulao0WDJ08DijLl&t$Uo&;T17 z>t>(j%Pj{{wg*U`&2FO_*-1pn0Ni^tf%fxf(Uwf;=eKi9=;`VV-CU{7+R`$nQ%_wU zG4-N+20Yy@yR1r&>Wdd-ICk+aba04Zml^`W=> zAu_WIc>Q8VS0qf_UX(!s?UMTgSSBHB@6 zd#UrXhM{dh6C#%@RZ1#Bd5+)!!XuW;ahgmBlaAD1cr1C=pZwF~Cs#B5(n4R1etjL5e(rFb5LY z?h)$OXn!L%7jtNQS<03b5Ia@H$^aPLA6V|N9oS#iy7BKgQ}~ITwYS{MEf9ds#A{_w zIZm|Up&On|{DCO~^L;>ty@Wym-lV5gGo{t)zJZW|;}33EsFHvc0fSMTn0nX+K`LTO42i5uW}DVvVrnvJ z{CP-!vy<&4TilCazcA$Yd-=WhzVm(W{RYl)j{iFp`z98P0e_%r8m4IqX}|Q^t4ew$ zeWrl9Pjh^@aaGuDnx-kHXuNQm005&!@9+-rtX^wVRr_&LEK!DnXi~lNc zVf+0vol7Q@c)eZ#+U@pT0sx6bf^R=~{>(|ANoTBeWZ?yF)s>mv!sfTQeok^uR9-crEl^M46Ibi3WVQ?R?Mq3hqDtakw@ zl}bZNeDv;Hy!`swsdLe2)FNXivA@4>Nq=;71c2M^?h_~!3IODC069vf5`{v6_4RcC z;_*1uY88M^r$fD72fzb#E<8#;p9dfi2%J(xlIWM>6BZU0I6gjBd_Eu0p8};;tBG2z zcIqu7k$;F%E|&)`AvqzMrYY0Y)57I-DZkvh!xN7^Os!TEQXM-9X_HF%{eCN^tJCSg zJ-3s@sQW;U)p7eze*WPmk3SOR;NU<3L?V%JEZ^E%zhtrmLlaAcLLmSlOCaSR8yi!6 zJ|7bk6958Gip3(ju2U|TMJN=a^-z%)zXA7~Z-3BeG}zhM0l+W}+-|orK0ZF0z~tm4 zQ&Urzrr8hJYSC;qr7B9Z*|bIpV0n3&?d@%<)v7olZgssKl}g3(2iq7rpgsy{WHK2?1uB(_EGq!rZdY;q8r~0yM1o{8$;`|QPhUh_ z{`eZI$7lU7o6O#9jYi{?&Fyv%FF_;{8E~{CnM?{m93CEuR4Rq)@!^>Y6AT7fU0t>O z?2oFdip%9vy4|iqzxR}Zo6rfFOomh{HE&XlU@(Yhs{g%z_R`z*P6(^2s`Pq2>s+tb zLpGirLwi7uR5Ti;)oQW1xjB-^Q_sBwfcAG=QJMyTW5P2NkWDD}vayEY*6&BkXVMF0Q*07*qoM6N<$f&{ndMF0Q* diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png index 88be89b378008138417f791c22e480d438159c55..5aa2e21ce1859be90144add387a4e0a2762f686a 100644 GIT binary patch delta 414 zcmbQhv6gv)WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hTfKQ04 zsECN7f|9t`kbWjPBxB8wRq_>O=u<5X=vX`tXUPZ!4!3;(ARZwnnV z;BaYNVwkz-%m4k?Vx6*NOKZyRv`;(0nX@t{{)>G>N7kHs9SuvDRB8r$ALE_5_G6gw z)oqZbhdK6pT?0R zduTh?kqz5Uf33Iq@T)ALgeM7rtnZyIN*tq_PH996QxcgL| zvmOw7vr{$9#*;mHch}a=dwNHn$*uUv`{LDHlbbuvb=lvwFgt7%{dRvAQgTe~DWM4fq&BXe delta 1029 zcmV+g1p51}1CR)i8Gi-<0047(dh`GQ1J_AJK~z|U?Uuo7V^tK!f446$Nkf~VEg^|0 zHO8co(kF$YNXe$)$~Njo!7>XMS&EXCF6>|6rZ@{>z?HZVq}X<)F2vNu31zWHpz5wBiIi@?mfBZobP?-ocjXTxPQj~9m2VZ#bN-s-EJ() zlFB}Nd@QC-^GX5lheF&N8f>0C0I#Ow6}&}y~L2mmA!34Z+iwJRrm`OUPwjx4^; zosHYJ{m#a1``c+#iA~eQ@AumiH=+U=hJ|r!4#O}o41Z%N0TpnV-ANK4o6Xt^_8C4PVKkQbhNno6Z2 zl{!um%BGa^`~7xISG(PY3%8TPu=_xb)k*7^-+sBv^Unl1JUkSDOe7M0%eS`HE14?6 zz{ConPzXS(5-9mcMn;6s=VNSa3_t=RpU-0$27kq3QHDYx8c*eU;|I_`c%NFW#?H$(^n9UV?!e0-dVi3u#r>IG~xsMqUC6;ZF(?NI_)Sy^Fwdz*5(EKiBsUGGGx zRI>fSF^2t6tyX0`9v@f=(=^HF^W6W-OS7x7yu57JHXnNj{o`GhmX=spSfJHv*;AnI zfqz&mHe3Nf&d<-=6L3+1OeVwKdj<9n|78E+k^J_HPXS1$(|r{vl}f6t0CYMX(f4im zI3yAYlF1}fQ&YS&i@f#KcW54;{kv*1XS3C6wM#Z#*9Vs%5{aC1bRwBdNC$%4VPjMVAD00000NkvXXu0mjfDWLa5 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png index 042d52f5d74ff97ccfc902861ce0aa21dffc89b8..262cc20fed6e6fcc4d36679a4554e8723646f6e0 100644 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gdz zi(^Q|oVT|&avpM!XnXkGVZ+8PLfpbRcMh56#2hdZwrD8c(UcmsdcjiHEdngQt8TcT zWLPBN^Rbp+=FicC2f45RwLN0V@JNQCkgvgl-C+*1!Z}8P=L{X$wg=KAuAjcTWoCEm zv7G-Le=gP-tP@|nYUbtW`MIV4f7HEZoTS8m(rUT(%g<7mE`R_2mldR~m;tM4sKPO? z85eoRxCh=jlNwoMkrwrv@wvC$z4mn#_7B`qT>;S-7ssx*$x-p(51@w`JYD@<);T3K F0RU@lbl?C0 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJTu&Frkcif|mo{=X7zngJ{C|X1 z=dskgDGTqMG@W!wFiG(ihn$j{*!$ITPaO5!9b8dDomCP* Piy1s!{an^LB{Ts5<99s? diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png index 5e64562bdc34e880841ff3492079ba46eab9b3b8..c73a59a863b3c3050d0bf208e3f6dd3dc9aef503 100644 GIT binary patch delta 186 zcmZ3%c#Uy_NsmoOLmu mMCpMQ%x*53v9)koGw?I4P$Mq7kXE!!(eEYw?=9DLs&JhhE z_oV*|W?dCH;IfL1Ps_Stg+PLW(JHrt8WOBe7-prc&k$v6Q;6fR{$W$MRYlz8NK@&2 s$$#u04FlGnkpr3B(-dgHmBGqT%*(CTHfQ%b1|aZs^<#Be=akR{0HIhjK>z>% diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png index df4767bff9f12031025afa4e86f88b1353c07f6a..d0f1fbfec69fe155207dcc5f9325663bfc31e315 100644 GIT binary patch delta 196 zcmdnY_<(VONmgx!*Rm@u2rlQQB7#8y_*u`AsI_2N-)YT0)^BXvA!#+RB-m|my6`w|3asS30 wALTB-YL6EITez4{qV&KDW;a=bCo&8S^^+B1l~PJh1D(g<>FVdQ&MBb@0Pn?6H~;_u delta 151 zcmaFBxS4T+N_~~5i(^PcYjT1F>*53v9)koGw?I4P$Mrdn?(p#RHB4-5Z2V}=%&e?F<*Y->m)@p811=86St+X3wrp)I!5r3w zdUabxL|uLyXu8bvU-*oKhW2vzgBoCadYGyh7_3=%H3fQ%IRqGhz|+;wWt~$(69E3b BH7Ec8 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png index fcbbc48af1ac28a75265f6eeae6a54825f4ee72a..ecf2375729d89b7a64fb198d3c35031291841ebd 100644 GIT binary patch delta 196 zcmdnU_<(VONmgx!*Rm@u2rl;duZJ# t_D&`0?}zRtsGW=XBuasL+U77b@O+o^UU~NJN1*c0kHv)B!75GL_t(oh3(X_34kyV1<-$Dp}0|+OdvRe*o#ZJrj;{jcNS@c zM3M;6=D+F}Kiok`03!OCq?Be6jdeOeR*lv?bxNtf<^3U_*`uB6sC?lpBCKo2nL0IEActkU#VP5V001pTAaaW8sQv%|002ovPDHLkV1hVE BRk#2E delta 168 zcmV;Z09XIx0mK22B!7!ZL_t(oh3(X_4Z<)Gh2j4pgg|V-1lfXBk_oZ}b7T_cU;#RM zpgM|x;tHJ$E6w|=ll6Q)$+E%BR;Em7l%l5T5p;>%mTe|96wMx5X1*7hvVNtGo^2|! zY5N8P2+$j}ix8kE=