From f10f3ea9239d91df2b3c9e73eaf7cad6b7bb9921 Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Mon, 9 Dec 2024 17:49:42 +0000
Subject: [PATCH 1/5] AutoCannons for Mech

---
 .../Specific/Mech/Weapons/Gun/combat.yml      |  23 +++++++++
 .../Specific/Mech/Weapons/Gun/combat.yml      |  23 +++++++++
 .../mecha_antimatrifle.png                    | Bin 0 -> 1538 bytes
 .../mecha_equipment.rsi/mecha_autocannon.png  | Bin 0 -> 2593 bytes
 .../Mech/mecha_equipment.rsi/meta.json        |  45 ++++++++++++++++++
 .../Explosives/explosives.rsi/meta.json       |   3 ++
 .../hitscan_tracer.rsi/grenade.png            | Bin 0 -> 625 bytes
 .../Projectiles/hitscan_tracer.rsi/meta.json  |   3 ++
 8 files changed, 97 insertions(+)
 create mode 100644 Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_antimatrifle.png
 create mode 100644 Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_autocannon.png
 create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/grenade.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index 0ebfdc56909..071c2403dc1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -44,6 +44,29 @@
   - type: Appearance
   - type: AmmoCounter
 
+- type: entity
+  id: WeaponMechCombatHeavyRifle
+  name: Mounted Heavy Rifle Gun
+  description: A gun for battlemechs, firing Antimaterial bullet.
+  suffix: Mech Weapon, Gun, Combat, Anti
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_antimatrifle
+  - type: Gun
+    fireRate: 2
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: CartridgeAntiMateriel
+    fireCost: 45
+  - type: Appearance
+  - type: AmmoCounter
+
 - type: entity
   id: WeaponMechCombatSolarisLaser
   name: CH-LC "Solaris" laser cannon
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index 578086ce939..cc71879d39d 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -47,6 +47,29 @@
   - type: Appearance
   - type: AmmoCounter
 
+- type: entity
+  id: WeaponMechCombatDuster
+  name: Mounted EXP-220 Duster
+  description: An  heavy Auto Cannon as a mech-mounted gun with AP ammo
+  suffix: Mech Weapon, Gun, Combat
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_autocannon
+  - type: Gun
+    fireRate: 0.35
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: GrenadeFrag
+    fireCost: 140
+  - type: Appearance
+  - type: AmmoCounter
+
 - type: entity
   id: WeaponMechCombatUVM31
   name: UVM-31 "Drake"
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_antimatrifle.png b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_antimatrifle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3495a1e2439818067c862b1ecac7bcb5991b6dbf
GIT binary patch
literal 1538
zcmah}do<Gx82&9WX)`IMFE#48d|j0I60*6EgpiQsQn?*!E@`<8DN2QKL}Ei|5^F9c
zWYsLmE$JhR&0X8DT(&jyTc5t~AOCc|=bYz#&Uwyz-t#`^J?Bk5>4<?V{Gk8<0Nl>j
z%4Jm(e^Fj;wbD_39jgL~bir5v)!k|w0FZ6Avob$*wP1D#7vvVD);2Fn7hUS^0;!;D
zxg$TqUBBMJ-<YnRS+YyMU#1e8dPB+P!~1)ux6GJdD0i_-PP*r;B-gHd`M9(=Kh;mO
zaniJFiZmr{;2nv&G{@T28OcOG{yN+Y#iJ<NbJ!_Df_7W1;iO1*)4#}+s^o^kwym-f
zeR!GpCT^idrIH>UPXehuxgF)749}&6s0tpjk)Lt8I#{)8N|lCbh;rpXv!a<>*#@N?
zw7lRZ4JmWd!y{;@MYwJjP*G7a^$uukgUlJ&mRgeeSoYOYbvBtymXB6`7u8xG@Pd)v
zp~%n*Oxdb?W{961g)FTr&FeuA-WGf^@Zg$!HMAIYJU?2}M&IBW{jPLH`#~1%hTeGK
zh#<zo+Ir($494^NG3tb;q%7#!XZ&;A<;y8Bis4pV-0tM;vFLL3hY#JW*M(Ki=HrW;
zws1N~%iY4XX|0J?0E^?5w#+L;MZsG&%hrX>v?6CSk8ym-{7`nDNtDYDv;BH%Cd0Oa
zy|q{!w&OU*Rj5s%@|q6$()deK!N+Td6%@8%mTD_j2bu!g(+;e7fjQs^R~-2TJ7`v(
zsoYI0V6c!vXCE(1J5D*u=_B}R+KMsCvTOxLW3iQdU-n`*X55Z_6!LsP@8F|sjCMC8
zmk7y$pD28BOV|jYd~|7G4KfiwKq;=TSD_#JG9Mvla-|=lq>!wmJNUj>#$RZt9WcrF
zBP9sWQufT^2pVZoY%G<Q6(oYwi<+SI{NQu~`C=$%w3qetg0gA&345ZM%iAEJ=J7;t
z=7>fQe^0_2mnVB2w0a2n`j{)5VRD`=nn8$rSy@TJa%4(XvC)_Hi7Gt4u_`P})h}T(
zFrhYf*5E!)ypIctZYxGmnd-rHZJAQ$cBrjG8b{Bvl;E^5cqe!u>%3Q>mO(c0Na4e}
z&7qtk^u|E3=TTnOu8ao(17{V&S{jvKH`2e014XgJYN6+JK+?6btZyPw{SS>Q9y3)+
z`B5wzo8rH3H@^+&?CgZm7CcakkrCh2JC{Ld#f}`SsU@Sj0olBx41_NYHhIwFgP41q
z8xj%&bC0ZU6gA7lAWpGgwtyt_aH4ZTFd0h8g(ok1;G3U_vgcRqDNLjn9*bwsF>ShD
za#`pM7ViuJDiOk;@jn0Qy<exOqCSU5tiE}WWYk`j{*%^Q<Lw<|;vAmmzwb1gqo{UB
zP{{d;r<W8IgnfSpcNrURSJh7;<r_n8-Qh`an@*F9!l<SII5a3z)=~@FCUeBZl9s0B
z-D`0;;%?pI{3U(}I<Z5-M2sx72xS_YDIlQxTg#G(_&9t$1|>D;$*37cKB#drgxRA@
zKmfN5w6%8)%+TjnUg@`<ja!j8?HoH}-_Qf|v8kYaa(86WSt$KDWHKsI9H@zWdV;G@
zf1d5kM1(zKumw}$lDmz;avt?sG1KEBEZ11~VwbNse8j$kk*iu5uM+=6*RRKyIJ4}<
zwQu?fnsoU}H@}{4XH56S0|MyaKs=Busz<(_B+NojCfF9BNY$%RZmq@p@2bJm<HM}A
ztzpqV5(xIU7W5SoC|bFi*w9Kf?IvRu<Ko2gi6Hf_o34bA6jLOP<H63?*eihmx~K3v
zu`>i4kf&3a@nU&vNO~8hkRub<us8XYA_2VLzrF`#BY?BheUM)<Stum(jd-be=|HRl
z!fivhz(L>4?QKZ9u&VDZ6Hz2BT3&k#E+VyWy6^ARz5n};|5GzFC(yTZB!x-4bYfPY
OI$&q*XjN_DoAeJWNDTr2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_autocannon.png b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_autocannon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c371a069081d959d3f8a17e99f88a6222eb28292
GIT binary patch
literal 2593
zcmaJ@do&c<8sC~2d5uySuc4AoHxb7fQU;MY=SUF>nGj-PP9}^dGn6+aPBmdXQb%5)
zLU{~%zu&LCCK@AeX1oS7bEmV;z4wpSy1%vd_wBXUx4*rA`+KY%Wo2n5E+Qua01!7n
zZ*qyR)4va4A-;_1^ibz30l!OT#^6nd!VCa=M$Ao&YywjjMsH!HA{2#|8yoBKxqm1Z
z#6=b*#&;RNY6@vL4Y7RTm3#b2v{25FO<&HORz{wBXns=5Hv_lreQ{CZcS3D*&OIMc
z(HVZZPd#r;PNWuNKJ<2Xg6h+=)pDwW$zLk;hQ^`WCnQP|9h=4;Z?f;bjay3PQ97p~
zIGCZyfAR7l1n4SAsBE1UHv}NX(!)MiML{A$_8wWV8qp3rNn}sU|6(%|min;6s(pPp
z9o@DM4J1=)Dlev?g`rsPj^Jfjop`^0QC24F8sDH0-Ddn7H`<e$qaVuNV#H)%t%feW
z(;++AL=n6NZDqwanOm1*ojGQnE_KNdzrpu{hiMpzjkPj*7>c(lh0`4ogJ~HaRoGwJ
zhoM-+BT{5nk|a6jw1{{{jP<AZ_^0kBR~d(}_F5OM;v;CdI|AT@Kdu={6D^;sRnKzp
zIPU1;00R?HxXUrweICuvkg4oeZRgP|7#&BlZ0(SVWNoPr1oYUwso5NxK`Np?D;W5%
z3eU=qM>-fe`|43waAUD)Go2{TZopVu7`lQvKu#-TPyThOwJxl+QnQ8>^UPP^L)aV<
zj{sJio;L#9hY!9_@u^>qQ^99I?mCAn3-7U$6$x7&o<kW;ZD}b$YW&3CX7}BWV7D-7
zcuu)2OqKd`??GOZ1Bw)Id!OsZ;u$Pe7zmawP7)Vs%^Cy5e37boj>xM=msPNS;Kq%q
zZxz@hpHC&^_y$6{d;N8T%7lQU-^M{nSwYg7Q_~2CXm+l)_5@t9U!7MUC%+Q0xcC5?
z-a}aFnlO7zvk|KxN+pYi2EK5UYGI0!#tRA?Y@@O<d!Nj;qKQoSd71Q3<?3mcs#tq-
zb4aU>=Apd05+(krOmB)z2imhMPHjHf@>_~?)qYlGVqzJC_pw}FsX&HWR0QpiF^l~u
z^;bhl?E8b-N_%@RUO&;$G9UXuUJYM7u>kLMg{b!2A?*)rA4|qM9cpkS%Z*g;u&0-}
zT!%6SYNI7N=BY-~_8EMpdnVC!U6{#Isy)1Gd5p3PI0kHdC$FA$$c(8IpfQ~03(Y}7
zz<`o^=uD3cvqj6I<?Ak&0!5b#wT%9cps;at>87HNe3i|gydHf(T3WMnX)ISOR5UE7
zJwlB=w@M<mjV|fE)FrNzIA7!<h(s}fE*g$^c6&UiMsadM;fk5HsMc$J3o>_)$(bRg
zr6-#c3S9k)4p<9+HS;il*yhDLT#0xm9%vvRSRoCT=cyL+fk-V3-~HMA{6hO%fRtfW
z`krhQG(LfeaZo!poT1CREeg`tJk_|t%|G$*j~X+BsGs)O=h;1Wb_*GE7b@v*hE{9H
z5np=+7k|zECWBT7=!I^5O{cA09FOA9T(3rJFf6miLW1gsni^~^qg~V84cxrhq$69n
zly(o0?pl}fU47yw9$n@N<1|E!CR@{$J_3MruKMvasc{KA5*{OY9-x@DHqJGv0@bS;
z)t5$sXL#U`x8?G*>^I?qOO52CM+km=VoN$dXD&I?UHW|FKuP~ZQn^emGQ3ObjIJbS
zZiDd4wVT|P#CB$VA#P!>-<Ryvf{pd6!LC^9*T*~8?L;5Sv*<goK5&@wUU>tBz61rm
z=g*HewbbB!B|&_ulKnE$aE~dQbsF;eDSx9z=8hiCvuK!3oKlj*nVm3BQ~*6X)yDp$
z7dwab4a<bCuCs%dc&2T3TAuc0)fH*DPalWmI|&S_y+5G4_QEXmx6i?+7;`ijxrc*m
z8>~WTzS^E47Z6csi;dos&b;92KNquHsay_8bT$GKUwFteH~3UDN89r;ZL>QYUh3M=
zk#5TM##cp`tJ)+P<r0*+B{oa+!#g3QEe`2-3Ft6~tEWHNH=E^sTNj`^;C(Gbf7&9P
za<tjqDnD&`W%$FjrzYC3pCdlQR<t)EAv0^Q`(c4~@Sk>D^zF?uMN$4t^Au8NI-q9B
z7o+#<-<M`Lc}M-rJ;A-}7$Q<5f*DvT8GEjtLn>RZRj=Q1y4-Jgx!8vd?YJjZo}=9P
z<+eDQ(!d6E_{)Vy6eDvKIwO^X4f=;#a?pD1%-DrS!a76?6~>x^XsT&z_rPR?(XWn9
zVmGWt!P)zZ4>*L4jovZhYNrQO6Q#p?=8jTkJ^P*N7>4)3YEBq`PZ+23$7UjJquJTd
zJA(}w8czrZe?-uEa}LRP6)#5uK$p^ieH$h%&$33+3NwaJtm1ItUL}J<g04>`dtquO
z+Y>g557^lhjqn<y>%X=SphJT{bk#*76}x?Rr(Z=WvaEHTQ$)faT-lnSV-N5HmR7@_
z>~P67n&t;H3rqcw-KUlD0kJsyYwt!l*PBt9QQFwJvQUY#?YWSp%NvX!K78Zr6xC)W
zMI_Gp6;xz<aYHIKTyNn`-NKVL@46K?$?O(TeKpm)t>P|J%tGnjk+bUv76W@chSqSD
zG7bs2FGMB|Y6qZ3Q^V-AkN3O>;ES(Q(%zj47=Rn}DicdM>Hb_f2i4O~xd|PlDo(&S
zTXYs`a)i_xr9WAbm}s#zVR`&8>Ndj5zXv{$Uy_rAnq<}R8!6>F<>ZA-!r>I7g`JsB
zLoGj{^5)Y^gg@%Y`q#ZMtyX<7B-i?jBYow~vFZa-M=y5q`4D-Zjwr}RoW4KyGr;8b
z9_RIkmkJoBewvaajXi+#Q&pq=%hoNrC_?{!5?eY^U>o*Jb7ue!2D%Xj<$I!;rhZjw
zzI~Y0&Md@YQh7j!PyBX!H>~t~TXYYeWyG905SPhXh_LPve{qig_RpLRwgvtUbe7Ne
zS%LTeWR(pwD)I+>Q>o{t#auLp^iyg9avkzlAa#5QMxJB`xuVd~({s0sI3z^MDRE$~
zKPiFca<H(3G>nis%hgG5`=o_M>&kBnF=ccJiMLgCVCrvcZ_E=A|NfArSN^4UX_g6C
zA#s)~zRdRb&Wy7Lz;S*n_r(qmS3)G?Zphi&qtG^QAL>5y4uWR)UqFtCU1g{xnJxs^
zeRQ`<fEm&t*bEL9(7#&%{W6t+I)T}ZUh{PXCLthjUhL`=q!&8M{~$~at~NcQT&MnX
z=|=VRlYAyY)Q%xo6Tztn5zj7j;aA3;|4?mH`>_W8|H>K%@vk|n8AhY`BLB|^%uOv#
J-Wa1p{|&;22vYz6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json
index 404ed5db463..3e29d643ec4 100644
--- a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json
@@ -223,6 +223,25 @@
         ]
       ]
     },
+    {
+      "name": "mecha_antimatrifle",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
     {
       "name": "mecha_solaris",
       "delays": [
@@ -249,6 +268,32 @@
         ]
       ]
     },
+    {
+      "name": "mecha_autocannon",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
     {
       "name": "mecha_firedart"
     },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
index 15ed620c3e0..2ab1d9c01ca 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
@@ -19,6 +19,9 @@
         {
             "name": "frag"
         },
+        {
+            "name": "pierce"
+        },
         {
             "name": "rpg"
         },
diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/grenade.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/grenade.png
new file mode 100644
index 0000000000000000000000000000000000000000..56a8a191fc3dbf6ea9e2ac49ddc9f93304b62906
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ;Sk64t9{@kfAzR5EXTlDi*;)X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_$<ayCMN0f%QfLw5!Ery{-Fw`<1B7Oksb<eOplX(p
zPQ=ArepT#!MF0^5F@u=IOg))d%))bg-NVP%yBN>%KKJM7R|+Nrd?N82(+!JwgLrz=
z(mC%Fhgn%th|h_~47wokBiCh@-#C{X7I<dZ$foCs!^C2#i{&n6WkV&NB91DmM)^X{
zWrgz=XSG^q?R)YUh6>tBhU+wkk-!p?NI`^*Ix48bLX1|86ccIMk9+tdjz2{%nOqex
zax9<*6_Voz|AXJ%n#IWpHz^bc0x!1xF#`1N0<DH^e;?a+>jdyW16NwdUuy!hpQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77Cj^w8)6pO(78GTb87`z37Yi@7teVjf3S?X%}1~@nb
zMoW~v?(y!v?%w`A)9&vF>SJ=(D*N4T0001}Nkl<ZScPL?7zLwX6pVsVFbYOGU_=)<
zaNq#L-Me>185kIh85kJ;FfcGkGB7YOND2S@qayL$N0IM|AoKs%#tL4?#L)FFTsV`_
z!NGwf2e6<EV6&Wof#J`W?+iY_|1b)^{>))4#>Ohfz`(#@Zf=jFx1^%>KQ>R1<N$Jj
zzOfzy0|NuYy+_wc)=PF2m?q!Bh=QJuW|E^|6pVsVFbYP&C>R9*Aapaxs{6Xf00000
LNkvXXu0mjfWYQ4)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json
index 25cd862a24e..dd1824c4272 100644
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Projectiles/hitscan_tracer.rsi/meta.json
@@ -22,6 +22,9 @@
     {
       "name": "piercing"
     },
+    {
+      "name": "grenade"
+    },
     {
       "name": "rubber"
     },

From caf404db651af68ccb1046cf24bf1a484073d1de Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Mon, 9 Dec 2024 17:54:05 +0000
Subject: [PATCH 2/5] Fix

---
 .../Guns/Ammunition/Explosives/explosives.rsi/meta.json        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
index 2ab1d9c01ca..15ed620c3e0 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
@@ -19,9 +19,6 @@
         {
             "name": "frag"
         },
-        {
-            "name": "pierce"
-        },
         {
             "name": "rpg"
         },

From ac8b8f106402edf06855e7da9555427a9217b663 Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Mon, 9 Dec 2024 18:02:15 +0000
Subject: [PATCH 3/5] fix 2

---
 .../Specific/Mech/Weapons/Gun/combat.yml      | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index cc71879d39d..1cd71379f21 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -70,6 +70,80 @@
   - type: Appearance
   - type: AmmoCounter
 
+
+- type: entity
+  id: WeaponMechCombatDuster
+  name: Mounted EXP-220 Duster
+  description: An  heavy Auto Cannon as a mech-mounted gun with AP ammo
+  suffix: Mech Weapon, Gun, Combat
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_autocannon
+  - type: Gun
+    fireRate: 0.35
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: CannonBall
+    fireCost: 85
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatPirateGrapeshot
+  name: Mounted PirateGrapeshot
+  description: An ancient heavy machine gun given new life as a mech-mounted gun
+  suffix: Mech Weapon, Gun, Combat, Pirate
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Mech/mecha_piratecannon.rsi
+    state: mecha_piratecannon
+  - type: Gun
+    minAngle: -10
+    maxAngle: 15
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: CannonBallGrapeshot
+    fireCost: 35
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatPirateGlassshot
+  name: Mounted PirateGlassshot
+  description: An ancient heavy machine gun given new life as a mech-mounted gun
+  suffix: Mech Weapon, Gun, Combat, Pirate
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Mech/mecha_piratecannon.rsi
+    state: mecha_piratecannon
+  - type: Gun
+    minAngle: -10
+    maxAngle: 15
+    fireRate: 0.7
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: CannonBallGlassshot
+    fireCost: 55
+  - type: Appearance
+  - type: AmmoCounter
+
 - type: entity
   id: WeaponMechCombatUVM31
   name: UVM-31 "Drake"

From 69ea3bf2f7f5cd73859ad07a4081733d5f134beb Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Mon, 9 Dec 2024 18:05:52 +0000
Subject: [PATCH 4/5] Ah shit again

---
 .../Specific/Mech/Weapons/Gun/combat.yml      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index 1cd71379f21..3949cf7d86b 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -50,7 +50,7 @@
 - type: entity
   id: WeaponMechCombatDuster
   name: Mounted EXP-220 Duster
-  description: An  heavy Auto Cannon as a mech-mounted gun with AP ammo
+  description: An  heavy Auto Cannon as a mech-mounted gun with Frag ammo
   suffix: Mech Weapon, Gun, Combat
   parent: [ BaseMechWeaponRange, CombatMechEquipment ]
   components:
@@ -70,24 +70,25 @@
   - type: Appearance
   - type: AmmoCounter
 
-
 - type: entity
-  id: WeaponMechCombatDuster
-  name: Mounted EXP-220 Duster
-  description: An  heavy Auto Cannon as a mech-mounted gun with AP ammo
-  suffix: Mech Weapon, Gun, Combat
+  id: WeaponMechCombatPirateCannon
+  name: Mounted PirateCannon
+  description: An ancient heavy gun given new life as a mech-mounted gun
+  suffix: Mech Weapon, Gun, Combat, Pirate
   parent: [ BaseMechWeaponRange, CombatMechEquipment ]
   components:
   - type: Sprite
-    sprite: Objects/Specific/Mech/mecha_equipment.rsi
-    state: mecha_autocannon
+    sprite: _Sunrise/Objects/Specific/Mech/mecha_piratecannon.rsi
+    state: mecha_piratecannon
   - type: Gun
-    fireRate: 0.35
-    selectedMode: FullAuto
+    minAngle: -10
+    maxAngle: 15
+    fireRate: 0.4
+    selectedMode: SemiAuto
     availableModes:
-      - FullAuto
+      - SemiAuto
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg
+      path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: CannonBall
     fireCost: 85
@@ -97,7 +98,7 @@
 - type: entity
   id: WeaponMechCombatPirateGrapeshot
   name: Mounted PirateGrapeshot
-  description: An ancient heavy machine gun given new life as a mech-mounted gun
+  description: An ancient heavy gun given new life as a mech-mounted gun
   suffix: Mech Weapon, Gun, Combat, Pirate
   parent: [ BaseMechWeaponRange, CombatMechEquipment ]
   components:
@@ -122,7 +123,7 @@
 - type: entity
   id: WeaponMechCombatPirateGlassshot
   name: Mounted PirateGlassshot
-  description: An ancient heavy machine gun given new life as a mech-mounted gun
+  description: An ancient heavy gun given new life as a mech-mounted gun
   suffix: Mech Weapon, Gun, Combat, Pirate
   parent: [ BaseMechWeaponRange, CombatMechEquipment ]
   components:

From 81b52eadd3232db93cc4ed905d41bfc0246cfaff Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Mon, 9 Dec 2024 18:13:08 +0000
Subject: [PATCH 5/5] =?UTF-8?q?*=D0=9D=D0=B5=D0=B4=D0=BE=D0=B2=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE=20=D0=91=D1=83=D1=80=D1=87=D0=B8=D1=82*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Specific/Mech/Weapons/Gun/combat.yml      | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index 3949cf7d86b..77dce0315fe 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -47,29 +47,6 @@
   - type: Appearance
   - type: AmmoCounter
 
-- type: entity
-  id: WeaponMechCombatDuster
-  name: Mounted EXP-220 Duster
-  description: An  heavy Auto Cannon as a mech-mounted gun with Frag ammo
-  suffix: Mech Weapon, Gun, Combat
-  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Mech/mecha_equipment.rsi
-    state: mecha_autocannon
-  - type: Gun
-    fireRate: 0.35
-    selectedMode: FullAuto
-    availableModes:
-      - FullAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg
-  - type: ProjectileBatteryAmmoProvider
-    proto: GrenadeFrag
-    fireCost: 140
-  - type: Appearance
-  - type: AmmoCounter
-
 - type: entity
   id: WeaponMechCombatPirateCannon
   name: Mounted PirateCannon
@@ -173,3 +150,26 @@
     fireCost: 6
   - type: Appearance
   - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatDuster
+  name: Mounted EXP-220 Duster
+  description: An  heavy Auto Cannon as a mech-mounted gun with Frag ammo
+  suffix: Mech Weapon, Gun, Combat
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_autocannon
+  - type: Gun
+    fireRate: 0.35
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: GrenadeFrag
+    fireCost: 140
+  - type: Appearance
+  - type: AmmoCounter