From 09a19d84c7beca8033252fee28e82836cdc7f6db Mon Sep 17 00:00:00 2001 From: unDepresh Date: Tue, 30 Jul 2024 03:43:57 +0300 Subject: [PATCH 1/2] new_weapon_for_sec --- Resources/Audio/Weapons/HoSLaser.ogg | Bin 0 -> 7199 bytes Resources/Audio/Weapons/MiniEnergyGun.ogg | Bin 0 -> 11005 bytes .../Catalog/Cargo/cargo_security.yml | 10 ++ .../Catalog/Fills/Crates/security.yml | 11 ++ .../Guns/Battery/MiniEnergyGunForSec.yml | 129 ++++++++++++++++++ .../Weapons/Guns/Battery/MyltiLaserForHoS.yml | 129 ++++++++++++++++++ .../Roles/Jobs/Security/head_of_security.yml | 3 +- .../Roles/Jobs/Security/security_officer.yml | 3 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 3 +- .../Battery/MiniEnergyGun.rsi/BlueTrac.png | Bin 0 -> 188 bytes .../Guns/Battery/MiniEnergyGun.rsi/base.png | Bin 0 -> 380 bytes .../MiniEnergyGun.rsi/equipped-BELT.png | Bin 0 -> 202 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 202 bytes .../Guns/Battery/MiniEnergyGun.rsi/icon.png | Bin 0 -> 386 bytes .../MiniEnergyGun.rsi/impact_laser.png | Bin 0 -> 109 bytes .../MiniEnergyGun.rsi/impact_laser_blue.png | Bin 0 -> 1273 bytes .../MiniEnergyGun.rsi/inhand-left-0.png | Bin 0 -> 300 bytes .../MiniEnergyGun.rsi/inhand-left-1.png | Bin 0 -> 280 bytes .../MiniEnergyGun.rsi/inhand-left-2.png | Bin 0 -> 287 bytes .../MiniEnergyGun.rsi/inhand-left-3.png | Bin 0 -> 293 bytes .../Battery/MiniEnergyGun.rsi/inhand-left.png | Bin 0 -> 869 bytes .../MiniEnergyGun.rsi/inhand-right-0.png | Bin 0 -> 289 bytes .../MiniEnergyGun.rsi/inhand-right-1.png | Bin 0 -> 267 bytes .../MiniEnergyGun.rsi/inhand-right-2.png | Bin 0 -> 278 bytes .../MiniEnergyGun.rsi/inhand-right-3.png | Bin 0 -> 285 bytes .../MiniEnergyGun.rsi/inhand-right.png | Bin 0 -> 898 bytes .../MiniEnergyGun.rsi/mag-unshaded-0.png | Bin 0 -> 130 bytes .../MiniEnergyGun.rsi/mag-unshaded-1.png | Bin 0 -> 113 bytes .../MiniEnergyGun.rsi/mag-unshaded-2.png | Bin 0 -> 117 bytes .../MiniEnergyGun.rsi/mag-unshaded-3.png | Bin 0 -> 115 bytes .../MiniEnergyGun.rsi/mag-unshaded-4.png | Bin 0 -> 115 bytes .../Guns/Battery/MiniEnergyGun.rsi/meta.json | 108 +++++++++++++++ .../Battery/MiniEnergyGun.rsi/omnilaser.png | Bin 0 -> 365 bytes .../Battery/MyltiLaserForHoS.rsi/base.png | Bin 0 -> 1051 bytes .../MyltiLaserForHoS.rsi/equipped-BELT.png | Bin 0 -> 224 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 224 bytes .../Battery/MyltiLaserForHoS.rsi/icon.png | Bin 0 -> 1090 bytes .../MyltiLaserForHoS.rsi/impact_laser.png | Bin 0 -> 709 bytes .../MyltiLaserForHoS.rsi/impact_laser_red.png | Bin 0 -> 1265 bytes .../MyltiLaserForHoS.rsi/inhand-left-0.png | Bin 0 -> 528 bytes .../MyltiLaserForHoS.rsi/inhand-left-1.png | Bin 0 -> 536 bytes .../MyltiLaserForHoS.rsi/inhand-left-2.png | Bin 0 -> 556 bytes .../MyltiLaserForHoS.rsi/inhand-left-3.png | Bin 0 -> 580 bytes .../MyltiLaserForHoS.rsi/inhand-left.png | Bin 0 -> 568 bytes .../MyltiLaserForHoS.rsi/inhand-right-0.png | Bin 0 -> 569 bytes .../MyltiLaserForHoS.rsi/inhand-right-1.png | Bin 0 -> 542 bytes .../MyltiLaserForHoS.rsi/inhand-right-2.png | Bin 0 -> 532 bytes .../MyltiLaserForHoS.rsi/inhand-right-3.png | Bin 0 -> 586 bytes .../MyltiLaserForHoS.rsi/inhand-right.png | Bin 0 -> 579 bytes .../MyltiLaserForHoS.rsi/mag-unshaded-0.png | Bin 0 -> 193 bytes .../MyltiLaserForHoS.rsi/mag-unshaded-1.png | Bin 0 -> 172 bytes .../MyltiLaserForHoS.rsi/mag-unshaded-2.png | Bin 0 -> 200 bytes .../MyltiLaserForHoS.rsi/mag-unshaded-3.png | Bin 0 -> 226 bytes .../MyltiLaserForHoS.rsi/mag-unshaded-4.png | Bin 0 -> 228 bytes .../Battery/MyltiLaserForHoS.rsi/meta.json | 108 +++++++++++++++ .../MyltiLaserForHoS.rsi/omnilaser.png | Bin 0 -> 372 bytes .../Battery/MyltiLaserForHoS.rsi/redtrac.png | Bin 0 -> 225 bytes 57 files changed, 498 insertions(+), 6 deletions(-) create mode 100644 Resources/Audio/Weapons/HoSLaser.ogg create mode 100644 Resources/Audio/Weapons/MiniEnergyGun.ogg create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/BlueTrac.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser_blue.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/omnilaser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/impact_laser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/impact_laser_red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/omnilaser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/redtrac.png diff --git a/Resources/Audio/Weapons/HoSLaser.ogg b/Resources/Audio/Weapons/HoSLaser.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fd70cff216686ddbbc796c85b02ea9a1dff50375 GIT binary patch literal 7199 zcmcgQc|4TgyYI*{v<=zGmogaH#*(a!kubtEmKYJnk~IuTR5TPuh#_f+GHNg(4e1+c znXxw62}zqJm6X!TJ)`^m-Q{yX_jCWc=X2gO&v~D7p7ZR_dB-_8*aZ@R{=G#?X{qx; zWQTY?ObK@MNQ{37ng0T|&7J=PK}scmewi?5{?30j{!SQ}oiDvow289%pBiV~A2J&O zcAwwTAR}X)T?RU6Jv~A2LK!@Pk)$I5fiV^UNdic;9{X-zMeiB zCiI8WHmtQf48lN=EEb_D#3E&zc1WpY$z3VKcA?t0VtZAts#>R;a*f($Nw&=anb^*h z-ds0`zoA0$06xZEdxlQFDtn+OdR7@gZJ_{DR5!vm zdI|wkLU6Fo?o5SUCc`5;D5O;F_!W)fE1K0eL%MEib>E!7qqDZ%4ubIeB{@-&B5V5s zAPDZOk$H7j_G^zkhG(fr>X{k=C>er)8Sxuz>m?l*RiAt^fAaai_dmxfLlAUYBS3cD zKPG^y$je!m5F`$YNn;hot+!%%)=UOv3YCT=^}Ezq!BvtLES4t|7yg(40YQF}yV6tI zRpBbB{*vl@qAQgF^hVXAD`8d@{)~da-livZH-jB(ssJ*!DW@W^U=0{h6*Ph!s$>fcC{SnOdsxz-9r%0hEx|6|y` zrUoD|LRc;!7ciJAxkfYw&{O;)7C`btNzsO&Y8#_!o2S~Dr)8gS-rd0Oj)Qv~rQC+x zB1XPO9QqpZd?@hw*TC_iK<~o9XY2^?VQ=q|xc}PML{AoklCxg}t%GitU12A-W}I9Y zgn*K-?#g^+2keoJ^vqKWDGW|1yp~XWJws`22`~)M8feK^*372rSy&lTdW~=Fs;bON zW>r;aab?K=-UZ54sv!u(($@B9McZh__GrFTYZ_Kw#}8iX{fag*TJ3p;4nW3%Jx`Vn z?%x^bavh`vmX(0<#GySP zLvfY42vP@H4M~wex2pyaw$0FKPB=A2g*&mQBDDxdJx_MRsU!0V#P!U;JX{#E5|~s# z5j0VhaXK4P~%poGNx|!oarW!4GnBYoi!=@+} zV>r~2H8f@)qFpiUAEM12_J54x(hX3ov_k(KOwOo(w-LLD3`j|mo}jp;VKvR|bc!Bp zh)(P_;S?qI)Xx-=H|LRQfK(iT=)f8(CRQ8e_Y*@{+*~4+e>fE#Odx78IUdAJG^dD6 z)gI|3-T-H~P)*v2l)U<{KE!H1sZ16irMI)a)C|{LIDA}(^~Hy*gB_lr9@d^24Bf2B zEhY2rk4{h!tT*(~cNUz{#1AI2E6L=r-1ByH8LTwo-y;RpCqC)Hjq$ru_Z^dLi(;0tP)_ovg zE?c@hQ5QF(OsisxTnxkOj{s7f*)pmw1o^hXAmz4Hef;5$Oi0-YO1A1SVaTT9Q1J3p z8dd}4mSx{jM9D*|GiU@N9LWY&yGSDFw^yV}5H*pvByb^2T0c>P!7e0bq1e*aC}tXg zxPx)4kXVIgyOSOj(Rxf!Ul6ZA>jhJ0;Cuf!^A9h)+?LICIUp|pg)WKRnaTbf*~D7 zt)B)SZZtAUax{^GAiXIN_r6#;4Z{E=gaEZm_Mt2ZAMNc=e98dy6N z*$Io&4&+(cG1+(=j>VD2*)!SF>mf)Z3Y4xoD;NLhvpR&>Mo&@b zHAv)ugCa6dE=`tS%Qq0R_@zA)lzSi>9|1}YKmcdV1LZyyft%&?hhoG6L^+LMI-?Bu zLzMt_Q4AWW$YT6l6)yRd?yGveH@5)7C;=DWfaTeTu>5*V;Mzl@dR#>s&7TUQf8MK7nd9Gf4reET-@*hTQonlx-jPAT#NUTO@7ngB ze=NH9^uL6F^OeVwW5|+wOlGnOS!kfaOf(lCgG?{nqc^LS#ml=XaL zrmlk^F)Iy*Kd=Q7Tr5x}`M^@=DFoach*z8_NFX@)+OU;Izyfmt!~HXu{sVQHpcwgl z#2%hKitm6Z2H(K{tosN0*X8DaQHTI^TR{<0mI$Z&A?IqM3~#Ub1Gw0gNs_a1a1cX*v&T*d$`H-$Pt$>`oQ@R_SZqt%VqALrMe3%AKbI{8^brQ- z;vsSIz8*J^gT4WW!=qx4B_#ve{04`TAV_r^X3ri&vXr!ptem`p;#Q@ovuDyczA6fhh=KMy|Zlr~)i;GKqba-HRSX4+*ScE@0A}A=(-!C92 z#Gm9JaLCIqz}0Rk&y1t4R=FuktTgPz=^p1MOtIwSij@!*5 z>^@E1F8L~KA8N`}a^~BKA48Mk;U+@;CmK$;i{(p(4$^i;wr;}evIL%(|5CH835ANZ zMYOi#Puh(IC0}-qDu=aMCX4Sjd-pm#5zB6jbZ#o%OKI`8!i)WOx)b+1q4n;}sT54H zY}wS6brjC;^a!=wm*&g1NkQG8wI7_S|HUC3ZRtc9Y>w59(TyG30^xaBsCV@D66M6_ zs6$({&J-3td69bWtjg*858gbww&XC)X51j;`_&m3)jl`M?sq019S~l6RfD)D4vPGL%$yO7tXdW&0c zh|WpABgQ2Ow{wonoa%qwY*nkfI`HOhi*{92CGE(#`$)GEO!H_`op@PJzOiZ2j;3Tk zQ_RB^svz_}{O^~HoK5ouyMN4coNb5B#0;j-ZW;NxSldI*Y}y=2)CtNIiIEZAc>0d~ zfxYicUu@HDjP&YUJvedJP+%xMAz5`vabC zXQLe&SGNmQ)IH%KK6&>}4(w>Y>~}(hE8k*9T`yBVnPitz$lXEn)w|?PnQj#)q2d@b zTZ?{A!)|8i`O98U&F(IY$WSkEfFR47?OUKCt4X(U%+OJLUDVN4i{(T$(}Pat4PU)> zJjigQzq@SfChgf`yw01m%hd11%wqQ7M5)m=CHJy#8C}QUSA>(32UU)2Zdy10T0()m zs(+yCvi`Z0G18r+`_78TO2j@Wqb}4$XgkP5C-0Js@B$(o@3k=K`{rA2|K>St?H<^? z{4jsYH^0fm>G96u((Yb&sS$e_Ek_N*<`BnA!t_|1ku2n2khIJFy8eTEn)f$fd z>+Mg{%lhqXtN!3?lN6h|sPQo0>e{U8oQ8VhWZc%I zt6I zu2r1}VbaT@hgwg)zxBEGve)pU-jQGEgOMlid1a(j-AecY?aofP)Z00zR(d!zxYwyx z7W49o4v{&y!E$w*!{&`pa(b1|u{6#;D$`}LIc8+=FC}7~>!+sMP7PJdduBdBE9=Q8 zlI?FO$KRT&-B^I*8DYNGc8)iBuHJpRX(2{6c4GeBGuA<=5v<$>R9&&{*SY!xXGro; ze~$vTEUfDC=bL%^&Brc%>3FvHg3;OXSEVxGTM+8lwIj=e?hAd{0+Wy7qg^Q`BGrt@GuZnOMomW-iNoHp^SLV=c=CxjuSL`J{Em75$< zNuN;sFy3btlRmas-DMbgq&Cv6;p)K${%E7?V?C_jCCmAL=~54w%?jKY`89dN^Yf6^ z%cF6k`ti!!pp#+iPeAxG>XG0pf!HCnr*gd(?|${re`x)Yu-G8o)@3Y9U_Ci~epIw^ERcEcp|6uo+1Uqv zW!SIB;gP6$68 z=OD*Igt@Z|e!(&NzE{5B0+?=&c;4CJp$2ptqWJ3Blp{G)QC15#zDHat$(5xiv>TOw zFZK)cgq>vFy}RL%sN{N4Xwq!{hgSI)m}%*W7L-8p@tOMJq$JjGg2JWI!$WZ+RE5wL zCtpkC0gOvSy3L#YHS;}pRR2cC72oV`8F@L9LFU11d5t=Ef92(-_(=^$KD)008y?#E zdgnyzQ$6zm%bWO%!NrPGE~ztp4KV1WLzqPdzMgV}H(7X9C^@vRv9j&+NxvCPb7I>< zr-}a3>+0s-4a>Op->;r+401>f?BYaUxrH9>k$2KawZs42syo^KXfJGHW0UyPhXb9F z7t*sCZY+_>Ex|`_b~)@y(%if}U@N-fprCKpAKbh2R(pJNUSm5F=6LGf?WKj-evFYu zMzlj|s-SZW4wk0mW3^hzq#w-JKs7yLxE*d9szQa*$#a)HZ7|p0zJZBuzlt7Ld0|?r zE>rW#`t%XWCll2TdtbANLC20q2&}AExO=8y4qGOpD3}#LBe(2%f zH}5DI7WT1}sz&w{xluQx(#v6x(p@4s!$3z>{%DJ>pHOmUNuAusm?s0@kN@n*e}=#P zV8ZS7drOf6U6PiZp0joo2U)T{x0QVU^|d1}lcn&cMnPTLGcC98%709ISIQ04K2M5b zlp@j`6tge(N5om2^S1O@IgW$L_Q~{?$B#8m3s2Q=;b9iP9pX8-5Kn zKhzfDbHQavGk*7$0orEi=@T<=O_ulLxcz(l)4%4Mb&&;bug+e*4zJPoJ!>altn{9- z%97YQnolz^hEB@kQZA_e2u<7clx-{kH8zZ?!Y)%BA{JV@Dd*!Q9mJV60v2=E?*xjs z`bc%ZZPHWE8k9D%TzBxrVuRc2><`t%9Sg(Kg2Bv~2mS#b2Jz246%q}$Ug`Wjrw)z2 z`>k^nQhFQhQ63eSoE`jR1Sg^F=3!9wbJqD?Ne=i^C?4s@3XD7OC9U~k)bCzvpRP0y zi$~gxl{qS($+0=>YQEG@9PgVRc8%}WlD;-tJj|lxhxBzlv)eHCUUN%`rvv_SY0$|8 zxz?xAio5bfV@>~_{OT!Cc9=aaIr{ti$B)ptk*J9!siWIh3$k6z2}ge47q+U}k^HIF zU2FQGN)J_{qRV^kTieXz4MN_h{9_qW<3Dyj+fl15;ukz4<0;Uy$4ns{Q=mzjLQf`y zDD4Umxai$pdH}+^Dv2VrTUH-`-G6nm`RLXR54zbF0ow;(oOhE)-Ry5tbS6zB#?7#nN)~Zp$ScJzGngUpg->77k4QP=tv0ier!H<~Y7}KV$#!bD$dOprQHX#Sr(G zSuzqCEr~mzjw}we`1{r4FL;-Mu$_)tQEwneAMg0>USRrqqG*6mGw_wyo`P*>Lc{gWXdOj_Oal;!gR8T4-;ji`@jU#VAfa( z*~}=4EWW8YfBxs(#mzrCMR$VO($d<^-<5S+tCB^2oIaCvt5DfLnoG^0+%eiYyc2V@ z_{11~h5aOFh7-JTQ_vHu17*TwOH)gA4_F(lHDj)>KdUosk1_fE0>mIs2%`PtKg_>Q zVGqS*^>O#zD_lC9(FMx`~k`yh`^>>q1N8+F;b&1XLD&VDY;^Cl0n(n8gBUYYHE|Df95ctp2t zY>~bc>eKt}$F``xB}3To@*uPl@9BVq8BC47O?G(@I9vOyJ^#^Mo}JHP^EuN4Zr)Ns z_Di`Dn!T50GRzxqyE`)cuz3){URao~I{NDhh`F}eA literal 0 HcmV?d00001 diff --git a/Resources/Audio/Weapons/MiniEnergyGun.ogg b/Resources/Audio/Weapons/MiniEnergyGun.ogg new file mode 100644 index 0000000000000000000000000000000000000000..778b6426d5711ac384f095757aae78ea3bf1c0b3 GIT binary patch literal 11005 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 literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 040efebe7a0..b0cad42f412 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -77,3 +77,13 @@ cost: 1000 category: cargoproduct-category-name-security group: market + +- type: cargoProduct + id: SecurityMiniEnergyGun + icon: + sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + state: base + product: CrateSecurityMiniEnergyGun + cost: 2500 + category: cargoproduct-category-name-security + group: market \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index 38597adb1ee..085c9ffaa95 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -114,3 +114,14 @@ amount: 4 # Cosmetic Crates + +- type: entity + id: CrateSecurityMiniEnergyGun + parent: CrateSecgear + name: Ящик с миниатюрными энергетическими пистолетами + description: Этот ящик содержит в себе два миниатюрных энергетических пистолетов. Для открытия требуется доступ службы безопасности. + components: + - type: StorageFill + contents: + - id: WeaponMiniEnergyGun + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml new file mode 100644 index 00000000000..a89fc4e81b4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml @@ -0,0 +1,129 @@ +# Сам прототип оружия +- type: entity + name: Миниатюрный энергетический пистолет + parent: BaseWeaponBatterySmall + id: WeaponMiniEnergyGun + description: Небольшой энергетический пистолет со встроенным фонариком. У него есть две настройки; отключить и убить. Обычно выдается офицерам службы безопасности как табельное оружие. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + fireRate: 1.5 + projectileSpeed: 75 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/MiniEnergyGun.ogg + - type: Item + sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + size: Small + - type: ProjectileBatteryAmmoProvider + proto: LaserBulletForMEG + fireCost: 200 + - type: BatteryWeaponFireModes + fireModes: + - proto: LaserBulletForMEG + fireCost: 200 + - proto: LaserBulletStan + fireCost: 100 + - type: Battery + maxCharge: 1200 + startingCharge: 1200 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 250 + - type: Sharp + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + radius: 4 + netsync: false + +# продект лазера +- type: entity + name: Режим лазера + id: LaserBulletForMEG + parent: EmitterBolt + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + layers: + - state: BlueTrac + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectLaserForMEG + damage: + types: + Heat: 20 + +# эффект от лазера +- type: entity + id: BulletImpactEffectLaserForMEG + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.3 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + state: impact_laser + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + +# проджект станера(написан на основе проджекта лазера, ибо другие ломали фонарик) +- type: entity + name: Режим станнера + id: LaserBulletStan + parent: EmitterBolt + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + layers: + - state: omnilaser + shader: unshaded + - type: StaminaDamageOnCollide + damage: 25 + - type: Projectile + impactEffect: BulletImpactEffectLaserStan + damage: + types: + Heat: 4.2 + +# эффект от станера +- type: entity + id: BulletImpactEffectLaserStan + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.3 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + state: impact_laser_blue + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml new file mode 100644 index 00000000000..4995f5eb80b --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml @@ -0,0 +1,129 @@ +# сам лазер +- type: entity + name: Х-2 Двухфазовый энергетический лазерный пистолет + parent: BaseWeaponBatterySmall + id: WeaponX-2Dual-phaseEnergyLaserGun + description: Этот передовой и дорогой лазерный пистолет главы службы безопасности космической станции был изготовлен на заказ. Он сочетает в себе мощь и функциональность. Пистолет имеет два режима стрельбы - лазерный, который наносит урон ожогами на расстоянии, и станер, предназначенный для обезвреживания и задержания противников. Это оружие символизирует власть и ответственность главы службы безопасности. Однако оно не перезаряжается автоматически + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + fireRate: 2 + projectileSpeed: 100 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/HoSLaser.ogg + - type: Item + sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + size: Small + - type: ProjectileBatteryAmmoProvider + proto: LaserBulletForHoS + fireCost: 200 + - type: BatteryWeaponFireModes + fireModes: + - proto: LaserBulletForHoS + fireCost: 200 + - proto: stanerBullet + fireCost: 175 + - type: Battery + maxCharge: 2800 + startingCharge: 2800 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 1000 + +# проджект лазера +- type: entity + name: Режим лазера + id: LaserBulletForHoS + parent: EmitterBolt + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + layers: + - state: redtrac + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectLaserForHoS + damage: + types: + Heat: 17 + +# проджект станера +- type: entity + name: Режим станера + id: stanerBullet + parent: BulletDisabler + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + layers: + - state: omnilaser + shader: unshaded + - type: StaminaDamageOnCollide + damage: 30 + - type: Projectile + impactEffect: BulletImpactEffectDisablerRed + damage: + types: + Heat: 5 + soundHit: + collection: WeakHit + forceSound: true + +# эффект от станера +- type: entity + id: BulletImpactEffectDisablerRed + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + state: impact_laser_red + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + +# эффект от лазера +- type: entity + id: BulletImpactEffectLaserForHoS + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + state: impact_laser + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + + + + + diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index e1c2dffa2fe..0cc3dc4e833 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -46,8 +46,7 @@ id: HoSPDA gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity - pocket1: WeaponPistolMk58 + pocket1: WeaponX-2Dual-phaseEnergyLaserGun storage: back: - Flash - - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 8a59c63234f..41a497dfb5b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -27,8 +27,7 @@ equipment: eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity - pocket1: WeaponPistolMk58 + pocket1: WeaponMiniEnergyGun storage: back: - Flash - - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 83c7c83a03b..6009ff3370f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -30,8 +30,7 @@ eyes: ClothingEyesGlassesSecurity id: WardenPDA ears: ClothingHeadsetSecurity - pocket1: WeaponPistolMk58 + pocket1: WeaponMiniEnergyGun storage: back: - Flash - - MagazinePistol diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/BlueTrac.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/BlueTrac.png new file mode 100644 index 0000000000000000000000000000000000000000..23663c5f83d12623409a8825af194f143c0f3d9d GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArY-_ zuWjT!pdiqixRE1;`*cX;sY7d$ON%3{9KLN7I}#FkpuB+Nz5IiBk5?7OiAboL`u7ffYM}%J2iK(AWDm_e^8QeLx jF?@a(v}|kR+xzSR?ngTe~DWM4fMF>UB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..90d6690924f236883bce196efa46e0521a7373b4 GIT binary patch literal 380 zcmV-?0fYXDP)Px$Hc3Q5R9J=Wl&@~XFc62oOe3L%hfN|m8VN3}_9%O#@qoQYa9BV|RCv&|&;y;N zBy}=p>ZDEbN9^S6``sVgkjZ2+{|#%cx7PYSdqiY){d215^!so)AR_*BI??w%P1DRq z=iF>9fU5p10Bfypnue;X063q|^nDM&<#LIRK{)Jd+ZGY=s#+}l-~Cu3BHkFoFbn|H zbq#=XZkFkkkaZZxaReY1KvE0FailEEnKNU|s(380m^dUWCTP-f_-UQ69;%o z4M0_k*x@q9psK~v{`OTd{dnE5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..3623165a12b4e1b920ff433298c56490e24d95e4 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|T0C7GLn`LH zy|t0o$&iQDq5g(KCo&2ZE;4RdWLw-r9DBXZtOk2 zTyHb;J^uZ7|owOu_&F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..3623165a12b4e1b920ff433298c56490e24d95e4 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|T0C7GLn`LH zy|t0o$&iQDq5g(KCo&2ZE;4RdWLw-r9DBXZtOk2 zTyHb;J^uZ7|owOu_&F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ca1cee112331c91ab238f679fe71b97ac6fe81bc GIT binary patch literal 386 zcmV-|0e$|7P)Px$JV``BR9J=Wl%a0JFc60SR3l-N;o&2Z9E}7Q?@hW_=^Ly#VDAwe77$_;9yAy! zn+G;eNouE#)JdD9q%lON8#pLaIHE*(krLY(4x~|yo_gByC^>X=|JXNdt zl3Sp)c2jYGtCw$l+9tnttp!P!aE(B6cOyO{sRFUnZ!sDp=?=u+`#nf*!Ec$^^dIo^ gdzC+v$z=WnpACedHFzvCzW@LL07*qoM6N<$g3t`5KmY&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser.png new file mode 100644 index 0000000000000000000000000000000000000000..2975c479be7566a6c59a7aca4e20778aa850feb7 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser_blue.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..617511783a664e32d8ba648125ab2a098311717e GIT binary patch literal 1273 zcmVPx(vq?ljRCt{2nomy~M;OMRwH*f|{;g?OxHz5Jc{gQ~3_LR8$}ze6Dgs zvea9|nS(_I>PP6MQl%bxtd%0;CY(}K8K{xd+D;wek`}v%^$V{DuRY^k2O;Jsjbx9# zGxI#}?99&W02+-(qtV<*){^PeS~8t-Q-H$2W`^$+q2@lWBBRn?`z&3-M;8iamj0T1Q;4mEb zk@#OKcH$_-pjcu>e}erfbw4Mq6>=RX-ag%RwlhkQ`uDUbZ4SmDa}+4-c4s;AXB=G zJoSW337F2lz)a=f9iJBcl~S?WR48Qt&Fuj2;D_w1QM~yNu!WO&%IkEE*KiZKcn&=e z^rEK$+&zjcnZOg}J6+o^{5hX`0dQ#o7f-)+y4Hz+bVJS>c|Nj>VgcJAFC)K|NpI2s zHdQ>`If)Ff*xmcU0)S7xe--$BGVbHTdH1I>y44|N05!ya*2s^Xo#thxI4{=&{z|FH z=X4TT4V%_X<>1PruuS9$&lW>G@`G9o0qu{t^u#CL?*my3IW>rL-OJ&A_62VJhRBV^ zi!CvYMx)VaG#ZUYqtV<(`r8m$b=VO3=H{)%)waY|yYI?eY(>2XBfk7<^J_70dn2{3 zT8{krfYr{26slo-0RR(adK#tVoey9UJ&eRZ zCgJskgi&8e7=UdCH^IwZz$4mae9=&O(loFR zsc2g#pRK$^%>vberM^@+eGnGokGb?KLch`dJ78 jdO57oXfzs)<`(lmK&ZlQIh%0>00000NkvXXu0mjfnH6Au literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e9542b52738591e8940efa019791bd156cad3d9e GIT binary patch literal 300 zcmV+{0n`48P)Px#=1D|BR9J=W(;;rdKoAAcze!2y*dU%otwD%sXmXeO3Pn9f&(JFv_ZXEL=mdEs z11l^)z)G~Wq7-CRP|X{#WM?&+nFWk7#u#J%6Gow`R8`h>?TDWdo24vZv)&K@GASq` z5D_#@bG()Fkg@;(D8;!h&}AqH0PkfE56^bjx@-57b|BV;y;IHc+6KJIBfNV4o^_{Z z!DZg%(~=?!R#in+<;Q9~r#p~z1lz#N>+HW~T_7_QRL$`n4r3?ai5;$v<8IS!KZnSI ys!DvmjAtZiCDZoC&O6Ze{d^dPn?J)C^QTTCQDmbf+gLyV0000)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2fab55d74e02a8c8856699917ef44ec356b91002 GIT binary patch literal 280 zcmV+z0q6dSP)Px#(n&-?R9J=W(=86dKoAAsx4;Po1f42q17p+I@x>g?L94^mA=XjEqt2+R-%D^i?RAL^tAjVIy8sUdPx#*-1n}R9J=W(=l?wFc1aMuOuf}Q<(26agoMlYJ320fp0>SQ>5S&u5*kWz)+zX z7jF3}7&9gzP+%xB`?gS{9sQA3fOF0{=iGmyL6Hgl$wvFckoh6J*HLtebFZ|EM=Gw2hlUP7q_n$2*ZR)8(!!y%-Mf zojoDim_EcZ&sDG9MDlhCeolK|X6gRm&&96*CkNx20DtLc lpl#d7uItYJ4CmZkeFKLhWt?}H_TB&h002ovPDHLkV1lMYbGZNj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png new file mode 100644 index 0000000000000000000000000000000000000000..3e991808200f6995436515a6033206f484889300 GIT binary patch literal 293 zcmV+=0owkFP)Px#-$_J4R9J=W(>-p&KoAAsw}hHvhy=W?5|C(o1~><8Tyg-8mC|*Nks>8_gDtsm zo0kHCOvF!tNfFIA#Wp*u+1XjZIp>^n?mtm0NQ$J=G!4ROwDr0yV7XWd0ERY^nZeAE zW!d+&oPL)D0Kn8jC@X~_CIWy}Ss=!!ZN3fX_IKKWwz4V$`Hc4%G1zPn8Ff4BPOpaJ zdrx2HG8-#N5|Pwe5=lLD2EHmCPgnifE2|>p`3`1=(QNkkPW+zsLzs<4Quuh=uPtW> r!+q^uKodCzme9?EHXvtt(Wg_02o20Y8L6_4{3 z7hUvY#~;^BeJ&gh@$dS&$ENC?Pxbo$-k+-{nKCu7xrF_iZj^*&8bTW-UGa|apq7m% zg^z?M3>i@PTIq=fzbMW$_(QP~jm(2x_4H)gIMK#h*2oKw3w!gqveukOeMxVsu(T+3 zSoR1e5rPEpkf6*uIZF7X79_L3eUo+H0!8s?^46(fh$BN*yc439rE5xRTJ)4WIVvjm z-+7wp>8VEd-T-tyTh{w1ICr5|wXE-B%c`A#;|VScEq_sRn)wvH+S0s-;NF7stCp77 zgNtn#deq}aye>Ip+tX=yJA=L$4BSHZY9p)WIj0X0-IQN+1N#RsCimTIKkw6M0s_;1 zP5=M_vq?ljRCt{2*)eY0KoEuDw@Nwz7BDejdRSQ&;D%?=9bBe0OCLZ-a;cJaj-ke# zHY}6{Sg4FAg|Pw+I1bld$`SCsR@@aS4yob?h=_=Yh=_=YC=XRNRkgaVUFzDpu3cO| z#<}%Pa&ER*j*wDH_j%^&H{( zhddqqJ9T|^VZ6>eneR4#K=ez&o?$s&ie->YQ$8xl1EM9ombzk=T z{fmEw>2x}o&1Sy=VCc(|h=_=Yh=_=Yh=_cZZhvo`5<^9uJ{)DOo(#f1lA)vUsZ889n<1%mr>}7Eg6@ v8U0^bJk=N(ee`GNtt_638J&oTh;sS^?@jFq1X`em00000NkvXXu0mjfHgTL2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png new file mode 100644 index 0000000000000000000000000000000000000000..b85d2befe5d32d9c7f8ff85c7c51a84b6f18d500 GIT binary patch literal 289 zcmV++0p9+JP)Px#+et)0R9J=W(=k#4F%$;iKa7pD#m+n^@K2=_Hrv|DUEC{JaR$%f6}I*sQf_D< zEtUQj4B#Mi*}>v{X);NX|GmiroO8}O=l%d$^ nUDsa#(5L=lnS*t}Id?5TASqoL%1Bvb00000NkvXXu0mjfk^pvJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png new file mode 100644 index 0000000000000000000000000000000000000000..79355a87be074ab7ca2762b8d8d9b8cc6c654ab0 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2z= zUb5wDau8sBuzib&%Hmc#t=1!Lw}Sc}$Uaev>$+8aVUx)V)}B7mBl2$)qRyD#&HETv z#%^#-BDv?M_%AcpK#NIULG#Za7pvK=ar%>eu+lhbSCetPx#&`Cr=R9J=W(lKtrKokVfSy~sCekfpECALK4k{S-cE$~g!c)`r3)4%CeN% zLizKm-+>pybY)1Y{#ffZ&-?J7&?%SjrT{+oBH4!z&Di=UO_F4mrs){~4)O5tsl$Z7 c;GFvt-xhIU9{yC0Px#*GWV{R9J=W(=l$sKoAAczbKuhSeir%`L2MK()bMFF1X|X9L;s^;gnt)@C}lm zA_5`;-C9u0+h(;}?4QvN;GA>LId?B~wwk61Bt=qx&vTnxyJ*|?+st5Qc(PXk!18^W zJ;B8Q6)VLUk`jn1{pWQ29%YFtbzZacceNAcg!HevuSDRw600sm`ZjtSLB_QxwIdEXywd j=u>~S%+WgFoV%4D7-(GQAxo%O00000NkvXXu0mjf-_?0} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..442dd8b6b583154b300b091cc2c3d1eccadfeffd GIT binary patch literal 898 zcmV-|1AY97P)dCzme9?EHXvtt(Wg_02o20Y8L6_4{3 z7hUvY#~;^BeJ&gh@$dS&$ENC?Pxbo$-k+-{nKCu7xrF_iZj^*&8bTW-UGa|apq7m% zg^z?M3>i@PTIq=fzbMW$_(QP~jm(2x_4H)gIMK#h*2oKw3w!gqveukOeMxVsu(T+3 zSoR1e5rPEpkf6*uIZF7X79_L3eUo+H0!8s?^46(fh$BN*yc439rE5xRTJ)4WIVvjm z-+7wp>8VEd-T-tyTh{w1ICr5|wXE-B%c`A#;|VScEq_sRn)wvH+S0s-;NF7stCp77 zgNtn#deq}aye>Ip+tX=yJA=L$4BSHZY9p)WIj0X0-IQN+1N#RsCimTIKkw6M0s_;1 zP5=M_&`Cr=RCt{2+A(h1Fcb#hUrsjxG4N_2>eH0iKsx9Qx+|l=MOC#=_xHGd{{aBt zeHC2@dS`MfE(Fn?uOa{j0H1$+$0kk9Id`!BzgB>%+Ua_YO`1Y=0pC3A=y+d6stat= z6sPMop0t%!)xMgUs#=z1CX(3l{BqxM>Z_n#-}3y@L=wxg%-ZAnv(J77gkSz_wStJi zxh=e}BCBurZSFiKeFn7av-)=CeHA&kg^1v6wd!99s%p6TVybH4(0eOH5^ImIeQ&>H z;y9ko=kuQc&~;!OvoP?wu1|KmUGJNLh=_=Yh=_=Yh=``(v7qzK`xi-dXFB|tr^e4? zX#yJ={khMYfFbeo7(#64-1fKYubx%rd2ZoLn@LDIL&vd%V6!W(d+8($-U5T-=VxjM zwyKMRZC*979TGpk#H0h;_EyNU%)Tv`_VMa!)Jcfrcy<*3Q|gPKr*5=Ul<_kW5fL4m YU!mgDj9wJmVgLXD07*qoM6N<$g3=bZi2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..a8169348860fa1dd4e5b636986bf7371782b55c1 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY;~ z2@dzL<#td5qLOJB6GM#` WFVnf|nHPZOFnGH9xvX@9*T;GcY7PVOE{P^8B%s+*P1922WQ% Jmvv4FO#tEz9}EBh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..68ac5ecb3c25f80d92b35ce4a7411edf50ffa9a4 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`kpS1ArY-_ z&nYr8C$W~kV(x+?YCoA>$*3_FS#x^xB9JDS%10BU6L MboFyt=akR{0N3UuLjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..717c4f077e630eaf1593d260b86ba8c4b807702c GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}x}GkMArY-_ z&n*;WP~c(M*mrni?)J6X`}&*{gg$>$W~kV(x+?YCoA>$*3_FS#x^xB9JDS%10BU6L MboFyt=akR{0N3UuLjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json new file mode 100644 index 00000000000..2a134cfd24e --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json @@ -0,0 +1,108 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by anDepresh based on icon taken from tg station at commit https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left-0", + "directions": 1 + }, + { + "name": "inhand-right-0", + "directions": 1 + }, + { + "name": "inhand-left-1", + "directions": 1 + }, + { + "name": "inhand-right-1", + "directions": 1 + }, + { + "name": "inhand-left-2", + "directions": 1 + }, + { + "name": "inhand-right-2", + "directions": 1 + }, + { + "name": "inhand-left-3", + "directions": 1 + }, + { + "name": "inhand-right-3", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "BlueTrac" + }, + { + "name": "impact_laser", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "omnilaser" + }, + { + "name": "impact_laser_blue", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/omnilaser.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/omnilaser.png new file mode 100644 index 0000000000000000000000000000000000000000..2f8e2d3ebcfe778e3de297c6f8acd7595096b680 GIT binary patch literal 365 zcmV-z0h0cSP)Px$CrLy>R9J;$U>F4yfV7NSwX}>{HA>82ro{4JAKrWY{qaN9%*OrQ*)xaU(#-)d z%bEGu?U>kEsrO|~P5asbTd=$7B(;b+Ka<6tP^ zU?Px&)k#D_R9J=Wl}$_|Wf;eQ?+op3XW9{V8ktZ{WOs>GK8%U3*#pFbH-gD}@#w*D z<3v^yE*!XV=jdIp5>5s$YlvCGx+W_SLskgTQdiTVGY%~bFXMsE(9#de%|!mmn|YpR zo_U`C`=9p%Zg7MDJ4CHBFfaf>JRWCvcQ@$i>A|*bzWVyHc=Xw$jtUMBjzo4Ul?n{Q zz;PU0*A>n38weB%h2WZ#xE3xG>1vjw>pH5c0^m3fv$L}R%+1YpWcT#+G;MC%HrZ?z zDJ5H5TL382)6&R)|r z01Aad)7i8`GX+gO$*LIp%Bl?rrS=gUgv+Km9d>l^4OuTsiK1iHJs#opfD z1p&h_xMSVxxas@rt9AbK!3RflRc1yeqlv332@n8cYio;wr%$J_i-GD#l=Mc zPEJmU#bP2+T`MgKq*5uWmr-ygC4HGpEpy?zZghD8OiWC$w6w&*!9ftJqlm`xmE+^+ zduVYNglN$`LZMK=bzS0b409w^f*^=a)K&@r7>0pmSyw9nL1^xZ~Y;SKzzGYeDb2$`MMM;>!%Gw41zJE$42r!lNL)Ce;-Ovy~RaGH` zAQp=ei^Zzn`t8?1h;Z)%3=DmQ@1I7#e{vEv|8!@aZ>qaRRaGISjPj(E(RQrGl>}0T zQBP+3w}zZ=4THf_34kDF3E>u6Htd){D8J`_RatR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..791bdcbd59b34a757360e74d7f9cc6a2eaab2c0b GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_h|ehE&XX zdut=_Ap;SX0QQZXyna)(7Wp2vIy0&D#iivfU7QgOOqwMgQ;vuoyj0CR=g-pDHHtu; z3gTe~DWM4fv@257 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..791bdcbd59b34a757360e74d7f9cc6a2eaab2c0b GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_h|ehE&XX zdut=_Ap;SX0QQZXyna)(7Wp2vIy0&D#iivfU7QgOOqwMgQ;vuoyj0CR=g-pDHHtu; z3gTe~DWM4fv@257 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c569b6932270a16f5294f744562a8584362829c8 GIT binary patch literal 1090 zcmV-I1ikx-P)Px&{7FPXR9J=WmCsKbM-<0D&Sks!DAt4oE%pN+o*fv4<)* zPAIL^zo4hydhETuRh2kZEjJY*;qagT2cdY#_Hvg#k!&|7UDr_*1pv?Uxa<1>Oq(V@zjy(_tYPqd+nzHF zzG>Uv8U_Oc16`B5u1l#@B8nn5Ha1!W=I7^GUth=feX7-J$A*|h_UcuRwzmN&NXawN zIz$mDw|&!g6h&PL=(lSeC`0 zbM3-O-(Okom_Hi7nXEq=znT1|*J{-#L{UT#1Xz|OVudqt5dHVNe6sd{#}Aiy{BY?^ z0&(!O)=!eW^4f4>Ynmnj8HV9;75wwg2mH470Dx=ne#m~KL9<@zN#c%eQ>xVf*l#qB zgXi-JnKX$^xR==RWw&j+r9c!#H0u?1hKDH@i!|#Mg4zzA=izxCd#;P7X~~G!m$NPY zg@R3?V58;p9c0pqOtrsxTLDoh6oe3h%-r0Z2!bF98jm0dn3$M2)x9d^R*x1-$a&nSJqakax8h4&Q=a~?cX*HC)Po3ODeM_2Dtl#;FX|7S?wVe5v``xA_e zjIg=6namx>p;9iBQ4}(HTi$!H3P2bhQIrxp(`u^T)6G)}0Te|MLI`rX9JySsy*E7j z4#bFSA7E_aBf{_~nTLmmN%Bv(R`{V^EsCOu^s^jAQBsa+oJ+v8tWGkUf1dLB(Xtq? z*8z~GBZOb=nef5{V);+L-@P#S`4{4s#d`o8ULf%$F7cnizjDjZTXkp?(*OVf07*qo IM6N<$g7+#9Qvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/impact_laser.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/impact_laser.png new file mode 100644 index 0000000000000000000000000000000000000000..e4ab1281fa0d3e96fadbee30aea06745f5f49082 GIT binary patch literal 709 zcmV;$0y_PPP)Px%e@R3^RCt{2n$K(EP!Pwz#!U|^E=s^Q@!+At2CRCphehnU|A~K8{u9qG;z18p z7ZmEjgFh;Wr6MdFeD)AWBg+=vi@IcYJ`i{&Wb)?wCNmE+0K+g0!!QiPgpPW)GN@-O zgCI5{r<%+qA*Z#iNCAL|X!D2X?_X7HDGSg^=SMUyjJp|CJF@tlFAp0D0BGEnUja2C zlmsB>^^I%LIX9{=&MibeTN%)*mxql6s#WiT<0y-u$xfn^&X4qsYv>!-uxI_4J?qB+ zPYi!loQu?IezkYL-S&=Z73E;J6F|fJ_AZGaDhgrn(^t zC8yX5GYrEp48t%C!!QiPFbuY#2w37QtOef1r2;p~L-?+y0>gDPse*Mdh>I)J=Mg*n)0AX55VOq&z zs}?V|YH`35;}ZP=BBGi8{)FUusRN!EB#cZ>_@p|KVyhOXPva!QB4&JePf&VRt|@lo zeSZP~yWNffKsTM2{y=-O{(z_Z$JHcZEd$vL@O;(&1my^Lx_?|19Vbp>RXeKmZ|t@0 zI7j^ngiH>Q7N9WhW;(z~m{!v7xHg?!Wc9VJn7UCN`o=ZPx(t4TybRCt{2n%_%fM-<1uxtpZ0iN$C(m~A25rVl~32u6wog{2QsDD5BMYeA^~ z0Sf!PpnrfBF7!43fG?V-g>{20MvxW>v{^}MtJoN&iEWMbrVsJ#o{YK4%*}NdaXv7R z%)NJJ&iBlnA9oI*(P%Up&8=ilrUc90mdZBY_{H^Tp4{gHUR?)C4hRIXaDXn1-rJH!8HhtnBAO$2EH zs1c&!!SmWA0MtGRz5v`8K{TEl9j=u}0iYZV?@*qq2!=`{$oSxSZITk*L%->sUI!BCyLN3qKN6e>B2|KK%Eue${fNUjd-iyNSa>0LdhfOo9vH7E99$6MW#iU;lg9 zXjqZYj()lS#`vrHNrcD0{{(SNC=J9yoqD2@0N0=f04NM4&Uz~AJ>gh@!cgK2rU{tl zHREYY?1jbkRg% z0GitYVC&QIjf;D}W1uMl8Bclbo^hKN5t#A(9$F7{qpJX1J@PDxz!T-$J?j*{&Zk}g zFcFyXbgkX9c6enQQuq4z`N%FB3p53C)ANh#%bPTSWrx$5^j>zR91QQ!AeW1$0JIv; zyFZoDsSYUts3CQ)f4|}#*q52&+}sbuDy0)Xr<0L(OW|0hbP}tSq{?<}GsHcAQ=1{6 zb%{$WKJk6OkJf)tztCpbYgeE#{$Qvg_bGXD%v7ePvZPC*Ks zn-+nLC!pXE8;I@>GKpR1iIHd5kC}$|GUgy&iTb#|I>T&3{8iThWIh zEBY|>$otP%l&2D$;Dq_-D^JO2-{r;N$EUwV?^&0RDbKEV*df&exJSR(f0ZV~N47Wm zMz%NlfTkE+1UGvD_o(GDqC7q!bavtcnqqJfWP5@1(HPL`-I48$J~|pF5sm|cC_ad* z6sg3O_W`i@1OSPAJ^%nee)RdV{nPDH65twF4M0AR-La{vaqvgi!$?jQ-_ zlP?xiGPENu&#vD3>c6k-r0VmQXUpmuIw0VLz|tuyo=Wzy$NN_tZx?FW_~*A`McoqH z7JI`TZkv~WRRv0Vt-Np9P*tPBP!JL?#K3VV;t4~s>5?fzmJKY4Hl<-@+dS93WM(|@ zS=rLgwwU2Tp~Vrqq@2936YZ8?dRsO(^8K|e)56nw-{h}-u#jP5=<|=4Ip4pgM$owX zqG-#;ocAm{cIG|)_Do1w^7_7g8~e_=razmzyL$Jf-ESEgy!x7ZbLDSFzWprx_-mA; zLt1X>*SGP~oe2gKPj;=3TI+SPvVKc_dHULOlh!sjzC85V?ElBe*=L0X;ULiP{!XFz z6RKGgr~a_n^ep!+&sNd1tWOMY?&<9QuC+a$Q<(cj>uE{8Oe+CpIy^`($BlP#ONMI?jz*2q-Cac3R5LhTokr z4V-y5k6Kt?a6VbMtcYXRnl=?eb6b;{Gp&Q~j1dK2x0eu4^%4rH@&Da&pX!JUxZ}H9r-4mfp@)XLdfnxAX2#1|=wPcX2t-So_-Uo{PO~#wFiS zmoHal{QoX+tI*%oW$o5h{)K1E-=8ZmsoTZrYL>D#RPd)c|AP5^A`Eul?KK!w?uLAo zXf;z&T6O%wlG*F7p32&t5+nX*IrH4J&wdpCyvpEU{qCjT-oB&rqjlbi&+t)`zW%1f zN-BqyV_W&h-|zC)`iZpuC@OojCH*-&gUZXV3wa8}~Y+v6v)Vr#66@2#KCeBzDU#miG`1CG|%o!=TK(H3QVe*L|3Y4?7u z`KiUT#(ZA+=lcDxi$A*{K*-tbXH4e;bDsUs+B9*;`LwMgLX zHO4+E-hAV_?6q>HQW@L$1Y8&PtFF?V&3!`oG#}8n?TbJD-u2I6Ym9@Oek%K^BCCp= zj$>Ez%tg=#&m6}PUenp-7%_+rH7m;>vl#x!sr3~NX&OX!+qm~GjzX;06*)6bYb r70i|WFo|CSsIB=XBQPG)Px${z*hZRCt{2+ObaCP!tB>|3)rqP|jo%F_a?JiUh9AVnx|JGh{&`uh1or;x}O9 zJ(#+osuB_^3{i{NP(maoQc;W3Au=VEnmW$CK-K@7JlN-+dwsX_14KkbL_|bHM3#t% zo&fsXeLRa!x~p-Ls)*>3G5_x&gi%{XL=P(*LX~e`oNllGa1*jDE4`sC%Tz@E%>(G9 zy9xjwI%#E+sOnw`zhYM9U;HV zbubv1dEd5LE%jDB?Ch`Mb}|6~931~JVbpeVBjz?!Rh*={`7Xxgw^LkQp5b1ny*JmJ zIRA1!cg^kh+d8}&0sv~pV0|+}QS0>cN9+AMIe@}i5Ip>~dsU3b<5KJSzOOa&>($Zq zwX;5Jt_lOQjhEg0@9(zU3BD(C% z(E4O32z)d*wy@V|IGgbw8l!uS2AUgN2m;^563eNY3n-(=4#Y{S-CqA?U4LM?TtFFr z$_`Xzb?_KQZT)&S%>{%}TUYCKbJbix8Md}M{P)Px$@<~KNRCt{2+ObM2K@D60NnI z0P@*=e2RLuC2^98)>;mg`o4z{MyY76<)FYJ6nSUrG@7l~o3J;=hW3;at@YPDfO@ti z0I*a4Apj63nH-L}A@kRXlWeG#scn;IyC49BQ7ZdKzZ3vG^m^Fc*u>)RTlD|*rQL3; zQSa7jHSuOV?9R^Pq1OWd>>oX^_{6(^Z2uf({%I>pWPIi6(Ddv&3Ti?fT7 zYp$)YN#~{m04OPih2;pQ*6Hz2>-{=80AoG~UccIt2)f;FuJwH1my&vW^!Dz~S)V0W zg@NJ5^KSm{XI*Zdh=_=Yh=_=Yh=_rLEyVsVlqW@0eP70K%8XKXtt*7`U8{Y0`mA*cAzM$gU2vR zta%0%;oe%8Qx0$d0000=G`P)Px$^GQTORCt{2+ObaCP!tB>|3)rqP|jo%u^^;ck-(KF%gW}NAqzuZfhCV}pMW=E zU}CGPN=T?ML@i=NA(1+j3Pqd_$R#Ea#jXQ(`+t*j<;3UQIPvfwfQX2Qh=_=YXvQg^ zBBF0y$D24dMny!!DA8`R_kV4IwN^z${UEM=^VZsY^{35;QKG&6pw`U;fQV?WO%M^) zLueQ!3IGS)cM1S?xD(PE)0)F5Q9WGzKW1iMbUGb%)*LwRH}LcJ7T?Z48vyWwSUu0h zr;{V|{Kr&7H`&wic#^4mz1hU{*A1q3Qw)d0x%x8;yB~LTbUgw9G>pOKc7W{YIW znLOJ^Xx9Q{dI|!phAm_(7~9qQ}Opyr^_m z!4KlnuQitpEz9#VB(*_SOzO&t27Jis|(S8b*oc&fu3+=~;zL z27kGl-=~PEUe3=dl&Mf?=m)Xp$>57vG^>yvm%%CWruAkMz5YPc4F1PV247lXYYrY} z6-HPx$*hxe|RCt{2+P_Z1U=#)LQ&NqPd=qLMj3hP;)YPSE*y_r_$}70=D18GS$Bh^h z6C(~p6E_2rI2bY7a2-gsfFP~>Y4!Xj_)^k)ZyT0#0U{zIA|fIpqL52Klv1+pI@ZGT zJW)!CWxG;#EB|WkC`K}qJllbNXhUrM7d9DG#OTUj} zxY$4F!hiFn-EM2+*N+^Oj!M#b=l}pRnufiCiNc|U`@1V#U7St)IEgIVm7wN_`xXW= ze0IBgySTZ&nLPji$mjEt(Y}tmkB_NneB93V_UBtW5J9ik`?inF_(Ax>v^Ecn);_Iy zA|fIpA|fIpA|fK1k5Wo5ft5vOiQ82$Oh+OouQ7$=`eom1Ze_P3s~AF}cNMC&x>&Zm zv>_yVS0PFUAJ?>9g++=L8XBe}x2<6YZLah_ gm0blQBBF%)0FuY?fbqBxn*aa+07*qoM6N<$f_DS^ZU6uP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png new file mode 100644 index 0000000000000000000000000000000000000000..a2c4b5ae1cba2d93c2743197f74558da652975db GIT binary patch literal 532 zcmV+v0_**WP)Px$&PhZ;RCt{2+PzA{U=#-6_baj3!kOBNn_%hCNTyJ_eRGGdy#<$EO0K{=ad2`I z5eh{eih`T;2b@%-cpM~}`cssX5; zV^l=c^Q|^*>wgU)2m%!mt-6iOHy;E+y!ylDJ>P1()6I1A03ae7YX~BudI0r&s{pXy z+)x0>!jllz7}o6hR`p>1|CoussMTuf82`fJjm zXa77Ca?jxc?iVlWtds( WHuV5LOW}Px%1W80eRCt{2+ObaCP!tB>|3)rqQ0`)Dl%+1ej!o`{Huh=_=Yh=_=Y($QMW5%6r0S?OjKY{wU^we+*b&pGrH zaedL>y^sv0WmzVgYa7^YG_qT6Er-9`h=wGCL7`Baz5r`_p_>jjcIgHNf{vkF-< z_`DvPRVY%f(9m{#IXjtV@V4X2a=nh|#|Y6)g!?l1JmOgePx${YgYYRCt{2+ObaCP!tB>|3)q%D0i}n7(ht1B7rL}wJat)Gh|`ND|E@kOYjhE zd5=upP*n*D6^5vl*iax6Q&N?P!w@bw34z#kz;6F)_pakzw3QOAwfI3KJJH_%wF#|<=3Or=eDf`(lGT40d-C;0v(U{0fYw?LlWc<4 zTG~p9A4CEGUv@qS02JX(Fg2Q*{U8$aQ=WB?75`AH)x=t|aIn0J{$KzAI6A&nt{3LM zdBgQWIXeEP0H8k@;NbHv)_-4N_-81cPDf2%KXzjK)3$Uky8wWaQdrycu=&x)#jjJG ze*Zdka~}CYB&O!ei!i>sf^)8GKr^ zW)-rODl~MxP=20`GI-YuWu;ukaFoI0xePuHGpk@d%qqm!Gsju5UcY48O1X@BqbVkX zzlmk=nH9EVVKl4IMMn3MT*n literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..a495b6f8f4f111955c9aaa9514b6f2879f324bf4 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})t)YnArY;~ z2@Bn%Eo6dwHZf2ZY4$$#%^k6XO9{3~;SCAr|u?-M`1{*M23lZREO z;94~sTi;fB$&V{!=QXI=`6VYLBur@8z`0ai?9Zhq%&(1}{@0KDpLC+;%hZRjzwhVi nE^v9D!2!0x?VyH40RzKIU(Hw(FI%817#KWV{an^LB{Ts5%UVdX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3bec9307f06f42fcf9e3e3de7d2acabc5eec5f9f GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}X`U{QArY-_ zuWaOOFc4^c_+O>fI3h*#;K7)qm2ZrkrwO=ra7VgTe~DWM4fUK zC*MN>hRu;@(k`yrKWpjxcSf%5LEHB9r{y#Bz5F&o>gwyA*LKV=v|JZs|D(tqI{kvl?CP*xBFk!ZT8ZY^jbHUvMk&jq%l-yn?r={8N ZX5Ma~c5g{cKn2j944$rjF6*2UngCgFT*3eV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2d69b6e792c6994a18a9644642e5b0fd63c863 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^E_P~Ln2z= zUNPi4|*7}$)6pI?%RGgIlDURjQ3{4_1*J~^zS@AxHaq4 zbKUE)kGS-+1H`-A1nzzOFCib1o4C39+2w!k+%o5HxGrL^T3|Li<=S<%+gcyh^#zPx$E=fc|R9J=W*S|``P!tC6FSlwOj4qc(Fr`{tN(Cw6lEuB7W1b^(CTE|+(Pywj zIyea_IMtydh@mwa^T(>!sSpaq+!J-W-vgZQcR9lcc<5gzVs+5cD@cUz~+M&1Pi)e;EZ(00mG01yBG5D0L42%WnbzhqnGpY50OPGaO|?2=I^tf;=-V3ly-V0~EIwZ^i;8WO)481_$6 V_Aklx=LR~H!PC{xWt~$(69C9(R_y=) literal 0 HcmV?d00001 From ca151aa9a10c6f3365638e48a2e8e2fd7692ab92 Mon Sep 17 00:00:00 2001 From: unDepresh Date: Sun, 4 Aug 2024 22:28:58 +0300 Subject: [PATCH 2/2] new_weapon_for_secr_upd1 --- .../Exodus/Weapons/HoSLaser/Atttribution.yml | 4 + .../Exodus/Weapons/HoSLaser/HoSLaser.ogg | Bin 0 -> 7199 bytes .../Weapons/MiniEnergyGun/Atttribution.yml | 4 + .../Weapons/MiniEnergyGun/MiniEnergyGun.ogg | Bin 0 -> 11005 bytes .../crates/securityWithEnergyGunForSec.ftl | 2 + .../guns/battery/MiniEnergyGunForSec.ftl | 2 + .../weapons/guns/battery/MyltiLaserForHoS.ftl | 2 + .../ProjectilesForLaserForHosDamage.ftl | 1 + .../ProjectilesForLaserForHosStan.ftl | 1 + .../ProjectilesForMiniEnergyGunDamage.ftl | 1 + .../ProjectilesForMiniEnergyGunStan.ftl | 1 + .../Catalog/Fills/Lockers/heads.yml | 2 + .../Cargo/cargo_securityWithMiniEnergyGun.yml | 9 ++ .../Crates/securityWithEnergyGunForSec.yml | 10 +++ .../Guns/Battery/MiniEnergyGunForSec.yml | 53 +++++++++++ .../Weapons/Guns/Battery/MyltiLaserForHoS.yml | 45 ++++++++++ .../Projectiles/ProjectilesForLaserForHos.yml | 82 ++++++++++++++++++ .../ProjectilesForMiniEnergyGun.yml | 79 +++++++++++++++++ .../Roles/Jobs/Security/head_of_security.yml | 3 +- .../Roles/Jobs/Security/security_officer.yml | 6 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 6 +- .../Guns/Battery/MiniEnergyGun.rsi/base.png | Bin .../MiniEnergyGun.rsi/equipped-BELT.png | Bin .../equipped-SUITSTORAGE.png | Bin .../Guns/Battery/MiniEnergyGun.rsi/icon.png | Bin .../MiniEnergyGun.rsi/inhand-left-0.png | Bin .../MiniEnergyGun.rsi/inhand-left-1.png | Bin .../MiniEnergyGun.rsi/inhand-left-2.png | Bin .../MiniEnergyGun.rsi/inhand-left-3.png | Bin .../Battery/MiniEnergyGun.rsi/inhand-left.png | Bin .../MiniEnergyGun.rsi/inhand-right-0.png | Bin .../MiniEnergyGun.rsi/inhand-right-1.png | Bin .../MiniEnergyGun.rsi/inhand-right-2.png | Bin .../MiniEnergyGun.rsi/inhand-right-3.png | Bin .../MiniEnergyGun.rsi/inhand-right.png | Bin .../MiniEnergyGun.rsi/mag-unshaded-0.png | Bin .../MiniEnergyGun.rsi/mag-unshaded-1.png | Bin .../MiniEnergyGun.rsi/mag-unshaded-2.png | Bin .../MiniEnergyGun.rsi/mag-unshaded-3.png | Bin .../MiniEnergyGun.rsi/mag-unshaded-4.png | Bin .../Guns/Battery/MiniEnergyGun.rsi/meta.json | 28 ------ .../Battery/MyltiLaserForHoS.rsi/base.png | Bin .../MyltiLaserForHoS.rsi/equipped-BELT.png | Bin .../equipped-SUITSTORAGE.png | Bin .../Battery/MyltiLaserForHoS.rsi/icon.png | Bin .../MyltiLaserForHoS.rsi/inhand-left-0.png | Bin .../MyltiLaserForHoS.rsi/inhand-left-1.png | Bin .../MyltiLaserForHoS.rsi/inhand-left-2.png | Bin .../MyltiLaserForHoS.rsi/inhand-left-3.png | Bin .../MyltiLaserForHoS.rsi/inhand-left.png | Bin .../MyltiLaserForHoS.rsi/inhand-right-0.png | Bin .../MyltiLaserForHoS.rsi/inhand-right-1.png | Bin .../MyltiLaserForHoS.rsi/inhand-right-2.png | Bin .../MyltiLaserForHoS.rsi/inhand-right-3.png | Bin .../MyltiLaserForHoS.rsi/inhand-right.png | Bin .../MyltiLaserForHoS.rsi/mag-unshaded-0.png | Bin .../MyltiLaserForHoS.rsi/mag-unshaded-1.png | Bin .../MyltiLaserForHoS.rsi/mag-unshaded-2.png | Bin .../MyltiLaserForHoS.rsi/mag-unshaded-3.png | Bin .../MyltiLaserForHoS.rsi/mag-unshaded-4.png | Bin .../Battery/MyltiLaserForHoS.rsi/meta.json | 30 +------ .../impact_laser_greyscale.png | Bin 0 -> 951 bytes .../meta.json | 25 ++++++ .../omnilaser_greyscale.png | Bin 0 -> 333 bytes .../Battery/MiniEnergyGun.rsi/BlueTrac.png | Bin 188 -> 0 bytes .../MiniEnergyGun.rsi/impact_laser.png | Bin 109 -> 0 bytes .../MiniEnergyGun.rsi/impact_laser_blue.png | Bin 1273 -> 0 bytes .../Battery/MiniEnergyGun.rsi/omnilaser.png | Bin 365 -> 0 bytes .../MyltiLaserForHoS.rsi/impact_laser.png | Bin 709 -> 0 bytes .../MyltiLaserForHoS.rsi/impact_laser_red.png | Bin 1265 -> 0 bytes .../MyltiLaserForHoS.rsi/omnilaser.png | Bin 372 -> 0 bytes .../Battery/MyltiLaserForHoS.rsi/redtrac.png | Bin 225 -> 0 bytes 72 files changed, 332 insertions(+), 64 deletions(-) create mode 100644 Resources/Audio/Exodus/Weapons/HoSLaser/Atttribution.yml create mode 100644 Resources/Audio/Exodus/Weapons/HoSLaser/HoSLaser.ogg create mode 100644 Resources/Audio/Exodus/Weapons/MiniEnergyGun/Atttribution.yml create mode 100644 Resources/Audio/Exodus/Weapons/MiniEnergyGun/MiniEnergyGun.ogg create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/catalog/fills/crates/securityWithEnergyGunForSec.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MiniEnergyGunForSec.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MyltiLaserForHoS.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosDamage.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosStan.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunDamage.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunStan.ftl create mode 100644 Resources/Prototypes/Exodus/Catalog/Cargo/cargo_securityWithMiniEnergyGun.yml create mode 100644 Resources/Prototypes/Exodus/Catalog/Fills/Crates/securityWithEnergyGunForSec.yml create mode 100644 Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml create mode 100644 Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml create mode 100644 Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserForHos.yml create mode 100644 Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForMiniEnergyGun.yml rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-2.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-2.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-3.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-1.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-3.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json (80%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/base.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-0.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-1.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-2.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-3.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-0.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-1.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-3.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-2.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-3.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png (100%) rename Resources/Textures/{ => Exodus}/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json (79%) create mode 100644 Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/impact_laser_greyscale.png create mode 100644 Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/meta.json create mode 100644 Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/omnilaser_greyscale.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/BlueTrac.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser_blue.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/omnilaser.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/impact_laser.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/impact_laser_red.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/omnilaser.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/redtrac.png diff --git a/Resources/Audio/Exodus/Weapons/HoSLaser/Atttribution.yml b/Resources/Audio/Exodus/Weapons/HoSLaser/Atttribution.yml new file mode 100644 index 00000000000..6e2c337f2a6 --- /dev/null +++ b/Resources/Audio/Exodus/Weapons/HoSLaser/Atttribution.yml @@ -0,0 +1,4 @@ +- files: ["HoSLaser.ogg"] +license: "CC-BY03.0" +copyright: "Created by https://zvukogram.com" +source: "https://zvukogram.com/category/zvuki-lazera/" \ No newline at end of file diff --git a/Resources/Audio/Exodus/Weapons/HoSLaser/HoSLaser.ogg b/Resources/Audio/Exodus/Weapons/HoSLaser/HoSLaser.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fd70cff216686ddbbc796c85b02ea9a1dff50375 GIT binary patch literal 7199 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/Exodus/Weapons/MiniEnergyGun/Atttribution.yml b/Resources/Audio/Exodus/Weapons/MiniEnergyGun/Atttribution.yml new file mode 100644 index 00000000000..1519ae0656b --- /dev/null +++ b/Resources/Audio/Exodus/Weapons/MiniEnergyGun/Atttribution.yml @@ -0,0 +1,4 @@ +- files: ["MiniEnergyGun.ogg"] +license: "CC-BY03.0" +copyright: "Created by https://Zvukipro.com" +source: "https://zvukipro.com/oryjie/196-zvuki-blastera.html" \ No newline at end of file diff --git a/Resources/Audio/Exodus/Weapons/MiniEnergyGun/MiniEnergyGun.ogg b/Resources/Audio/Exodus/Weapons/MiniEnergyGun/MiniEnergyGun.ogg new file mode 100644 index 0000000000000000000000000000000000000000..778b6426d5711ac384f095757aae78ea3bf1c0b3 GIT binary patch literal 11005 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/catalog/fills/crates/securityWithEnergyGunForSec.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/catalog/fills/crates/securityWithEnergyGunForSec.ftl new file mode 100644 index 00000000000..d6e597ef9fa --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/catalog/fills/crates/securityWithEnergyGunForSec.ftl @@ -0,0 +1,2 @@ +ent-CrateSecurityMiniEnergyGun = Ящик с миниатюрными энергетическими пистолетами + .desc = Этот ящик содержит в себе два миниатюрных энергетических пистолетов. Для открытия требуется доступ службы безопасности \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MiniEnergyGunForSec.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MiniEnergyGunForSec.ftl new file mode 100644 index 00000000000..eefd394cf1b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MiniEnergyGunForSec.ftl @@ -0,0 +1,2 @@ +ent-WeaponMiniEnergyGun = Миниатюрный энергетический пистолет + .desc = Небольшой энергетический пистолет со встроенным фонариком. У него есть две настройки; отключить и убить. Обычно выдается офицерам службы безопасности как табельное оружие. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MyltiLaserForHoS.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MyltiLaserForHoS.ftl new file mode 100644 index 00000000000..672d34688a7 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/battery/MyltiLaserForHoS.ftl @@ -0,0 +1,2 @@ +ent-WeaponX2DualphaseEnergyLaserGun = Х-2 Двухфазовый энергетический лазерный пистолет + .desc = Этот передовой и дорогой лазерный пистолет главы службы безопасности космической станции был изготовлен на заказ. Он сочетает в себе мощь и функциональность. Пистолет имеет два режима стрельбы - лазерный, который наносит урон ожогами на расстоянии, и станер, предназначенный для обезвреживания и задержания противников. Это оружие символизирует власть и ответственность главы службы безопасности. Однако оно не перезаряжается автоматически \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosDamage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosDamage.ftl new file mode 100644 index 00000000000..219ad43c115 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosDamage.ftl @@ -0,0 +1 @@ +ent-LaserBulletForHoS = лазера \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosStan.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosStan.ftl new file mode 100644 index 00000000000..da0fc68db33 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForLaserForHosStan.ftl @@ -0,0 +1 @@ +ent-stanerBullet = станера \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunDamage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunDamage.ftl new file mode 100644 index 00000000000..05bc19310ec --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunDamage.ftl @@ -0,0 +1 @@ +ent-LaserBulletForMEG = лазера \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunStan.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunStan.ftl new file mode 100644 index 00000000000..141cc3eec79 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/weapons/guns/projectiles/ProjectilesForMiniEnergyGunStan.ftl @@ -0,0 +1 @@ +ent-LaserBulletStan = станнера \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index a3d7d329dd1..2c1f934135a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -294,6 +294,7 @@ - id: BookSecretDocumentsExodus #Exodus - id: BookBusido # Corvax-Books - id: BookSpaceLaw + - id: WeaponX2DualphaseEnergyLaserGun # кастомное оружие для гсб, сделано для exodus - type: entity id: LockerHeadOfSecurityFilled @@ -321,6 +322,7 @@ - id: HoloprojectorSecurity - id: BookSecretDocumentsExodus # Exodus-NukeSecretDocuments - id: BookSpaceLaw + - id: WeaponX2DualphaseEnergyLaserGun # кастомное оружие для гсб, сделано для exodus - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Exodus/Catalog/Cargo/cargo_securityWithMiniEnergyGun.yml b/Resources/Prototypes/Exodus/Catalog/Cargo/cargo_securityWithMiniEnergyGun.yml new file mode 100644 index 00000000000..4c3aee72e44 --- /dev/null +++ b/Resources/Prototypes/Exodus/Catalog/Cargo/cargo_securityWithMiniEnergyGun.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: SecurityMiniEnergyGun + icon: + sprite: Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + state: base + product: CrateSecurityMiniEnergyGun + cost: 2500 + category: cargoproduct-category-name-security + group: market \ No newline at end of file diff --git a/Resources/Prototypes/Exodus/Catalog/Fills/Crates/securityWithEnergyGunForSec.yml b/Resources/Prototypes/Exodus/Catalog/Fills/Crates/securityWithEnergyGunForSec.yml new file mode 100644 index 00000000000..a2ec62e3842 --- /dev/null +++ b/Resources/Prototypes/Exodus/Catalog/Fills/Crates/securityWithEnergyGunForSec.yml @@ -0,0 +1,10 @@ +- type: entity + id: CrateSecurityMiniEnergyGun + parent: CrateSecgear + name: A case of miniature energy pistols. + description: This box contains two miniature energy pistols. Security access is required to open it. + components: + - type: StorageFill + contents: + - id: WeaponMiniEnergyGun + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml new file mode 100644 index 00000000000..d3eba823add --- /dev/null +++ b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MiniEnergyGunForSec.yml @@ -0,0 +1,53 @@ +# Сам прототип оружия +- type: entity + name: Mini energy gun + parent: BaseWeaponBatterySmall + id: WeaponMiniEnergyGun + description: A small energy gun with a built-in flashlight. It has two settings; disable and kill. Usually issued to security officers as a tactical weapon. + components: + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + fireRate: 1.5 + projectileSpeed: 75 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Exodus/Weapons/MiniEnergyGun/MiniEnergyGun.ogg + - type: Item + sprite: Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi + size: Small + - type: ProjectileBatteryAmmoProvider + proto: LaserBulletForMEG + fireCost: 200 + - type: BatteryWeaponFireModes + fireModes: + - proto: LaserBulletForMEG + fireCost: 200 + - proto: LaserBulletStan + fireCost: 100 + - type: Battery + maxCharge: 1200 + startingCharge: 1200 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 250 + - type: Sharp + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + radius: 4 + netsync: false diff --git a/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml new file mode 100644 index 00000000000..8e61c1f8e34 --- /dev/null +++ b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.yml @@ -0,0 +1,45 @@ +# сам лазер +- type: entity + name: X-2 Dual phase energy laser gun + parent: BaseWeaponBatterySmall + id: WeaponX2DualphaseEnergyLaserGun + description: This advanced and expensive space station security chief's laser pistol was custom made. It combines power and functionality. The gun has two firing modes - laser, which causes burn damage at a distance, and staner, designed for disarming and detaining opponents. This weapon symbolizes the power and responsibility of the head of security. However, it is not automatically reloaded. + components: + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + fireRate: 2 + projectileSpeed: 100 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Exodus/Weapons/HoSLaser/HoSLaser.ogg + - type: Item + sprite: Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi + size: Small + - type: ProjectileBatteryAmmoProvider + proto: LaserBulletForHoS + fireCost: 200 + - type: BatteryWeaponFireModes + fireModes: + - proto: LaserBulletForHoS + fireCost: 200 + - proto: stanerBullet + fireCost: 175 + - type: Battery + maxCharge: 2800 + startingCharge: 2800 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 1000 diff --git a/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserForHos.yml b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserForHos.yml new file mode 100644 index 00000000000..00512d8c4d3 --- /dev/null +++ b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserForHos.yml @@ -0,0 +1,82 @@ +# проджект лазера +- type: entity + name: Laser + id: LaserBulletForHoS + parent: EmitterBolt + noSpawn: true + components: + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: red + - type: Projectile + impactEffect: BulletImpactEffectLaserForHoS + damage: + types: + Heat: 17 + +# проджект станера +- type: entity + name: Staner + id: stanerBullet + parent: BulletDisabler + noSpawn: true + components: + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: pink + - type: StaminaDamageOnCollide + damage: 30 + - type: Projectile + impactEffect: BulletImpactEffectDisablerRed + damage: + types: + Heat: 5 + soundHit: + collection: WeakHit + forceSound: true + +# эффект от станера +- type: entity + id: BulletImpactEffectDisablerRed + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + state: impact_laser_greyscale + color: pink + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + +# эффект от лазера +- type: entity + id: BulletImpactEffectLaserForHoS + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + state: impact_laser_greyscale + color: red + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu \ No newline at end of file diff --git a/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForMiniEnergyGun.yml b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForMiniEnergyGun.yml new file mode 100644 index 00000000000..35b5e02beb3 --- /dev/null +++ b/Resources/Prototypes/Exodus/Entities/Objects/Weapons/Guns/Projectiles/ProjectilesForMiniEnergyGun.yml @@ -0,0 +1,79 @@ +# продект лазера +- type: entity + name: Laser + id: LaserBulletForMEG + parent: EmitterBolt + noSpawn: true + components: + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: blue + - type: Projectile + impactEffect: BulletImpactEffectLaserForMEG + damage: + types: + Heat: 20 + +# эффект от лазера +- type: entity + id: BulletImpactEffectLaserForMEG + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.3 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + state: impact_laser_greyscale + color: blue + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + +# проджект станера(написан на основе проджекта лазера, ибо другие ломали фонарик) +- type: entity + name: Stunner + id: LaserBulletStan + parent: EmitterBolt + noSpawn: true + components: + - type: Sprite + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: cyan + - type: StaminaDamageOnCollide + damage: 25 + - type: Projectile + impactEffect: BulletImpactEffectLaserStan + damage: + types: + Heat: 4.2 + +# эффект от станера +- type: entity + id: BulletImpactEffectLaserStan + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.3 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi + state: impact_laser_greyscale + color: cyan + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 0cc3dc4e833..b147b2785f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -46,7 +46,8 @@ id: HoSPDA gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity - pocket1: WeaponX-2Dual-phaseEnergyLaserGun + pocket1: WeaponPistolMk58 storage: back: - Flash + - MagazinePistol \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 41a497dfb5b..ba0acfba6f5 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -27,7 +27,7 @@ equipment: eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity - pocket1: WeaponMiniEnergyGun + pocket1: WeaponMiniEnergyGun # Убрал "WeaponPistolMk58" и добавил "WeaponMiniEnergyGun" storage: - back: - - Flash + back: # Убрал "MagazinePistol " + - Flash \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 6009ff3370f..f9a3c735ea7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -30,7 +30,7 @@ eyes: ClothingEyesGlassesSecurity id: WardenPDA ears: ClothingHeadsetSecurity - pocket1: WeaponMiniEnergyGun + pocket1: WeaponMiniEnergyGun # Убрал "WeaponPistolMk58" и добавил "WeaponMiniEnergyGun" storage: - back: - - Flash + back: # Убрал "MagazinePistol" + - Flash \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-0.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-2.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-2.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-0.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-2.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-2.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-3.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-3.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-0.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-1.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-1.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-3.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-3.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json similarity index 80% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json index 2a134cfd24e..a2cfc5ccc65 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/meta.json @@ -75,34 +75,6 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 - }, - { - "name": "BlueTrac" - }, - { - "name": "impact_laser", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - }, - { - "name": "omnilaser" - }, - { - "name": "impact_laser_blue", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/base.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/base.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-BELT.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-0.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-0.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-0.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-0.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-1.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-1.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-2.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-2.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-3.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-3.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-0.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-0.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-0.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-0.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-1.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-1.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-3.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-3.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-0.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-2.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-2.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-3.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-3.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json similarity index 79% rename from Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json rename to Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json index b14f5a781d8..a3f5cac57da 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi/meta.json @@ -75,34 +75,6 @@ { "name": "equipped-SUITSTORAGE", "directions": 4 - }, - { - "name": "redtrac" - }, - { - "name": "impact_laser", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - }, - { - "name": "omnilaser" - }, - { - "name": "impact_laser_red", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - } + } ] } diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/impact_laser_greyscale.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/impact_laser_greyscale.png new file mode 100644 index 0000000000000000000000000000000000000000..a2bdccf8822905d3481109c23c56b04914a7c247 GIT binary patch literal 951 zcmV;o14#UdP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf158OoK~#8N?V2%< z(?Ae~4Rll#5mHi7MxsJNNY~}x@H3+PD(X}xAtEY7OGPNIprU4w(w%u;Knt3j{TABfptECwrxms@8fWzVN1|bh8adVf!py8F|C&}IM zc>E!oCMFpWb3Io)he+c?^k!IV$uhuDM3%S}r5kF#l}x@#HrHW(4+x6Tg`fx)((jMW zkSPo_Pd&st36foh$$&%=BwIWK>Jm2oK_Y5Gikz!Jtcc0tDF#f$`KgD-A0)8-(FLFL z1CttvqydH^CW{-}SPk$?O$Q4B5M=Y*NA&-c z#+wi{uQ3fm(tyA{o|Go&0NVLdE5fMxXgp}1&ynOH9-oYu9lnm zLS!kj3^05vWBw{?F0PjMvgvWUUu4sa*#Omi*m(H8+@dB7G=8O@Yl6vuf#&r+Ld~Kk zsOCrYb45qqa+Pbqfa10QQjtB^7jEDW_=6R8K6fL zLKN1w#qn4dQEV0jBWlvO&Vt-^fOdD$-v>k}u0Lxb#JjUXcz1SjO6boqVA002*_NdtmwIh|z@Iso>2O0NSPS^5@UtXAna>-~QJ z%B4RpUb=XVeU4uPfdap~z_H!wboz~40(Y*Tt`5B8jp{qoKjB!nZDPt&7>v2L_~(JK zOPqD;lae2X{A+&6=1FKmZsR1&01_DC`5%p!W|9H-#H@wTJL$VLDF002ovPDHLkV1kpLuJQl? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/meta.json b/Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/meta.json new file mode 100644 index 00000000000..6148b3b70b6 --- /dev/null +++ b/Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "omnilaser_greyscale" + }, + { + "name": "impact_laser_greyscale", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/omnilaser_greyscale.png b/Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi/omnilaser_greyscale.png new file mode 100644 index 0000000000000000000000000000000000000000..5f4efba75e42ac52c7e7c306f6a830cea7bf641e GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;3H2L$B+p3x6?QB9##-=^;DX5<;u#Ljj1ba z7>f-Y*^*kXth~F#(^Wgn`yZA|gI7FC*Z&O~mSVxzzz(WSv* zH<(z=UUaZ{Compoa=IyWmr46a@2P1ogjO7QAF|D5vjgwCtzjB{nd_n#c_whb+xx%F zrD-ciy`-Q3BNS!a6VLf8tYDeW6Z~@Xmq4rI68C4^@%}8lfcxB11_l#G8z%Q%Saa1B^wXNpTH**f>GPjg}&`LcxF^@4twek9)CgnHl6E>>dD0p(e{J2*wL-T|9 V@_^pQ`9R+?c)I$ztaD0e0ssK_ejoq< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/BlueTrac.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/BlueTrac.png deleted file mode 100644 index 23663c5f83d12623409a8825af194f143c0f3d9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArY-_ zuWjT!pdiqixRE1;`*cX;sY7d$ON%3{9KLN7I}#FkpuB+Nz5IiBk5?7OiAboL`u7ffYM}%J2iK(AWDm_e^8QeLx jF?@a(v}|kR+xzSR?ngTe~DWM4fMF>UB diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser.png deleted file mode 100644 index 2975c479be7566a6c59a7aca4e20778aa850feb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser_blue.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/impact_laser_blue.png deleted file mode 100644 index 617511783a664e32d8ba648125ab2a098311717e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1273 zcmVPx(vq?ljRCt{2nomy~M;OMRwH*f|{;g?OxHz5Jc{gQ~3_LR8$}ze6Dgs zvea9|nS(_I>PP6MQl%bxtd%0;CY(}K8K{xd+D;wek`}v%^$V{DuRY^k2O;Jsjbx9# zGxI#}?99&W02+-(qtV<*){^PeS~8t-Q-H$2W`^$+q2@lWBBRn?`z&3-M;8iamj0T1Q;4mEb zk@#OKcH$_-pjcu>e}erfbw4Mq6>=RX-ag%RwlhkQ`uDUbZ4SmDa}+4-c4s;AXB=G zJoSW337F2lz)a=f9iJBcl~S?WR48Qt&Fuj2;D_w1QM~yNu!WO&%IkEE*KiZKcn&=e z^rEK$+&zjcnZOg}J6+o^{5hX`0dQ#o7f-)+y4Hz+bVJS>c|Nj>VgcJAFC)K|NpI2s zHdQ>`If)Ff*xmcU0)S7xe--$BGVbHTdH1I>y44|N05!ya*2s^Xo#thxI4{=&{z|FH z=X4TT4V%_X<>1PruuS9$&lW>G@`G9o0qu{t^u#CL?*my3IW>rL-OJ&A_62VJhRBV^ zi!CvYMx)VaG#ZUYqtV<(`r8m$b=VO3=H{)%)waY|yYI?eY(>2XBfk7<^J_70dn2{3 zT8{krfYr{26slo-0RR(adK#tVoey9UJ&eRZ zCgJskgi&8e7=UdCH^IwZz$4mae9=&O(loFR zsc2g#pRK$^%>vberM^@+eGnGokGb?KLch`dJ78 jdO57oXfzs)<`(lmK&ZlQIh%0>00000NkvXXu0mjfnH6Au diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/omnilaser.png b/Resources/Textures/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi/omnilaser.png deleted file mode 100644 index 2f8e2d3ebcfe778e3de297c6f8acd7595096b680..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmV-z0h0cSP)Px$CrLy>R9J;$U>F4yfV7NSwX}>{HA>82ro{4JAKrWY{qaN9%*OrQ*)xaU(#-)d z%bEGu?U>kEsrO|~P5asbTd=$7B(;b+Ka<6tP^ zU?Px%e@R3^RCt{2n$K(EP!Pwz#!U|^E=s^Q@!+At2CRCphehnU|A~K8{u9qG;z18p z7ZmEjgFh;Wr6MdFeD)AWBg+=vi@IcYJ`i{&Wb)?wCNmE+0K+g0!!QiPgpPW)GN@-O zgCI5{r<%+qA*Z#iNCAL|X!D2X?_X7HDGSg^=SMUyjJp|CJF@tlFAp0D0BGEnUja2C zlmsB>^^I%LIX9{=&MibeTN%)*mxql6s#WiT<0y-u$xfn^&X4qsYv>!-uxI_4J?qB+ zPYi!loQu?IezkYL-S&=Z73E;J6F|fJ_AZGaDhgrn(^t zC8yX5GYrEp48t%C!!QiPFbuY#2w37QtOef1r2;p~L-?+y0>gDPse*Mdh>I)J=Mg*n)0AX55VOq&z zs}?V|YH`35;}ZP=BBGi8{)FUusRN!EB#cZ>_@p|KVyhOXPva!QB4&JePf&VRt|@lo zeSZP~yWNffKsTM2{y=-O{(z_Z$JHcZEd$vL@O;(&1my^Lx_?|19Vbp>RXeKmZ|t@0 zI7j^ngiH>Q7N9WhW;(z~m{!v7xHg?!Wc9VJn7UCN`o=ZPx(t4TybRCt{2n%_%fM-<1uxtpZ0iN$C(m~A25rVl~32u6wog{2QsDD5BMYeA^~ z0Sf!PpnrfBF7!43fG?V-g>{20MvxW>v{^}MtJoN&iEWMbrVsJ#o{YK4%*}NdaXv7R z%)NJJ&iBlnA9oI*(P%Up&8=ilrUc90mdZBY_{H^Tp4{gHUR?)C4hRIXaDXn1-rJH!8HhtnBAO$2EH zs1c&!!SmWA0MtGRz5v`8K{TEl9j=u}0iYZV?@*qq2!=`{$oSxSZITk*L%->sUI!BCyLN3qKN6e>B2|KK%Eue${fNUjd-iyNSa>0LdhfOo9vH7E99$6MW#iU;lg9 zXjqZYj()lS#`vrHNrcD0{{(SNC=J9yoqD2@0N0=f04NM4&Uz~AJ>gh@!cgK2rU{tl zHREYY?1jbkRg% z0GitYVC&QIjf;D}W1uMl8Bclbo^hKN5t#A(9$F7{qpJX1J@PDxz!T-$J?j*{&Zk}g zFcFyXbgkX9c6enQQuq4z`N%FB3p53C)ANh#%bPTSWrx$5^j>zR91QQ!AeW1$0JIv; zyFZoDsSYUts3CQ)f4|}#*q52&+}sbuDy0)Xr<0L(OW|0hbP}tSq{?<}GsHcAQ=1{6 zb%{$WKJk6OkJf)tztCpbYgeE#{$Qvg_bGXD%v7ePvZPC*Ks zn-+nLC!pXE8;I@>GKpR1iIHd5kC}$|GUgy&iTb#|I>T&3{8iThWIh zEBY|>$otP%l&2D$;Dq_-D^JO2-{r;N$EUwV?^&0RDbKEV*df&exJSR(f0ZV~N47Wm zMz%NlfTkE+1UGvD_o(GDqC7q!bavtcnqqJfWP5@1(HPL`-I48$J~|pF5sm|cC_ad* z6sg3O_W`i@1OSPAJ^%nee)RdV{nPDH65twF4M0AR-La{vaqvgi!$?Px$E=fc|R9J=W*S|``P!tC6FSlwOj4qc(Fr`{tN(Cw6lEuB7W1b^(CTE|+(Pywj zIyea_IMtydh@mwa^T(>!sSpaq+!J-W-vgZQcR9lcc<5gzVs+5cD@cUz~+M&1Pi)e;EZ(00mG01yBG5D0L42%WnbzhqnGpY50OPGaO|?2=I^tf;=-V3ly-V0~EIwZ^i;8WO)481_$6 V_Aklx=LR~H!PC{xWt~$(69C9(R_y=)