From 801d405919837760f7034ae5ced51e9577ec0d54 Mon Sep 17 00:00:00 2001
From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:04:15 -0400
Subject: [PATCH] Add the most anticipated gun in the game. Foam Force.
 (#29103)

* Foam Force

* make it available somewhere

* add clumsyproof and nuke dev item

* reorganize

* oopsy files

* Strap!

* woopsie layering

* fix grammar to rerun tests for rogue unrelated test fail.

* cleanup

* I eepy layer forgetti spaghetti

* For real last necessary commit

* Oops I broke the law! feexed

* Decided to just change it to the same source as the poster source in our repo for consistency.
---
 .../Prototypes/Catalog/Fills/Crates/cargo.yml |  12 ++++++
 .../Weapons/Guns/Ammunition/Magazines/toy.yml |  12 ++++++
 .../Guns/Ammunition/Projectiles/toy.yml       |  36 +++++++++++++-----
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |  30 +++++++++++++++
 .../Objects/Weapons/Throwable/clusterbang.yml |  19 +++++++++
 .../Weapons/Grenades/foamdart.rsi/icon.png    | Bin 0 -> 494 bytes
 .../Weapons/Grenades/foamdart.rsi/meta.json   |  17 +++++++++
 .../Weapons/Grenades/foamdart.rsi/primed.png  | Bin 0 -> 377 bytes
 .../Guns/Rifles/foam_rifle.rsi/bolt-open.png  | Bin 0 -> 323 bytes
 .../foam_rifle.rsi/equipped-BACKPACK.png      | Bin 0 -> 775 bytes
 .../foam_rifle.rsi/equipped-SUITSTORAGE.png   | Bin 0 -> 775 bytes
 .../Guns/Rifles/foam_rifle.rsi/icon.png       | Bin 0 -> 312 bytes
 .../Guns/Rifles/foam_rifle.rsi/meta.json      |  25 ++++++++++++
 .../foam_rifle_inhand_64x.rsi/inhand-left.png | Bin 0 -> 824 bytes
 .../inhand-right.png                          | Bin 0 -> 876 bytes
 .../foam_rifle_inhand_64x.rsi/meta.json       |  27 +++++++++++++
 .../wielded-inhand-left.png                   | Bin 0 -> 726 bytes
 .../wielded-inhand-right.png                  | Bin 0 -> 731 bytes
 .../Weapons/Guns/Shotguns/pump.rsi/meta.json  |   2 +-
 19 files changed, 170 insertions(+), 10 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index b9d45f0f96..7ef8a8262d 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -158,6 +158,9 @@
     - id: WeaponTurretXeno
       prob: 0.01
       orGroup: Weapons
+    - id: WeaponRifleFoam
+      prob: 0.03
+      orGroup: Weapons
     #clothing
     - id: ClothingUniformJumpsuitFamilyGuy
       prob: 0.05
@@ -385,3 +388,12 @@
     - id: WeakKudzu
       prob: 0.01
       orGroup: NotUseful
+    - id: MagazineFoamBox
+      prob: 0.001
+      orGroup: NotUseful
+    - id: BoxDonkSoftBox
+      prob: 0.008
+      orGroup: NotUseful
+    - id: GrenadeFoamDart
+      prob: 0.001
+      orGroup: NotUseful
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
new file mode 100644
index 0000000000..babbc2648f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
@@ -0,0 +1,12 @@
+- type: entity
+  parent: MagazineLightRifleBox # It goes in a saw, its funny.
+  id: MagazineFoamBox
+  name: ammunition box (foam)
+  components:
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - BulletFoam
+    proto: BulletFoam
+    capacity: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
index 34a39c1583..9b6c288e37 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
@@ -4,12 +4,30 @@
   name: foam dart
   parent: BaseItem
   components:
-    - type: Tag
-      tags:
-        - BulletFoam
-        - Trash
-    - type: Ammo
-    - type: Sprite
-      sprite: Objects/Fun/toys.rsi
-      layers:
-        - state: foamdart
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+            - -0.05,-0.15
+            - -0.05,0.25
+            - 0.05,-0.15
+            - 0.05,0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: Tag
+    tags:
+      - BulletFoam
+      - Trash
+  - type: Ammo
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    layers:
+      - state: foamdart
+  - type: EmbeddableProjectile
+    removalTime: .2
+  - type: ThrowingAngle
+    angle: 180
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index c034ac5749..9300367cde 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -186,3 +186,33 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
+
+- type: entity
+  name: Foam Force Astro Ace
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
+  id: WeaponRifleFoam
+  description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
+  - type: Item
+    sprite: Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi
+  - type: BallisticAmmoProvider    
+    whitelist:
+      tags:
+      - BulletFoam
+    capacity: 10
+    proto: BulletFoam
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Effects/thunk.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/empty.ogg
+    clumsyProof: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
index 36d4c947fc..35174ba34d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
@@ -241,3 +241,22 @@
   - type: ContainerContainer
     containers:
       cluster-payload: !type:Container
+
+- type: entity
+  parent: GrenadeShrapnel
+  id: GrenadeFoamDart
+  name: foam dart grenade
+  description: Releases a bothersome spray of foam darts that cause severe welching.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/foamdart.rsi
+    layers:
+    - state: icon
+      map: ["Base"]
+    - state: primed
+      map: ["enum.TriggerVisualLayers.Base"]
+  - type: ClusterGrenade
+    fillPrototype: BulletFoam
+    maxGrenadesCount: 30
+    grenadeType: enum.GrenadeType.Throw
+    velocity: 70
diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b986e22665025ac32e1b356e2ee065be89e10e02
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<Sph-kQRCt{2mA^~FKorMcrGhvV1hEJb7l(j!7DNbwPzvJYZr4;0
zLa@Zay--3x5N9_Bac~i#AO-Oskdh8TNhuUvgsdIny_Ebo8sRQYC_=tNO70!^`Q-I-
zDIUrS%rixpb8>-P;C~7X28J6qE(l5?a{+`)CnY%8-lWDao9~b$Tmn8E)9Kk$5}6A4
z@b0Y>jNO^xQ!lTOi;$5(6h1OTpa&(<FYdix+qT^oYsj?^m;|CvzEf2Si_eDp`ZEzg
zxZFI3JyIK!+WyuCmjsi5564}O@P`_}+7mrTC+$~B%>tR+EwS?1_do!zivVB!V4Sp_
zl4t{8m;@*|rYypDt?zZAb*+MSszckdywbUO1L^=={5w(;hz&~AVbYBc6<`72v&X*-
zp8&$jB7Hw&m<2|=>`<J$nzjJuOe(=u*NLt9?Kc|aq<oB@Gn2sj8@U{jwHuYG8Xn6a
z(R0Vulm&2C4>iN>wCHbu2ajZ^Il%e`a0x^uDnj@Ti1vfLeq3;F0bc@7yuWI^>m@n|
kl7LbbNHe)WE|3fS0@S6TEuG1U_5c6?07*qoM6N<$f{w(`;s5{u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json
new file mode 100644
index 0000000000..ba5198513b
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/13630",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "primed"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/primed.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d8b9b7a97b190d00b8bdd138d7630cc406ca724
GIT binary patch
literal 377
zcmV-<0fzpGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SD@jB_RCt_Y@yRS?7)ZdvFu-8c0izBWb->Vez{#Ec|3S35dm$s;
z9RRXi%?`mP*AWzjz~|Qt6a%sxzzPlek1rS)_$3fxzsU#%k{tlDXq_hmgV=TmALIxS
z=#^t&C?>-ZBsl<Vd4dK5!^<03<;igb(GGxH4g%sD46i(Iz(e5`FhuTOCC?G$Cqj@T
z5*Xm2p{R{;1Sx<t2Y@US*Ffb{2#9vTb1UL41*sLGwgW&Q&z_HA(!ozy<zT_zpT)<(
zunD^wiX0$$3`qC^&Cb%rklS<hAp?Uws@mV~RCWL;RX?fd|G%f>A%lyyJgVhL;7P?N
z2AX6;WJl=AU51Mxhez=v1_qiIL@-AbLyKZ;a-^C^RypvSg6fwl4xlC&b-<_tMjZeE
X&*OEHeFfz000000NkvXXu0mjflfjdZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/bolt-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a11eab654ed59feab71fa8d4d40d2e697945c7a
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFmidiIEF+VPEL?uU7R4&(-deB
zbkNPb?LQ9?^eoA++T`@#o|&2X@cpIYnw$O{_Gg*h8ghDVuc$<yk%7UH(Au`sx>=8p
z2IOxL-mZNAPs0WA`%caYr*+=`XR7&eH)+k$cEz%9x767r4gJ^(1;g5==hq#6slI;S
zV;<F%`^E+a1{-o_F8zByCVrZuONXrMqvPMpHEL!Ye8HgB=5yO6M#U;CQUVBET5fEN
z>c}wwx}@3ni0iTDeLVl)nj0I)MK1h5U!?nk6~p|aC#D^^bZ}w@+o}k@@&l98^(FuP
zbL9=o5eqmSl+rMX!@lO%;R8VMU~<`1LI1pjHmhgvGcwJ%+zx60z1|?jz#wtH;N7dN
S>T|%rVeoYIb6Mw<&;$TnYlFf7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec34a1b9ea107466407b7cb7164ca1dc253f967f
GIT binary patch
literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008cNkl<Zc-rlm
zKWp1S7{(vDf!0GEV<#Spf&;A=xkQ78KoVTCgt)26TIimspQ6w&;jKeWhAyG*5=e`U
z8%V)}hiGw!nzRMie@N7V3~sm%=?TTL6Q89-5_x}<Wqi8#dG5JaMh6fCK@bFCr<hN(
z*1<ZfY^yBDIx5>LYaOh!Vm>`mhcrz5#_A*M`g8RgR-V_SAc|ks=B?`wpT6SR*5L&m
zp<#m?M@{t1E_!Ac%i27GmIN-IYiJxbNB;JL0nx}50HE3KquK7GXLg|}5v(jNv7m_8
zln8oe*V16ub>$Y|+kg*{6Jb1kX&{+Q;`hl3D*OAAA4T)eni8=@fB$6y0FI5nL*qZv
zfMF<#!T=x^jrz(2d)xt_sv7_>cHat(JCUyI5&*<!XMM9BN;xn9=$Tzqbpuu1z}Bn2
zP}2^HOsMO+RIk@@e|p+;6G}O-J1<mdN(5Ei!0FrCxrG{+iK4713QMI@=(Jj%YzHo0
zPK2#}E)sh?Q<D_%-({A`WB`EOqzU$wZ?^k*{pJB0jfU{bJ4%38Nf?a1Q}Mz*z{{Rc
z%7JM!usXdP;vFa8rjo$LSKGkHpTL(y))n!N6EK*B#|sMxlK6?6;AM@`{@u>n+4bhG
zc+&V-F8;}TNZD+bxhdYY1PuOJ;sVsTv-_!WVDHD7cmQx)yz2(o+1!Ox>o~hdt#dv-
zZi^=ff*=TjAP9mWh$|@O)0ZAI2enS2_W_IQ9Q<rTF`s6O>YUIRAp>S&cYU8!(Heye
z;0KU?MzlsD1MY=m0Dw#;<GXFZYvMJIi|||FeDNWGV{5{4xh(lXIInGE^%@%te^ouI
z058RJcGhq`Pl3~Shk<!yi_{u&x&pE+dnQztWyc8=GGN$2N1;&gtOpF6Tl6p{gj<dy
z1H66$xKRTofD9l5$bhkF{PDja(Hd`k0tkX22!go1`~w9iY{Wy3)6@U}002ovPDHLk
FV1iv}XM+F$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec34a1b9ea107466407b7cb7164ca1dc253f967f
GIT binary patch
literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008cNkl<Zc-rlm
zKWp1S7{(vDf!0GEV<#Spf&;A=xkQ78KoVTCgt)26TIimspQ6w&;jKeWhAyG*5=e`U
z8%V)}hiGw!nzRMie@N7V3~sm%=?TTL6Q89-5_x}<Wqi8#dG5JaMh6fCK@bFCr<hN(
z*1<ZfY^yBDIx5>LYaOh!Vm>`mhcrz5#_A*M`g8RgR-V_SAc|ks=B?`wpT6SR*5L&m
zp<#m?M@{t1E_!Ac%i27GmIN-IYiJxbNB;JL0nx}50HE3KquK7GXLg|}5v(jNv7m_8
zln8oe*V16ub>$Y|+kg*{6Jb1kX&{+Q;`hl3D*OAAA4T)eni8=@fB$6y0FI5nL*qZv
zfMF<#!T=x^jrz(2d)xt_sv7_>cHat(JCUyI5&*<!XMM9BN;xn9=$Tzqbpuu1z}Bn2
zP}2^HOsMO+RIk@@e|p+;6G}O-J1<mdN(5Ei!0FrCxrG{+iK4713QMI@=(Jj%YzHo0
zPK2#}E)sh?Q<D_%-({A`WB`EOqzU$wZ?^k*{pJB0jfU{bJ4%38Nf?a1Q}Mz*z{{Rc
z%7JM!usXdP;vFa8rjo$LSKGkHpTL(y))n!N6EK*B#|sMxlK6?6;AM@`{@u>n+4bhG
zc+&V-F8;}TNZD+bxhdYY1PuOJ;sVsTv-_!WVDHD7cmQx)yz2(o+1!Ox>o~hdt#dv-
zZi^=ff*=TjAP9mWh$|@O)0ZAI2enS2_W_IQ9Q<rTF`s6O>YUIRAp>S&cYU8!(Heye
z;0KU?MzlsD1MY=m0Dw#;<GXFZYvMJIi|||FeDNWGV{5{4xh(lXIInGE^%@%te^ouI
z058RJcGhq`Pl3~Shk<!yi_{u&x&pE+dnQztWyc8=GGN$2N1;&gtOpF6Tl6p{gj<dy
z1H66$xKRTofD9l5$bhkF{PDja(Hd`k0tkX22!go1`~w9iY{Wy3)6@U}002ovPDHLk
FV1iv}XM+F$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba597a85909b2c1eecb512fd3f30a479db0a4a45
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ|DG<6ArXg@6C_v{Cy4Yk1sVh$
zbTe=J&jSQKOERoBIsLb1W@bKof2p|Uray=MS!TC}oL<{2D$ysj@Lqy?p8LL^j0^Sm
zwYD9Y7J2JG>yHn+k4AL!JHL6e)t|>GX%5dLr8PYI_y4qA_K&MQF6nh*UwQ%%+%)q3
zy?^IEo#qY!>#igH@81XfFlfHW=)*H}Tjvgsk}I1GfS`k8WAavkn+a?{FuS9>hrL$v
z-|hUg1RIc>G{qj4GT3!b)NNeatbCCtWTVWx2KDoCMt}ZxORc$~vtZiN6AY??bw9qe
zHv+*y^|xBe^X?qrDLr%l;-wt0Ke^l(O&J)Zmgl~U57wOp3<?HMS3j3^P6<r_M7)73

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json
new file mode 100644
index 0000000000..ceffec91b5
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b and modified from the foam force poster by IProduceWidgets (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..931a8ef973260a4b9f20ddd7a1da57820f4690f2
GIT binary patch
literal 824
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVEXUr;uunK>+M~`?As0!$3D8R
z;}taO)jSkulyd&T!tS<dlgeHSy#M;(;==hW;}!1RHf3yP*O!c%<D`%v&ZFqa^7xj9
zz~Ryk;h+;2)V9^6|E*tOy6MZFUDk7%*0TU@K>^yPD^738Hp-m0Id-z-74f=rcm8;U
zp8NXYaPQSQ)^~Q;{%881l32IoRI%-!#}QTEP5-{mxSkT%9#o^7E5D;!-uBS>GQo<L
z`EQjzaM<5=eXvt(-&*sV-|jyzVcbzv9IMkb$M~VS(n`t5ztPpZt-GWz8pR1tSIe*d
zk>%#qG)e1UNc&yw*ZCQ$IvJmSE;f<%WRG=gSpI6uDz~#9jsZc1a{uoA>%4mS6_6~y
zu{Y@Ad@T;IHH`Cw|ApNQSJip(<9Wp5k7s^;kpJ~9_4t&yXJ4OPF7Fq7z$w>O|2<{r
zm#n9k-fu1A+EM)}wxUbUSn7OBI^W{gCAKH~w=cWAYL?&XtgEFrw=XObnfdm6Z2sIs
z@-nW=gznY7n61+2_xt&^o*c`0|3tpApR0SVwC`tjZ}Mr6gjhx%ec|U~wf{G1$i%75
zQfch^H^ntUOx%C*N1x??KmQhN)KqA8dpuKEItnG2v2hMOW-Fap=G$hyQNr^2A%1g?
z+=+9t<#MB+7jQLv&}2BYoPlFLQ-t4-k6X9YPFVZleblL?7bCRXe|)>C_4}6A@0DNt
z&qPYsDF@}3t4}^$Brqj}llzyz-l!_UCu?{AN?W3$vGS4sRqNBw_QZTy{#`e1x^8~*
zSMk4@%YMI(Jz_2uH!poNbLH|-)7RImf9zj&V6n#K>-x8EtzQ3oYm_-_O6m>iE2$yh
zZnB?vVh}$)&^Sn7O35wz_)O)OHic`RnVQekFAKMQbkVkk_2Kc}6SK_ciXWL&^y7L^
zesS>M#H6Fydf5$A4sXxRo~@~{^h1BL_5N%FrX?c#*3RFo*}&88&zNFU^Nn%Zlj~2u
gJ=i}3IdmrMvUiBi+Ig#Y))tVkr>mdKI;Vst0EzE-z5oCK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..570f8be130ba975ad5fb6cd555d53ae03b5d2178
GIT binary patch
literal 876
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU^e!2aSW-r_4e*YZ)Hc3;~(Rj
z7^kyv3h^|#u4y^l*m_n>?$OPNjP<QcAKjnwn|X`*TDd0ISt4?s3LMWICY(@GOp8=(
z-0P$)R$i5so^1B}ufwgg@AjDI-^)2N5oietICA0TvOmYR)wn%6Jn6iAvefNQ{^soc
zM-P}!o?Y{+DCw8t%IEzXA3RrUj#U<1!lm<6<$0i%3{Rab3wPbsiD7+g^8Xzgl{pv5
z{yD(uAmn2G!%e6`r6cb{uj+x<vz0jy@$P&1(bwgn8fRU_<E#?@Rk6|M`p$|O_B?oh
zW7S%*-uU`MPmX4V^G9u7e)VSj^gGj}R{aQRdNBEvcly-rF;~}}iNBY@dgI1w^*-(I
zry|x}dbwsx_UktV6TJi+tmcLuD=LlIdHq=2-5)7jsb$l=UG1$+7cSKg&a#TVd#5t$
zp4D<8o(FFVF6M8oUdVF4hX2DVA&;Q1i`LfYE!`>E?I9&`{)9?{if;Z~^{BV=R*B~-
zNjR*&+x?AsinnW3!+)Kx>FwS7zQ4X5a6CKXb<yJ^-?;B<e_{O3@$b-|HAd64J%QHn
zX0MqP(s-W#-)p&*FH1sqS4rIZ&acX7_U%>YZ0r7v{ffyuUsYrR9kbA^cK#%W<cnuo
zZs>eZ|MT?g+Y84vJvrQxXP3w9OrL}jC0IGkmUpMfA3bdJv-~5Q>&GJ@=RO$5ur4a=
zvf>o@tfIh}G>=8a;mqU&4fAXE4pw>3+4sx*wL9b~@Jnw&jMlGW<1n4`{CYAP4{iFs
zy;G1Z`*8hD=F{Sp%O5{UUa>7|%I4($9HEvtMqn6}?)h?h<BGy5=a)WtyWV?u*`H|*
zVY`=~ejRN(H&3VezP+$P^3IKGoAggR0t4jnpFe-oB<gP}epr*di)BxG-mxH&dKbwO
z%busz4cpU>00Sy!yXxN+F3<k{wD7F^*7L&LJ@AieFN?tq#r{umm2-MsPU=qY+NV<c
zH}d+5{Z^`sPGYU!pX)FxYRPB>mL4e*xXyJ!{OJC5ii{piz=XAc-5~4fi<Rm>?kYwg
dhth%F{}|3J$g<))TBZ&X_jL7hS?83{1OOy$h}8f9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json
new file mode 100644
index 0000000000..b89b33c08f
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b sprite created from foam force poster by IProduceWidgets (github)",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..3526954b4e2d7eea3d1b3eee9d0eca653dc1e9b1
GIT binary patch
literal 726
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV4Cac;uunK>+RkB-qM8<$3Ob7
zacz}SvDCO5l%YA}lJq7K5iZ%1l{=(%eeXYY$#C7l62Tln;~S129OlX}<+dM?JY=ad
z>A?2OGv(!GP4WKaTeE*!OkF|E{O7-I?w|hV0kj7TXgI!N)^yF>6B9arOfgGY_4DHs
z6T$CJhhI-^t>1lo^7(bw%J&>ulbe)!-SqI0(jBUw6W8z7Z;v+Wo&E0n?cX2Y-K@FO
zxGVEyWX+HA<+JmiJkQ?Qqmuv3tp3K1BEK)y`&BE$Kd#sP#`GfgN$v6jr57&V4nJM>
z&L;G1{{4MwanpsGPjau9c66V=Z%%Zz)fDc?&6DQz>%0ovY<I<WUhUiWADZnS#}=<)
zHMsO~OZmDY#q1@ib7SLH|CTCM@~HdkX1_Q7TKVtU)AgS$`K7)8>YCNhwjZA#EbZ42
z$WvCFzx}(K|D-t~UV(R0Cr^E{XU-L;l<nzua?zDVXK!wqanRoL>ihS;H!Rnt#r7^p
zE@d=nI`{V3^*`IP>Y~-f8>iiqjr@IM)3&8ryVr5bbEZ$<wC}gGy0~NfLci0y7_o#S
zR-pq^Ry|9taz8D+-S(K>r7h-+dB6VM|97wKeNX?~u*FB_YQEZk)Mnz&WqDCWVvF}%
z-z~{sU%c8gv@F(G+tncFj#kyImrNhl{hDl~v3=GQ6<xihTlN)C;aJ{b-gIs*=i|#M
zGj_1Ed;42`+bDkE+dt;x(HCD!O3Qmpx>h9Vd1<@+^x)fn7azTA`trtFiCkH^pNUR~
z1mA47tF(R<X#VoX^BixFofAyikC$HkQ+8kC+wlj6$K_`B00X&07Sl5wAH=^Ze3RH1
R5g-SW^mO%eS?83{1OS}iMUVgh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..297ae7a752a6493715c55be9096e83b9b56ac821
GIT binary patch
literal 731
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU|Qtq;uunK>+RkB*;0uz$3LED
z^^VGLT@&DCePf}B&<e)s4nka-DPD!X{~G@U>doa^cS%RnBw&_<)tv+by+VOot~<J7
z*m$Gn@hzGcCC&M~^40IHcPiV<&wt<f{&VtgFQ7%(zz^m9>cN&%X0~q&<4gTi{rO^;
z=ccBri;;S%|7x`Eyx#xy_P@$!-UYe){1=s-PhNd#_xZou>V7Lc{`+@--7Px}7O`ZN
z72>%|CtJxE=Rbb(?nuF`poir@+(TZioKj&?WjlAqp84mBxO6ycd>bCW+12U#yZ;MY
z;@)%7Q!o2|*7@iVx_s%ojS>4MzV$Kt_59!tmD)drn`W-Qx#H`jgeCfSwteegw<h2`
zLw=lXxYE8`Z~GdnkACW1qR#BTpLv$5{j}xh9=uRFcz`Ej_tpMG=L^m=Y|L=!{IP0Q
z@2wlZPu}fr{rTYXggbjTNKLm++rcmVamSv`tK-A|)I{9P{ccxxHFIUruFO5BohQtm
zUHR?B+w#+TJ6BohhRzMk&s?$l?T37(x09?dTzI#xY~r$C3rePWt&F%9;%1L65V49y
zB>l9VdFo+?VCti9=Y3XJ-V<H2U1+;}>&(Lsbfz2We`ak}eK+%(^53bRU(cEQxmiE`
z%Y8DlPyeJ{zr6ikv8ii69Fg^4l1abryZzhR?G0bPIUdZ4c_*>^$*IgfdDhQ47G=eA
z4PS0Ox7Xl^><yj`Q~k=EWp?CEkI}6PEzE!Oyv+3;qrvNKtdoFYvLrmL?#80}KlMlD
zmdyxns_?v<yZY6ZFJBied;I2C(A!t-$^6lW*tfBWoHoB@ziZQ$mT8t{m|pTZ8UM1J
U^E0!m@hp&}r>mdKI;Vst0AXB9zyJUM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
index 3add3a471b..3e793381d0 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
@@ -22,4 +22,4 @@
             "directions": 4
         }
     ]
-}
+}
\ No newline at end of file
-- 
2.51.2