From 52ec5036d5db00f3127da9e1690983a99dc1d8fb Mon Sep 17 00:00:00 2001
From: TaralGit <76408146+TaralGit@users.noreply.github.com>
Date: Fri, 15 Apr 2022 15:39:16 -0700
Subject: [PATCH] Another gun PR (#7450)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
---
 .../Weapons/Guns/Battery/battery_guns.yml     |  57 ++++++++++++++++++
 .../Weapons/Guns/Battery/cog.rsi/base.png     | Bin 562 -> 352 bytes
 .../Weapons/Guns/Battery/cog.rsi/icon.png     | Bin 542 -> 352 bytes
 .../Guns/Battery/nightfall.rsi/base.png       | Bin 0 -> 304 bytes
 .../Guns/Battery/nightfall.rsi/icon.png       | Bin 0 -> 304 bytes
 .../Battery/nightfall.rsi/inhand-left.png     | Bin 0 -> 357 bytes
 .../Battery/nightfall.rsi/inhand-right.png    | Bin 0 -> 343 bytes
 .../Battery/nightfall.rsi/mag-unshaded-0.png  | Bin 0 -> 151 bytes
 .../Battery/nightfall.rsi/mag-unshaded-1.png  | Bin 0 -> 151 bytes
 .../Battery/nightfall.rsi/mag-unshaded-2.png  | Bin 0 -> 158 bytes
 .../Battery/nightfall.rsi/mag-unshaded-3.png  | Bin 0 -> 153 bytes
 .../Battery/nightfall.rsi/mag-unshaded-4.png  | Bin 0 -> 153 bytes
 .../Guns/Battery/nightfall.rsi/meta.json      |  46 ++++++++++++++
 .../Guns/Battery/pulse_rifle.rsi/base.png     | Bin 0 -> 351 bytes
 .../Guns/Battery/pulse_rifle.rsi/icon.png     | Bin 0 -> 351 bytes
 .../Battery/pulse_rifle.rsi/inhand-left.png   | Bin 0 -> 359 bytes
 .../Battery/pulse_rifle.rsi/inhand-right.png  | Bin 0 -> 357 bytes
 .../pulse_rifle.rsi/mag-unshaded-0.png        | Bin 0 -> 160 bytes
 .../pulse_rifle.rsi/mag-unshaded-1.png        | Bin 0 -> 166 bytes
 .../pulse_rifle.rsi/mag-unshaded-2.png        | Bin 0 -> 166 bytes
 .../pulse_rifle.rsi/mag-unshaded-3.png        | Bin 0 -> 166 bytes
 .../pulse_rifle.rsi/mag-unshaded-4.png        | Bin 0 -> 160 bytes
 .../Guns/Battery/pulse_rifle.rsi/meta.json    |  40 ++++++++++++
 .../Weapons/Guns/SMGs/c20r.rsi/base.png       | Bin 329 -> 329 bytes
 .../Weapons/Guns/SMGs/c20r.rsi/icon.png       | Bin 348 -> 348 bytes
 .../Guns/Shotguns/gladstone.rsi/icon.png      | Bin 553 -> 329 bytes
 26 files changed, 143 insertions(+)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 30eea5dda7..cfebd13247 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -150,6 +150,33 @@
   - type: BatteryBarrel
     fireCost: 12
 
+- type: entity
+  name: nightfall laser rifle
+  parent: BatteryGunBase
+  id: LaserRifleSniper
+  description: A scoped high capacity laser rifle.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/nightfall.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/nightfall.rsi
+  - type: BatteryBarrel
+    fireCost: 6
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 5
+      zeroVisible: true
+
 - type: entity
   name: DEAC-12 pulse carbine
   parent: BatteryGunBase
@@ -180,6 +207,36 @@
         volume: -2
       startingItem: PowerCellSmallHigh
 
+- type: entity
+  name: destroyer pulse rifle
+  parent: BatteryGunBase
+  id: PulseRifleDeathSquad
+  description: A weapon that fully lives up to its name. 
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi
+  - type: BatteryBarrel
+    fireCost: 6
+    ammoPrototype: Pulse
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PowerCellSlot
+    cellSlot:
+      ejectOnUse: true
+      soundOptions:
+        volume: -2
+      startingItem: PowerCellSmallHigh
+
 - type: entity
   name: laser cannon
   parent: BatteryGunBase
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png
index 65688e7c7481cf5ee936741c821a4605c1fc167b..355b755141cef2e8f65bca06e0f85d225e06ae98 100644
GIT binary patch
delta 336
zcmdnQ@_=cAWIZzj1B1(wu46!ou{g-xiSg!1oq8aLv%n*=n1O*?7=#%aX3dcR3YrD@
zgt!7}H%~tqdF8$d(-qVV0zy*^Ox+9|Je-`p8YXP0nz1-KGta=#EFz=g#*Lc_%DNH~
zO1g$N4;U>PfI5Xrg8YIR{=-2%lofZd%?>EN)YHW=q+-t7i5K~r4LDp|tr|tu{{27C
zx54|)v>n^`=6s)JazT0Twaj0ye={-EXnkZoa4lh<&eNG3w;3#^WN(@9EH%PK!_A55
z`n^t%qb@yiMw@3;XfN38wsM-U=FEr?j)3JE43-NU7C$=SwQx<gmhux%W0{E={44id
zdv#`q?~1)WkH0EksNNDFdAa?3c<lGuZ)a^gKHWAwX7~H1tvi$Lf8lrX4f5Az-RH1J
U7OPkl0bR`C>FVdQ&MBb@05P_WO8@`>

delta 548
zcmV+<0^9xI0<r{<8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DYLP=Bz2nYy#2xN!=
z00G=dL_t(oh3%9<Yt%p#$A2q}A|ftvD6K4R!!{+-gAt_c!Gm~^)`RTDt9UFPgo@t%
z7=8yYy|vyvcnC#kdPo>|w`?oL70HJ76U0N!IFszQsVE-I?|<@=$-MXfGkI^IqN1Xr
z;vZ8hyYb=b<1~AYqL9Oby>sVI%Bz<x5=9{|*I)fgymU47Zr^2p{|oc;Hw!V?{Y2x&
ztdSc<VWDo#yR)1YR)Jt=TRHXaucQF+un&N+9ge<!qj7D9qvP*W<Fn^)RK1Ojx6E9=
zSkS2hEOk1@;(w?&ATt&xW4hfnr1WvSYXC^;BMAU#T$!C3rSw(Jc-ZHuc7l&q9`IuQ
zHT5_dGwKZt19OWD%&`DK==&#vGBEaZf11f7rH|`&l(>`uuImA?^?uXX8%5#d9>^P-
zCRFBICN6Bp=z**uRS#H}P#=>dCQiocUD%Exp!Y&N?0=sc^&DY41Ru7{DF}A9Yt2?W
zwJc!>=f)+yxB3KtkDKrGLaDH>vvg~b@Hi>N%xFel9JDd)4L(m2R_HyDFEr{6$a+bS
zW$udlX`%qlRy!58gX?<AM6=aSwLCS(NfH~e3}-sb48X~MJkJeSh6{hP*za)WRjePg
mupJH$_8tDZsfvn<|BD|)0swKyL{SX@0000<MNUMnLSTaUlmW;9

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png
index 187c15586ceaa8c443d1e014ae2128573b8e745d..a02929baaf1ab59a68033d14168e2cded2372ea2 100644
GIT binary patch
delta 336
zcmbQo@_=cAWIZzj1B1(wu46!ou{g-xiSg!1oq8aLv%n*=n1O*?7=#%aX3dcR3YrD@
zgt!7}H%~tqdF8$d(~~t!US-A~)U-En@NjbWYM8L0YR2N|%sc}_vxtm}8#it$DC<f{
zDCrv7*nGPr3DhZ6666=m@E;E9p{%%rZFWHErJgR1Ar*7pPQ1w1Y{22#YSk#J_V53B
zz75`YrtR3iH|P5-lMBjwuVwyv{hNuQM(ZQ%folo-be_)SxXoZOC40++XQ>e`8g5QZ
z*Y9<D9ChiDGuk|(LVLkxx0Ta;HD^YIa0D#RV6a@+u=vpluZ3%}wUnQD8p}+~;9t4t
z+N(1=d{^x4dHhxRLiLsa$;<8M!(+eKemiU1@#(hdF}vS4ZQYq{{|mp9Z;-z(>pq7)
UvRK8c2<T!4Pgg&ebxsLQ00oPWD*ylh

delta 528
zcmV+r0`L9c0-gkr8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DYLP=Bz2nYy#2xN!=
z00GEJL_t(oh3!;5NW(xFeUT!FlkpIRN)2sFN|%Zt4i449zd^dVIyrO_Dmn=6PVUaG
zE^g{%2ZvA)vn0k?Q9-D~HQ?ZU4)u;)8`~&~gL%t$f8X~WcYp6YAV!QBF=G5Nl&A+6
zmRA`cJC2R#r~5DGhUF!q7I7RKTa|4wUmO@>`*V5RR3DKmPIScG3maFXM9Os>yQ8jB
zn4D%Es{pL)nowFOE-?V04|f0nqUo4=p;%W2am3y}jpOA#QSapB5F-Qq;R5nAGty$i
ztHbvx0D$^UY=2Y^;JPLZqjk=8O}MVr^VSTbAjX%c$I=b1EX`xHvV#Qmn`n4-DRC^D
z!5A_C0NXS}2}`ANC@B}}y5`5+5<<?-Po=YtV~2a7UC?JlQT8}F(R9fJ+>pWps!GJB
z?^95}Ddt4eC4!(A=)+yt7|bD>4y$@5cY$?XQ<AAPQ-4(=5x2Dqn_XT5(0a>2Ax6|;
z<a1fruYO15LOI&Wfj}F2_1iFFfuIN43pKntxR-)4%3qP_MhXDQRGJY@hhY?ih-50w
z0(qj1dFSvL1w9pV0YK{=zw!e{LEldn`wn`3#ldSPnvUnE`(GCoBSwt>g?EFP0N^TG
Sv~B<Z00{s|MNUMnLSTYRqvovu

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f678c060c2bed3e2f9102a8b2dd11fa258b7ff4
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@3A^6XFV_Bcl=z9XUQ_`V4b3Cj~VF15>wv&=dtFb>j))(jdJhL4Lsu
z|DnK~Y4#PM;7m^!$B>FSXZvmWnhki|&Q24YJV#;bF6S$AJMurc?qD*WX!GL+@6yoA
z^BT-u&&U69E|J}l{%oJ%VT+^D+BF|C=SVk7I%s$7dLsXN*RoryuQ9%QRB(TrE?=S2
zS(yp<J5?)Br5#J^YChC>PTWXdCsXAvXV{Z3Tq_T8PJN{C^?jWBsuepnSpQyAkYc(g
nOWm|XXaDtC|2Th{?cnpDEv30MPF=+T=tu@nS3j3^P6<r_NFH+3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6555fd81511b7b7162eaa5e1eea2081c5d70c47
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@3A^6XFV_Bcl=z9XUQ_`V4b3r(_M2gPQiQGUFAL)LD#=ih=Z&1o;Is
z{D%T_rrB43f-^l`978JRob9*eYc}9<J3CEq@*IV!yPU7g?a2S&x`WAhqRo#Ryh}qb
z&ucJuJs<zaxkPqH`m=q4hb@jqYu9|poFm;R>7d=Q>xum9UCVB*zQ*|KQNjIfx_pI7
zXJsbb?^LZkm3AzttNBplIdLO-olKRxoMBJCaIHMVIrWjk*Y|Pit5)pTVEubdL5k^~
oEOpZko&DEm{p0*)wu8@qwv^`5ICT{Vpd%SPUHx3vIVCg!09sXaApigX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..53bc7fd843085a265008ffb97b861946b713fe16
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND5x0V6XFV_m6erUU0p*%L#Iri5gC<eZsw$*r2Z;1{-CD)p(Dq=w^@Y%
z6>*mY`2{olhlAR(+N(g}W1cRKAr*6y6C_xbg$;y)6jT_}xe`JZ)|?PxSma!wnP4DP
z$~tMyI*TQe5>uQN)L0%A^fCljsZV&6<9{f%H8Jui3tO9HY7^UzHwpgbsR^b2$5nY*
zo+>gbHd@@}U|PdH?a^d8*2M`kn9sav)H<}HV<AJ7O#|cV<_U^zOdcN@fa*@onC8^Y
z-od%fZ3fp2A?t^4B$K#iEbUl0;|Pn!<jsb$5|>%nj=9WGb~?qi;e@dPhg0mqS6Y3c
lav?Sin(G*3J{=ZkVAx|Rk(a~4%m?%lgQu&X%Q~loCIIkccG~~|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d54786b268e811c2464a4c76d7e07db1327756e
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2@;6XFV_m6erUU0oxi5~oa`5gHnLP}BZZX1uwX)1f2By&ua}0ab97
z1o;Is{D*<MPLVL6=pIiO$B>FS$q5py%De_bK?*7jz9M=VhgNhsGj=m}q?L(r9Z1}?
z!T1PEFsqE7G2`q5VK<I6+~rz!z(`=Oo?^%0E(gw!EDMBXqziX2WOyoH5L9c6INQ$P
zxIkO&@iaE3XPgyF-4AL=oNBlt#1y=Dh0+oo2Ie$&MIYs+1*wc2GbC0eX$6=%8XdIc
zaE@zOxsm6b=k$OBCX7L14UEx=i#3)pc|<Z4HnDtTauj&Qm6q<f=F^8w4VM|(|7>7m
YaN8!_$MeVi3(y}7p00i_>zopr0Q|#ow*UYD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfc71602bcc1bec630eea6a36cec7ee96c10a900
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND997w6XFV_71Rt2Ox*%PQ-nD4-T?V5B|(0{4FCWC->mD<0pyE#x;TbZ
n%t=mIU_7D4@QZ;9n=%7~eF8(Gm+-YFpge=8tDnm{r-UW|fAJzf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..70ac25da4a792cd4d497ac3b18641ce49bcb89a5
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND997w6XFV_lQm2ZYTCcbj4$TCYz^eIlmz(&GyMPmf3vPb2aqq~>Eakt
nF()};f$@YE!!HIdY|0D__6ZD$Uc%R!fbtBUu6{1-oD!M<>V6}~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d68e5f5b7e10b1aa6843478220d46250c0845393
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q!^2X+?^P2p46!aaySb-B8wRq
zxP?KOkzv*x37{ZPfKP}kkWSVxIjCv>Dl@*A`?58V&r%ZP7tHYg|NqUp4jn+gw5N+>
wNX4Aw1c@|<A||b~3%)aWsXquZ<SJlhFwbUjl-$~V5vYv8)78&qol`;+0Kq{h761SM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ef41a9814c9de6219d12f3dda6a1a19a3714d7
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND997w6XFV_lQm2ZYTCcbj4$TCYz^eIlmz(&GyMPmf3vPb2aqr3>Eakt
qF()};f$@Yn45=?{9mFMj7#KS9nG*Lcwx17F!QkoY=d#Wzp$Py>5haQM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..040e713714295dd4eecd27e0b92ad0c1c5b1b0d4
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND997w6XFV_lQm2ZYTCcbj4$TCYz^eIlmz(&GyMPmf3vPb2aqr3>Eakt
qF()};f$@YnoT)GNI*Uv8Ffh#HXKGw&z+nqi!QkoY=d#Wzp$Py+h$PAY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json
new file mode 100644
index 0000000000..9b419cde20
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/sniper.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..23a401a84ecbb5427537824012485a673cedfbbd
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND5w(P6XFV_bq#GMPnjJWnJgipWDpQwU}%=oR_9z%?&RzhotdYgX5g<g
zZx2u%Pf3tpFvEWY;5-tb1{B}p>EaktG3V?AL#{&sJZ-@h7Up*T7v?QE%UUDF^)f?H
z*7d1l^~802K$7|Ho`srLQ`TAi$o<K2az4W!enGbm3(=LnlXA3-+(rCb5)bd0=j*sT
zT<dLg#e2te9sb<g?_`?f<sQxwzPUIkw@72=>1wYj4^LccV!6+*dvemFFa`A&JMCtx
z)GO(2-^g{@vC=qY_OhL8t|`ndN!wxNB3QU<+lt?g@6>sNMU0juKl>$k?`M~P%rt}D
g_di_M|6{4YyF=Uf*wP|ypg$NqUHx3vIVCg!0N!SVX#fBK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3d33c0a8671c04e715ea8beed46dd8154b61d67
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND5w(P6XFV_bq#GMPnjJWnJgipWDpQwU}!e$!yV^}awli6=*&C?HG}TN
z{uZD*o{}KHV21w)z<DG<4Jf|H)5S5QV$RtKhFpgNc-n$1EX?ivFU(tTmbFHT>t%+Z
ztm{+9>WS<4fF$$XJqtChrmVC2k^7V5<a~xd{DN*B7NRSCC*^1vxr_L>Bp%)~&)0Ex
zxYpa~iuaD`I{dk}-^nz|%RQVWd~<P7Zjr{!)74&69-g??#B!fq_vEBUVG8OmcG}HW
zsaMk5zLD#)W2JG*>}5OGTvM1^lD5OjMX+$!wiUk}->LHkix@3Se)dc7-p?-om}v&P
g?|-<i|Ho2)cZas|v86@aKz}fJy85}Sb4q9e00L2kkpKVy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8e71b850e6d59fdc1b387bb837726add5bbdf54
GIT binary patch
literal 359
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@3A^6XFV_m6erUU0p*%LnAUO3>-WfCTwVY`I<AMy?x@r2$0^AAirRS
z|4?AgH2Vrr@Pem{V@SoEw^I)CH5u?YSTlFJ8$HoeyeAva(Ef1hOxAjbe+<I?_kQHQ
z_VV%3o!7aCIX2^R8K+Id)c-DjwJx0eJ)=g~<MWDISA9{3nO}eOR4eiZm@IS-=e(^V
zU4MLo?72%E#TK><ZnNc=N>-IOS6q0+x4`Fe*;c{N6_?j+T6u>dx}xKbPhD#2%@6DU
zf9^dMd2mU)Lrmts=81A0=R|8>EMb3Dpj*lKvQgsgyy%uM0uG%^_BdZ)E?oIjw&9CG
ru7U-_SAnD_ES(GFIIPtts(xa*@<9Ats%&5;&~FT$u6{1-oD!M<f<ugF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..12745401434ee5c07a48ff370774ba135180cccd
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@3A^6XFV_m6erUU0n?vJR&kGLPJ9vCT!r$Xm5P^db8}rT9Dq7AirRS
z|4?AgH2Vrr@SLZMV@SoEw^R0W9WoGT*WdO)Yvs-8CA%jE$V4|Cz4%4+6|+Uz_6OOs
z?W0<rXytYNoYs8j<L=X+7+wDHe#&cD=d}LvVg*&B33<N0RaH)tHs71}YJ&3gt!9aq
z?-ceVDdsKX+vE_o;_Syo{t}1l4K92QjlZC=hTr9-wu&<|LqwSKsgHI7hL?L>_RaR^
zeRzKJp`8aNUAfZ#LQc;hWX~7&Q{Pk{-l_b%oLi^)%wLx0Ox<Q&pV{Yd>-=8E@ntUe
r9o7zk9&R2@_a3924(BAEhVNwF!y{Jb<v!y)&}R&uu6{1-oD!M<%0-U<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa3d508daf8fb73fcfaf5896457d072d79d74b53
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND997w6XFV_4FUpE+UlGu$_0YOWPp5@k|4iehX4QnZ`O6_0P<x$T^vIy
v<|HR9Fizm*Z8W%X&lX6W_I~k};}Ii+<qYP^?DXtrph5;uS3j3^P6<r_LdPhm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5285ba672fb9381084e6dbb94628800a8ec7e294
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND99h+6XFV_4FUpYeYoRXQJ&IPSISg!7bwJ9666=m@E-_dE~tTwm-lpW
z45^rtoFLKXAi%*gfwjfQ$0vZLrO}}wQAB`=VP7a?eq@XHd!SMVPgg&ebxsLQ03P)!
A$N&HU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..713f79e29538381c943bab17d9a2c571be3290d8
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND99h+6XFV_4FUpYeYoRXQJ&IPSISg!7bwJ9666=m@E-_dE~tTwm-lpW
z45^rtoFLKXAi%*gfwiT_$0vZLrO}}wQAB`=VfRzU+`u=RfGQanJYD@<);T3K0RS-G
BD{BA%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..efa584d5b229dc735dca66615497474bf156d908
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND99h+6XFV_4FUpYeYoRXQJ&IPSISg!7bwJ9666=m@E-_dE~tTwm-lpW
z45^rtoFLKXAi%*gfwiTl$0vZLrO}}wQAB`=VP`pGHur5=8=z7KPgg&ebxsLQ046ai
Ai2wiq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..78a7e8614ecbcf974e46f258aec58bd1ff02545e
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND997w6XFV_4FUpYeYoRXQNGT4)f6C~r6kBNnBo8b|C@CkI)HpxPZ!6K
wiaE&%3yc$Zc^eIG+_MD|r@ddi<#@!%U^#=iGCMuH8K{uK)78&qol`;+002BIH~;_u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
new file mode 100644
index 0000000000..f882a63bfc
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/pulse.dmi",
+    "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",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png
index 0bf0af4613bb533068b4bf692f068648379b08b3..4c79d3db74d3f67c2ec116c85243a57783fddf25 100644
GIT binary patch
delta 185
zcmV;q07n1G0?7i9T^Sx89xyRBV`6N9euq6fMM_FaGBPr7aM$gTc0YdxL9z0(@{IOI
zuz-`20E6VDnUiK}PMRsC02FX9nJCzi1_JFJ5)(iIo*f-+<sgujCSCv(2#;E|DoHg=
zNi}Sd64=!6sL)WQ0EXmfhAdOCp{$_{3_+?4$uSH`rf_GmDuo%ThA9Ui92%so6r>c2
n<Z{*^RaRs^P$Yn1U;z~XNOmI1b#9G;00000NkvXXu0mjfhnz;~

delta 185
zcmV;q07n1G0?7i9T^TSjHe+IJfqsV`9v(eAMM_FaGBPss_fU0_c0YfHL{ULe!SJ#|
zuz-`207FJoM^lGJQ-_cOP{1vvqoaH#2$YqJH-H2@%F8R$Kw#!7u>_z%Sk$UjlT;&>
zR3jHn1e+Qb6&k7(z%V(QVU{V_P}Wceh9Fgj$uSI*OySOARf;rHjZ_XmI5bFEDM%?4
n$>pp;s;tO-phy72zycKjCle$Ft9L3<00000NkvXXu0mjf4S+?S

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
index e7bb7e033b2a2275f59e04baf164e2e20a8b203a..2a8f2aca635b337ecc39c16233c2655c6884c98c 100644
GIT binary patch
delta 198
zcmV;%06G8M0^9<SU>_bH9xyRBJv&8#euqj*N;y1PR$Ot7m7y{+G7GkcJCT1ve>6ey
zj`ohSj6|@2lal02sYR<6t<qYwN=N}H;L);BFs&Q}GSb8rfCRkK($YIXpuAk70Vog=
zIdf)_YPgbW_#`E;sS%N(p-KS^#nB9vreH%^L(jeqQe`NPXDBj-x`gN6Ri$tv)o|qi
zm@|P&l$C;%LgDTPDhX0$Meu=292i&w7zP#q0BG|pVN^Yl2mk;807*qoM6N<$g64cr
As{jB1

delta 198
zcmV;%06G8M0^9<SU>`6sHa$B<fqsV`9v(_cN;y1PR$Ot7m7y{+GE{jH0g-<~f3!kT
zK~cf5^hB_LlafS7<)oRDW@=8FDWm`ta4(rTGi?<Jq^F5Z010@erDc_az^V@M0-!*6
zL`TOW)hH#^sHTNrQ^O-dLzMy;7DqFzFa;aR8hZ9^kSfFCc!ou$P?zxByQ&mrq#C6h
z0COf#iLz3VQYhTrKqWz{tO!0(90>z!0K>on095`hr#+Hs9smFU07*qoM6N<$f)Zs+
A<NyEw

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png
index 3b359fd89f95ea1c2b0b2f98cf5da5f31e82ddd4..8f20a813521efaf207fdfb326fc91fa9d084c333 100644
GIT binary patch
delta 314
zcmZ3<a*}C+L_G^L0|P^2NcwRg#aJBV?!<WWq)t7M!&%@FS<Jworwqc36-({QfP%UK
zJ|V6^+Q8IJL0LB-G^MY9#_prXP3@|64Q*<++*D9fx34^?pk@#nnLK&QYzYY^MH{7m
zKn?sQL4Lsu|53ox-g(PFHqG*MaSW-Llbj$?<`BT>V#LM7DJ(9|$hJ(t)zNXI$wY_b
zWVY)U0zMWAieC+w*wH88e%*mBG5N6OJ3X~?$CTn$$H<hwXUh__D!#+Y;dACvk8I;D
z-#Mn~e){@BK|w`jWkz@QHabR3ZfyMAW3_#wpnwKbZXi?Ax!qiMc#M6VoSY28_t=Ik
uX?UZx&$>Ne?#aq!3}+u2Uu0!tWMD|vS9rHe(d#_WnGBw;elF{r5}E*nxN^Y&

delta 540
zcmV+%0^|M30;vR$7=H)`0001UdV2H#00HnxL_t(|ob8q|Yuiu|$A2oKvm<DWDK&z2
zXa^J5xCwah*s-O13IUI5iWV<jN|!8IL|u&n(}s+J<`cLc3=T$B$j}ZQRD%(1K+!jN
z9qbc|V+VI=+(Ca3@A2N<yWibCBx&7lmsRS<N~7lhIY17O1AqJv0Qz+X^S^#qGOs><
zsQop7<L;~T2QLA5e*4>8n~w*Fm}ZGay>@A@*B@fpO<czVPyo8)?yGsmLMXCZyK2vQ
z$Cq;hfb!Z+067c*%WlHKA&q*C^2YjHfYalXiT}nruH&IEGPdov3LuFi3PusrEa5sH
z<6n0GFkajPAb$);sn6;02}vAHs?Z-^Iy3MG>DaO-ep=<pQ)QZ^3x;7hLe^w1Rr>t<
z5ddpHKFuw&v>@;YynbcT>knzvYw7s@gPSH~TU(kw+b=mF3`Zn!G=a#_-@5yZv+)r>
zXR-pQR5wZDh+yj1>kltvElT2ua5_&fVQ*S8*-YYyj(^wI0JfVus$diWI2#{PscsVZ
z0|I}L+K3%M$7^fb%^fA}nH{q}x-4c1XC);Q+eW>HZEb0GYgc9MvIl49S4lJPms9F&
zCK6O6Es^XBMiFQ4%~C<G1X%P>m@PYy-iKu~TUHBS#T~D$C2@p2|4Iuha9vvY$0!HL
e0djyG;1v%ZcIHDV_9wUi0000<MNUMnLSTYDr}8-f