From 43c5919307c6dc75003d7ea8d05237178e3e7c77 Mon Sep 17 00:00:00 2001
From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com>
Date: Sat, 19 Sep 2020 06:12:18 -0400
Subject: [PATCH] Danse's Gun Changes 2: With a vengeance (#9878)

* joe

* Update bullets.dm

* Update boxes.dm

* Update automatic.dm

* Update minigun.dm

* Create dansemacabre-woodmanstillbad.yml

* Delete dansemacabre-woodmanstillbad.yml

* I'm stupid

* Update highly visible and dangerous weapons.dm

* Update bullets.dm

* Update bullets.dm

* reverts bluestocks

* Delete blaster_cabine.dmi
---
 .../highly visible and dangerous weapons.dm   |   2 +-
 code/modules/projectiles/ammunition/boxes.dm  |   6 +--
 .../projectiles/guns/projectile/automatic.dm  |   6 +--
 .../projectiles/guns/projectile/minigun.dm    |   2 +-
 .../modules/projectiles/projectile/bullets.dm |  16 +++----
 .../dansemacabre-woodmanstillbad.yml          |  42 ++++++++++++++++++
 icons/obj/guns/arifle.dmi                     | Bin 5807 -> 2850 bytes
 icons/obj/guns/wt550.dmi                      | Bin 987 -> 950 bytes
 8 files changed, 58 insertions(+), 16 deletions(-)
 create mode 100644 html/changelogs/dansemacabre-woodmanstillbad.yml

diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm
index 64fe8abcbbb..ece33a6b874 100644
--- a/code/datums/uplink/highly visible and dangerous weapons.dm	
+++ b/code/datums/uplink/highly visible and dangerous weapons.dm	
@@ -36,7 +36,7 @@
 
 /datum/uplink_item/item/visible_weapons/revolver
 	name = "Revolver"
-	item_cost = 12
+	item_cost = 8
 	path = /obj/item/gun/projectile/revolver
 
 /datum/uplink_item/item/visible_weapons/submachinegun
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 19ab31f7ec5..1aa1fb36551 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -61,7 +61,7 @@
 	ammo_type = /obj/item/ammo_casing/c45
 	matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
 	caliber = ".45"
-	max_ammo = 7
+	max_ammo = 9
 	multiple_sprites = 1
 
 /obj/item/ammo_magazine/c45m/empty
@@ -114,7 +114,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 600)
 	caliber = "9mm"
 	ammo_type = /obj/item/ammo_casing/c9mm
-	max_ammo = 10
+	max_ammo = 12
 	multiple_sprites = 1
 
 /obj/item/ammo_magazine/mc9mm/empty
@@ -191,7 +191,7 @@
 	caliber = "a556"
 	matter = list(DEFAULT_WALL_MATERIAL = 1800)
 	ammo_type = /obj/item/ammo_casing/a556
-	max_ammo = 10
+	max_ammo = 30
 	multiple_sprites = 1
 
 /obj/item/ammo_magazine/a556/empty
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 7086eba4117..e70e5867ee8 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -20,7 +20,7 @@
 		list(mode_name="semiauto",       can_autofire=0, burst=1),
 		list(mode_name="3-round bursts", can_autofire=0, burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 10, 15)),
 		list(mode_name="short bursts",   can_autofire=0, burst=5, burst_accuracy=list(1,0,,-1,-1), dispersion=list(5, 10, 15, 20)),
-		list(mode_name="full auto",		can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2))
+		list(mode_name="full auto",		can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
 		)
 
 //Submachine guns and personal defence weapons, go.
@@ -121,7 +121,7 @@
 		list(mode_name="semiauto",       burst=1, fire_delay=10),
 		list(mode_name="3-round bursts", burst=3, burst_accuracy=list(1,0,0),       dispersion=list(0, 5, 10)),
 		list(mode_name="short bursts",   burst=5, burst_accuracy=list(1,0,0,-1,-1), dispersion=list(5, 5, 15)),
-		list(mode_name="full auto",		can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)),
+		list(mode_name="full auto",		can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)),
 		)
 
 	//slower to regain aim, more inaccurate if not wielding
@@ -276,7 +276,7 @@
 	firemodes = list(
 		list(mode_name="short bursts",	burst=5, burst_accuracy = list(1,0,0,-1,-1), dispersion = list(3, 6, 9)),
 		list(mode_name="long bursts",	burst=8, burst_accuracy = list(1,0,0,-1,-1,-1,-2,-2), dispersion = list(8)),
-		list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2))
+		list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
 		)
 
 	var/cover_open = 0
diff --git a/code/modules/projectiles/guns/projectile/minigun.dm b/code/modules/projectiles/guns/projectile/minigun.dm
index 49c1c09837e..cffc5ac214b 100644
--- a/code/modules/projectiles/guns/projectile/minigun.dm
+++ b/code/modules/projectiles/guns/projectile/minigun.dm
@@ -129,7 +129,7 @@
 	firemodes = list(
 		list(mode_name="short bursts",	can_autofire=0, burst=6, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2),          dispersion = list(3, 6, 9)),
 		list(mode_name="long bursts",	can_autofire=0, burst=12, move_delay=9, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(8)),
-		list(mode_name="full auto",		can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2))
+		list(mode_name="full auto",		can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
 		)
 
 
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 080d7818dc7..0df487db807 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -128,11 +128,11 @@
 	damage = 25
 
 /obj/item/projectile/bullet/pistol/strong
-	damage = 60
+	damage = 30
+	armor_penetration = 15
 
 /obj/item/projectile/bullet/pistol/revolver
-	damage = 45
-	armor_penetration = 15
+	damage = 30
 
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
 	name = "rubber bullet"
@@ -181,17 +181,17 @@
 /* "Rifle" rounds */
 
 /obj/item/projectile/bullet/rifle
-	armor_penetration = 20
 	penetrating = 1
+	armor_penetration = 20
 
 /obj/item/projectile/bullet/rifle/a762
-	damage = 25
+	damage = 35
 
 /obj/item/projectile/bullet/rifle/a556
 	damage = 30
 
 /obj/item/projectile/bullet/rifle/a556/ap
-	damage = 25
+	damage = 30
 	armor_penetration = 25
 
 /obj/item/projectile/bullet/rifle/a145
@@ -339,7 +339,7 @@
 /obj/item/projectile/bullet/gauss
 	name = "slug"
 	icon_state = "heavygauss"
-	damage = 30
+	damage = 45
 	muzzle_type = /obj/effect/projectile/muzzle/gauss
 	embed = 0
 
@@ -398,4 +398,4 @@
 	muzzle_type = /obj/effect/projectile/muzzle/bolt
 
 /obj/item/projectile/bullet/shard/heavy
-	damage = 30
\ No newline at end of file
+	damage = 30
diff --git a/html/changelogs/dansemacabre-woodmanstillbad.yml b/html/changelogs/dansemacabre-woodmanstillbad.yml
new file mode 100644
index 00000000000..f36b13eb860
--- /dev/null
+++ b/html/changelogs/dansemacabre-woodmanstillbad.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: DanseMacabre
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - imageadd: "Changed the STS, WT-550, gauss gun, and blaster sprites."
+  - balance: "Full auto nerf, rifle damage buff."
diff --git a/icons/obj/guns/arifle.dmi b/icons/obj/guns/arifle.dmi
index f98364d755cde279bfe1e374c950240cbd37bd7a..2ad8a58f09cd180bb23d3a547b8bbb585f18b1ee 100644
GIT binary patch
literal 2850
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

literal 5807
zcmb_gc{r4B+kQ+!5z3x4l2rDREz2OGQX<JVrc`!D_I*f_Z23ukQivptvCmirBm0t6
zvM)1?WFPAcGiK&}`o81)>wS;+J-+Yw{+VZv`@Wy^zMlKKuJbzYE8*r1(?bW39s~g3
z&=oUdD*)gC{{kc)F7S8Ru=XbSC<(K+4KRM_f8WpDH^3d~0{|g!GWxF{Y*7{5PYU#V
z{tm9d3dl}=Zzj4TVkCP@$P6v}d1eL9d6@H5Rdx(=ZrxsM+g1JXF=5nQa~3W-+6Pbe
z+Sbq!^wss9`-XrkU+a-O$>V0eb*uT%SK6MJR+YY-VEJ#a=Pn)RQPWpH#4@^8a}^gj
z31NJqO3cTv-=D0w)QAd}M%+x_YX5f8I{fXCl}#kk2zK>F?2O9SxIqkirh5PYM4GM`
z8(N3FS(%*lbaaj4UZY63o17$^asK;ziPzz?J~-SN@6p6U&gbiWPFp68e^+9=M?A{O
zsugZh2l9DiR3P=`hOa(Xwm&t{Fp+*}SUs<@23NUyR!KG;?k&XCFu16me&uaie_L4C
zJAHCNf!dEOZOUc@Oz=T_PiT%dVKbt?*LZUvM?dnQjMXj0`2&KMzT$xK!TW&V*(45w
z_o`e#TFXBTc<pb-w1l@TB|Hg@$PX%Hj;@7r0I74RLObT43Fjh54nR>^+2c;B<Ka%`
z?njPa&acQ>1X_56Ools?$(+IDviaC_Bs)eeQsRwnBm`J%&m^=i3>2*ym7N$I-&e<z
zo=`i#yj;>wUe~&CNX4mP=UkduK$~-gc$-se%q&W!Ff4q{jdf=%L*WiYim(ee`Kj+*
zJe5P&)FIw3Z)7UrY6$Hh9snSjd#)pA@A!UDi3K-%9~O>{iK$9hEmg+oq<sss$W6(e
zUwpp(@Q0aP{kP18Rs>=D&QAW0!yEQO?oUD~26Jx~8D+_q7kluHEL3d1M4^be($A0V
zmOi#XF_-qawxPru<p9!b!s-XnFIi1|LEB;=5&-Bmmc6rL@#~c}KJ5u+APDwMW=yVt
z#~#^7;@Q|}i~?}7Zs%*`I#&++=H*W{om3c}&KqI5rv#9Q>`el&&PJ>+qJ_71d?Y0$
z{h2X^V&k$%V+`wDsLN#J`ph>(j&A6Yj2;$|@>1a`V@-MQQKZo1<Z1rB&Cc!X28q+V
z0=M}NHKnZhNnDC8BWGJ3`13#y5{C&8hAT0zGuYoXB{@04SjJMtRyotN&bNa-RNGhX
zPsZv<Xqs7;po-S{bk{A|XJ#+ehUD|Qe&xUG>B$@JjH+<N2VIX~Hyi|Zx-BZ_7qmmD
ztX{&7Kk!k-9@x&^rDr1*#T>tp@n_S_42A<`j~tlw)BZj=Ik|yLVq+#;glpHwR(gK<
zIfsVYsVO(q)zvloEacm=|6ad0!S?cU-X>hznOqzOqA?gHFC=mwPzoO>$f7o86L7am
z^K`P>hKUieR}1~-m#ScU?^ykr?J`Y@q7`_&r*;hZS?Q%qe`jY81i(#EC>WhiSJl^_
z3h+x!O-*cSYNFHpvMotlSj_@FUb4>dhPas1i+o!YhCo1w6I~n}9e++m(%|PVT(Cw&
zTjc0!zx<TRW@S1rY!cn(%KC1QdNLH0lG!yUPv+xw60ZIV-`aX(a(%dBub+M7HFwx<
zgcD$ZM5-J~;9MmVke)tdGTCT2@MZ5qpt+^R$jvDoj%lL0bj6(#>zJ5$Bf2FLZE3v-
zO{YyKCMJ%}%;X0xF^wYEr7kN6Z4SF&FS4eljvq<Tnn~ac3%fy{El$VqQ9h-mrG<^%
zkr%N>-v)u_>wT8Y?<z)N?e%;W?oR}bU^m9HPtXQBI=Fg%ouADY2wOL;V4Wk8TFX~f
zR_HUH0n|VT1#;(wL){OKNL7f3S<pzodNXT-wpR?qx_f$_%kg3>EAt0E)It0bF!qCk
zX<e~*BO)A^S67|Ay$=m~h+ypxDJUo$Ek{J`{yyVI#cH1Xazdh=4yD7R3;R(8-bmyy
zrIG0pyjS`_tZDKrc|tPQmN?dt%i6mB)5tg1OVL{QxGBcwl1BFB^I2^j9Z!FyPdh4~
z*3i&+VJ?@}=VFN-6in?@s*w;0LWHa33;xxi-6iN&$eLRTQAa5CKzXB-*f_1gMd2o;
zOqy5{F4r~65j%1sm$R3l6^gLM*i<w$lt`esnqzX+Smwf`p(_}#va&J(JRToHU6z<x
z4|z{bo1`<&{vhx-FpN6qhD2u)l=p1W@93@mx@;mPHpk|YsfgBd0mkd;*=-52ZYG0<
z?M#Jw&ecR0NGENlZixWE-Uh`lzo1Ge@mg-pHpD7x*8}2~ihi&9ECLX;T#||8H8B3F
z3Op0;0Hm$N_eGoC;{#;k&i!8p*8bj;9mz8{H#h$9&P?ZE7#pgozpwcc7;*0h7MhLj
zIy)OZsIo%{w3G)d917z%P-PHC*Chbup5L1-wIgDpqSfYdWQMMsoZJ(|D2&Z!gzo6F
zOm06f!6C~*eT?VR+xiL01|us=qA!(6bUPljNL-+jDh&&~CYPzyRLSA8by@Obi=u%j
z0aRCGIL%l-qvhw%mt4TWz(9@)=V)OK9zRY~ZnROVWxk1h^w|}(r9=052@G(Uri1|>
zzd@%O<{zqDLRUpr*lvYgj29PUfBl+LbidnXs3Qdzg*~rX^Ic=ZkALnmp{a?#IqY+2
zBO9~4yln8a`4JgEC1&6h*3C)HSFe`MzQo7RKXi+TUO)PFp$3Oj)z#%Ak(`5nEIb4c
z;memVT47Qf(t-7F3phu6CbV!+vc|;$(ESd|8mAeP{q*o3;<Ag(>CN4S7u<s@<27-&
z(Hqm#)0cRintY15-|y=G=*BfTum14#aa$N3iBgF=n{idje$6MYG<TaO3z(Rg7=z&(
z99(ny1Zg|VRKJm%s<MPpCMWYw^=Ws_NJ2?n*XZRh7*JqnXb57r=jWx8qbAYcoSc&v
zj#Xur5>8Vf#*MIui*HMb{YW35<2(4cxcz;r&cPd01jeQnJl47QJ5CME3mO_Wi0JU}
z@Ob;I@NN&UBBf5rG>ad<el=cDQ!5yS@7<sh5ZknBO;T6aGjVb8k2I6uu`ia?cuoC)
zM|fC+V|9l@bYI_f-H<hdD!O(aQ-{$Lj{!+<i$>cwLihz~K>k>ujab$~{L_~x5OE2y
z2l}~U8!IwJ%;~C8#T>oxpt}qo#N(bg;@9??YfS^rSYSNRE0l}sm!!Ie)$v6qct<!?
zO!njMJqV;`Bng<0dwYq5gzdjOS8b~pq<U1zpqcTSQyX_Mq7fpU?>kL_{5wVQPZHxl
z4>$@$t8Tdnv>tnw-<$#5d<TnoY1F<{XX1{iJ$1FLE~~Eo2v9lAO+q4rv~gJu{x8b9
zN1`UyP4wh`%hyd_>}^nK@aTK^pd@zqzWUJ`_!316c#s;jySrk**ox2m{K`x=LI7ve
zU3b-nW1)j8l+YIQRLSZ5&}R$zpF~Tb%j7LsnYV5F{Qdo3ODff8ON@U>))tSwJ{<U^
zug^Vdf3}cc=?0^zNq_ig)zO-=rHgb115Rwps^gEcEMzHZa=HIztvS^|X^G3Zzb_{S
z!EjJ(DeF(DYj=Q-<12<rQQEjW<Fra<ZDx{xiM9Mk8}ymX-fw}E8EV+!@ywJ@v6<Fr
z)Bwlb)$dIp;q78~F!WaZ6&w`d;GiSy<%5ON#{Lkxz~hVz5sVG`ojv9cfrBiVB33*+
z&Ye;U0+bLi4$%c+)!}_*70D}|!NI}n%cE*-<VXGVDaNVH-UNHh)0h|z+4L)3US4?_
z{C!d0u#XpQlO^N!BRj#kbF+qy_XA1Dm>uj6^XT{|W(XSdrPZWKgS-SG+4I!aG4mGl
ztQevGkzSJ!apJYD@O6fE5MB(r#!|1Z_%rFu^oDbEsg)BGVe=IUWAI+&z9W`f>opt+
z|4-EUhki*s8$#Bx=g*xxOg9l;QJiN|I(PV@xi)qi%!&qL;+osqo^-iX#Xz4}iC-ks
zwd3<>1O&N87`Ue;zW1X00e?i2ADA0aTt*n1SY4jSd=UR$_wLjoQt}+Ba|Eo1YHDiR
zbOxLown(({RJ~1a%`O~p??OWeEu>Zf*iRQ1muhSIxNzF){tbGcQqd`xeXK*@=Q7-^
z%cvK%`SI3CJ`e0st774XPoP8dtWZ176(J;sxm>Kd+%5LhlIqClXfZp~!$ZEji6?o?
zIehYH!}nu*ZrAvaO|Y9;&KIZ!TNn9~$l1SVUVUIdl0aQoSEqeFC;3-?03PJbL`8w<
zyrWOV#dg-#RHK>E;74!gj*g9eVvk~!)i#>XJ3YtMOBIc)_JZXCJw)nE<_#HsHSzpW
zOp(=DfRT7UyKe~P5*gXZa;>3ahqr@&iob_5S~X=5l$MsqF8rLEgOGAm+#2a~Y*;E@
zdJd`UJIN17|1BskA#r#;<QORaVxBaA`H}=KMXObdG4OVsgM<Y@6?cVNDLALU5`}$+
z>lFv)3|>5qkFTh!J8+l1*h~Tb&dCu4KrOK3db&p7>iyw4X(Q=p6_^Y4`(H4|6BWwI
zBgLqJeqgK))*ynXQF(cJUx&u@w&#K#n~=ZI+THjIWK#`w^+E}X!=$W3EM;YdV}x*h
zbIH(K_jo+?{`e#t^xW&vM}<~rJ1y24O9={%9I1=2sgg6>?wW}G;_OxG%D7B=_pw??
zIlb<TS`AkwuP>NHy}iBm%9%n=*lm74FZ>=zp*`Dkc|NpwfvN(C!C!{bxrdFX14kd;
zRw3Js^m5}2QzlCm7Tizd9<GiA00wXC6`*=R#y!|ZK(o)49CQp1FW1uwHBxSq{@P}k
zBBlOEE39Y6{O{C5G?&k0{h%l`(&>z_W2jU?L4k8Xz=bVF8z%IV6^bi5&Y{L9VQOls
z3(8r!b05iW$rye_UAB9o&1qt4+CEz4DupyHq^kibg1=((Zl2-U4c$-)p9=8C`zWfG
z)#_=AEcOFhCc**`y9mG1$)$e4%^*rxTM!f5+}o}KBd&dYtMhJL%<qO@%8g<xRFt&Y
zzDiPKV<Ql~u&{6wRsUsv{-c@f5%5l@yA`~-xta2t^;L)REJQbjS4{bs?J;QNmSrBJ
zUEBnGXJ-*zb`w3gwosIN@pY#BHf(Qz6A0OwPvcsK@}wTu`|;}4E8}A8mf6_{ANik1
zYWna1^NWi{rlzJ$BEDiic^22%*(u;f15J|oC|G`!G1r&fQVX>&yvhva_2mndHlq;O
zQEtln!8hVcm!7pd`;zluR|{Ct_h#oD#~WF=ebVz^8w~rWH-7bwkx0^9+}!7MbR>70
z&IljOx0XMVWo|UQeJO!5#9;sRK}!GKM4i7WA0J<>w)rhCE-uAfQ`^45;vftG1Mu8J
zh3wkxMWragn<DJ?MGp?%o@fl$ERQA8x0mv56=z!FctP7A3qtOcIf+CwGFeu|)<%j!
zJHB<Hn=W@V+idQ4I-h%a^^`@2XD59;jH{WoR%U+VhDYU2RaMnYtbqQSH;3@S{U;pm
zb@R6azB6qHfU@V5%RFyjsN+VQQ8PNP1R=lsb7@|Tdl*8+T;EUPkVy0==Cov*z+;;`
zcPgr@XM2y$o`NfiUUGFkeNji}91K>b7qRm#bDyecqEtPEhb{%6wQc(byzik2>CH9R
zqPe-b3urlBu>67LC^PQN@AC5Uyo}z5h)&#jZS7)sL&)JmtL}ktBXoG3|L?Dc$`Lh`
z?Nph5{d;r6$6BpWMaM1|IwnP_v|TNH?16nQ-J!9ul=Ce_knhl;xK+%V+t^D?DTKmp
z^le}*@Wj#azZiPB(b?Je8d_RBKn_ew|I?0>-d;gLTp<hNcMLGxjz`$peSejii3O27
z11xOM2tP@`7NFA&gTW~C$IB(0hz|G@&$PMhz?~@=upF+elRLR{4tLee?}eb1yDE}r
z_1>j<9auH4u;pui$lm<j4-eIIQV>lHVeQpX$R=1;DO=g#h2B`}5VYy$nP)+D7gWGN
z0KErx7~VzcWh%puw6?ast3CDHh^e>xFi$$Xx(cS77MU}l+FgZ2p$KBx0xKiNmaPbG
zIV;;8=+coi*Z(YV{%6IPAmHN=bm}^WngJ#bD@CY->2WG)lh2=-T@Sfg2y4i;Ur|>H
zua7^=Y0I9AYh+y~LY{bYOU8NoRPJCxMmOaiplIcB2DadU<wsa9M@ZY1^}ZHSNI=8K
zpM+xIW-+WmXl_Pw+`UGg??f|wT&R#f&N2`jq_^s*tE-=izSFK5oP}-uM1rw)P6og`
zU2`MnmX_`_vxPF~<NVQJ0zR`<e3}YlX>Bp5X;kW3_vu{D^F{bz%Ja{k4IRP2PjCD+
zIa0cQH)MC?A+unF8TPh>pl69DtT+I-!AjCPp)-Y<$qoz%kQPle91bMr^i;7r6G3sn
z9Sy4WR5cwPg$L}A(eph@bJsra?uLRY3lt?_S|D-`m9tC}J;0R!2oywHg;&(q9|TIp
zh-Oh8dxPjZae@#y9A4`?4SC)!Q;Hz0y7QE?k}ub>-UgvwFsCuyQNFRUu{nXrbF?T;
zxuy^9;>V9aEnNzsG}4R}MK|A{<yt~2J)`d{D?RvTh)5Lyw}IlStF0|q()PjKQ)`uo
zhKNb0i6iB#`2BWl(6+v0x+b=01j@=79ksKR&+uKJX>X=eyNzHGJ2!QLR~=gk!MscC
ztKy3)+Ql%oMYHHmVE=GZclQ-<H@A<h$Zza{n>wCFAQiu!?bIVaIyy<t5`g$2#21NX
z3fo9|z<Nmlxk@>{rAPR_x7Xkz!s+C6pqw>bj5^r|8aQQzg*EJ|$4}=_v^J!DtDH*M
zO+nyE*KmL>jRiNWC_m5AxtfU<KZ0xLpRCf>UKpd=vZ*C7{63+xihG)Y#<LRtvg`LJ
z9;=uz2o`-UQ+dDM{`}^(ga7Jg3$kZY<S@qgVUF>=Z$JMWm=HGe1Cpbqp}9p@GhcN^
z4XkhKBEYhM#ZM<Mc3Cr+cCSC2czdJ3QF$2b9ZlX#y7%%%Q3Vz&l3-DG>fpX{j&I+;
za{%H{s6ZqtMEj1+#n&shPW^#}j&p#7XuQ%H1eC*cEg2P3|AiX$I!vrtaXuI*nQIOP
zo-KQNVE;^qPcQuS-#2k^cgtErO3Sf?mKLgqB^I32sgeTZsqv>hg2x7mEMjvm<&B6%
jTX#sh{F{6G2%95}V=%zB5?b@8AARNW4dYUyyN~|?b*X|Z

diff --git a/icons/obj/guns/wt550.dmi b/icons/obj/guns/wt550.dmi
index f9eb6b1e47d8cb5ad3b0e5e4d2d0df6cb651132e..db6440d547e2bf9b274970a64d661a260dd2afab 100644
GIT binary patch
delta 825
zcmV-91IGN@2et>0B!6a5OjJd{z`!ReFfcPZ9UmhyGBPqTIw>hB78e^;Txf0(1|}&k
z{{R30W&kNDE&t3jBJmg%6%`#F9ZE_{78VvcK1VAqG%PPRARr(iAt4hJ6FxpZB_$;Q
z001^GFDD`*SWiz-NJzlIzzNe-d;kCd0d!JMQvg8b*k%9#00Ewnn`(cCXj*iQ2<tM|
zF-F&AXhxPUBXV?EkfX_j98Kf|V0=ynLYE1WE)0c5I29@@xca$(qa6Tz0)|F+>WS?D
z00LA=L_t(|obB3iSK2TX1@KqfEfwtqDQM;r`2L^LCZ&a@c`b32#O?k(N0gg}*XTdo
z0}%iKz>Q?t;Ma%5@+^PL^DMu3BL7NW{OCN~EdSXc66ND#S(fLk@^UrIpPr`k=Vy~w
zzfNDH{N-gjA6#FZ^L4R#-4<I>3sKkgF7NE>)joxs-rhH~mCb_Pt~M(=&CmON0=c;Z
z^I*oW?YEu~c>=k;1G}QPvV<T?A@A;>@&5ZmQbDp=L8~r~o;QEDu-TmQLdvz2?LCNO
za(XLdzu@$g5DDef4Bh4*@(+2$&N~-3kYwJhSWhpAodW;>006*0?pySOOZ0nxn|u4a
zYO=qpeEG%o-n_rQnz`P|WA}gP2hk74?*Gsaq95$U?*Gsa0ssI206^km_k%NH_k%pA
zzpG~YJ2r1Wf5?C5?dK22`JCwe-<;_E-xVil9^&<X*PNi;Ay)tAq15;UDPI3Krqw~8
ze~aG#%}p4+|MO0$RX<@W{hu@8QR(3`@%z6sMcPd0?vPafrxhLb{IYo5;{yNy00000
z_#V_UZ)tVNd*uWFo?jo_PNfqtxU%z%Uh?{;L9r9E^YMR!`xcw^?)6t+O~Z0*7$|*%
z`3&a>%nOEWFfPYV+c1R>J2<yL4UfQX9I%D295d`Tp8sWbaBhF?96`Hr$PV6eOdrYr
zhvWvIc!9wYup6`Z*YYLd`+JUH={_!WfAoU@000000C0Z`b$hp?`C=`!0b9t#g!+)g
z@rGA__ZBT${oR-Ub8$8aZRi#gSpD5!SoH@00RO#D(pIn4+ks+500000NkvXXu0mjf
DvV4aX

delta 869
zcmV-r1DgD{2ipgbB!68{OjJd{z`!CRA}J{;85tQeGBPqTIvpJyN=izZ001E&A^!jX
z0A>IwC@ufYGXTs06%`d078Vl|6DB4m8X6iUB_$vrAQ%`J92^`J6cj!_J~l5eCn6$P
zPft)tNWj3rb6P%u00001bW%=J06^y0W&i*HntD`NbVOxyW09<4f5vE9bdAW;WoSm0
zE+cYuS&*a2gd9!e1VwyK211t!k}gAZg+(|ODl549xqzb`0CoU|K#4iSZ2$lQhDk(0
zRCt{2nu}6{Fc3v!6G0RO6kkdE|G#NMYf3@_jY2n$_tfc(++<l+=!|E|7ytkOunspj
z-ho|4`A)<6jynr@e|j!%&+OL9O<0uW-CbFh;|_RPjr05a`TXI*<n^O{dHK`ReD3Y9
zZQh8YY(*=&P6+YL4KKrcFRJGZa`svkqU~GJ_j-YTx0v-B>fBs`Xp2^asPu(U=febf
z-*w&F`}^C+haPRkzhBL1!j!q0V9_0K`$~_P3-fqZx_AAPe?zV>;k@9p=N%JF|H}LR
z`-!E_SyS0u=utP_@GH+IXRl(s;B-*m3OtjXomzHsW<G^7$t~^z{V-*gFJ1w4t`|h^
zflP9}f;aXG#!pc$IRF3v008*k{0Tp}iQoHe9`<+jtiP+LxwAizkM`FK``w({|G^K!
z4^sO-_(AwVe{%l^KX|R2-2cH30ssI20D!*@wI7^?+7B)^XTLva?cBuQ9lt*q&rkd7
zh5gff33C6p1iAmaV1l&%?~)0U`o92Dx)UV!e^Zp)tI-Il{ohiD<o++%p^~;ka{m|Z
z@L)U4#{Zp>OqmY7qvZb2K}mK{?jdsj=irZz<>3F8e}Ml3000000002sy0i6A!T*&b
z>{T>Udl?B68ka*qlT*geIw=tCFxp?d@z7$k-rs-mZsy7{H;`(D{tVs-%n4HpjO3VG
z#uq;4`bqsM=8j+}oKPYp#|%T6z`Y!8JXT+MBRCdLsW6pe=IDWi|B$i9XHMXZAX+#|
z{9K_VTfKf@1lxRg{k;Cx{Qv*}00000002`qa(nBc;$kh;fNjJ~hiae2c+=J2wMkWf
v*CqVDxFJb3beoZ={;p4&`U3y}@bCEoY>BF?N1JCh00000NkvXXu0mjfz;Bi}