From baa8ddbfdacd0b0913c2069dfc2d75f09885d64e Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Sun, 16 Jun 2024 11:46:48 -0400 Subject: [PATCH 01/13] Foam Force --- .../Weapons/Guns/Ammunition/Magazines/toy.yml | 12 ++++ .../Guns/Ammunition/Projectiles/toy.yml | 63 +++++++++++++++--- .../Objects/Weapons/Guns/pneumatic_cannon.yml | 45 +++++++++++++ .../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 -> 693 bytes .../foam_rifle.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 693 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 .../inhand-left.png | Bin 0 -> 824 bytes .../inhand-right.png | Bin 0 -> 876 bytes .../wielded-inhand-left.png | Bin 0 -> 726 bytes .../wielded-inhand-right.png | Bin 0 -> 731 bytes .../Weapons/Guns/Shotguns/pump.rsi/meta.json | 2 +- 22 files changed, 201 insertions(+), 9 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 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/wielded-inhand-right.png 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 00000000000000..babbc2648f71aa --- /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 34a39c1583eb70..4b14f27db940fd 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,59 @@ name: foam dart parent: BaseItem components: - - type: Tag + - 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 + +- 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 - - Trash - - type: Ammo - - type: Sprite - sprite: Objects/Fun/toys.rsi - layers: - - state: foamdart + - 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml index 1251172946080a..b67cb4e77f4225 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml @@ -140,3 +140,48 @@ path: /Audio/Effects/thunk.ogg soundEmpty: path: /Audio/Items/hiss.ogg + +- type: entity + name: mf 58 + parent: WeaponPistolMk58 + id: WeaponPistolMf58 # the spaces in description are for formatting. + description: Woah! Careful where you point that thing. + components: + - type: PneumaticCannon + - type: ItemSlots + slots: + gas_tank: + name: pneumatic-cannon-component-itemslot-name + whitelist: + components: + - GasTank + insertSound: + path: /Audio/Weapons/click.ogg + params: + volume: -3 + gun_magazine: + name: Magazine + startingItem: MagazineMagnum + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineMagnum + gun_chamber: + name: Chamber + startingItem: CartridgeMagnum + priority: 1 + whitelist: + tags: + - CartridgeMagnum + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundEmpty: + path: /Audio/Items/hiss.ogg + soundGunshot: + path: /Audio/Effects/thunk.ogg + clumsyProof: true \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml index 36d4c947fcd760..bdf7dada985a04 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 causes 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-P;C~7X28J6qE(l5?a{+`)CnY%8-lWDao9~b$Tmn8E)9Kk$5}6A4 z@b0Y>jNO^xQ!lTOi;$5(6h1OTpa&(tR+EwS?1_do!zivVB!V4Sp_ zl4t{8m;@*|rYypDt?zZAb*+MSszckdywbUO1L^=={5w(;hz&~AVbYBc6<`72v&X*- zp8&$jB7Hw&m<2|=>`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 00000000000000..3ca59e4ac6892e --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-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)Vez{#Ec|3S35dm$s; z9RRXi%?`mP*AWzjz~|Qt6a%sxzzPlek1rS)_$3fxzsU#%k{tlDXq_hmgV=TmALIxS z=#^t&C?>-ZBslA%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$=8p z2IOxL-mZNAPs0WA`%caYr*+=`XR7&eH)+k$cEz%9x767r4gJ^(1;g5==hq#6slI;S zV;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..84769a698dfb6e7baeea0637b417d02cbc755610 GIT binary patch literal 693 zcmV;m0!safP)HwOp-x~BZ>(~;F{}TP8Gy*eU@cQ`2Dssr+4rB?%k8o0R%x11VKb;R4e@UY>zkV z2G6sOX5HYoXM4O+t;Fh3hKYZ>`#cU5#ywK3TbYtf}FyM){3;=LDJ-D470^bAEwcMD{tQ(x^8Uo)7HAHp& z_Xvn%ARbs>D*ynVmL9=wb;CJXIu_B*VY(KIzPj-N0KdC`hL(S<0dWg3T>}8D6pESY z4bgH35N^`Axh;<~Nd)_6#NcG$&`ck5#FTTFuqB+jWgy_z@ zogT`sekgNqLjKQ}yjeGR+Q-2%!K3RIfin24H&D*;uxy~ z6VrUVsA&b>KY`-hC5z$QO;$YwK@bE%5ClOG1TiHV)yl|g=Dg-9^*vzI*g%#|XjChF z)7X%DM#_Lv@p0xWRW?T{1H=VnmXXa-%7B$ZG4lq<<|zG5Fz%i`3rv!mlmVYV9%a4) zWOE$bfc~fR+`O`7a#gY5NEwjyqGJ}w=13Jl29N<{02x3Aj7j@G`+{V1T=)tg2!bF8 bVsZHkxN9g%={nYf00000NkvXXu0mjf+FU(s 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..84769a698dfb6e7baeea0637b417d02cbc755610 GIT binary patch literal 693 zcmV;m0!safP)HwOp-x~BZ>(~;F{}TP8Gy*eU@cQ`2Dssr+4rB?%k8o0R%x11VKb;R4e@UY>zkV z2G6sOX5HYoXM4O+t;Fh3hKYZ>`#cU5#ywK3TbYtf}FyM){3;=LDJ-D470^bAEwcMD{tQ(x^8Uo)7HAHp& z_Xvn%ARbs>D*ynVmL9=wb;CJXIu_B*VY(KIzPj-N0KdC`hL(S<0dWg3T>}8D6pESY z4bgH35N^`Axh;<~Nd)_6#NcG$&`ck5#FTTFuqB+jWgy_z@ zogT`sekgNqLjKQ}yjeGR+Q-2%!K3RIfin24H&D*;uxy~ z6VrUVsA&b>KY`-hC5z$QO;$YwK@bE%5ClOG1TiHV)yl|g=Dg-9^*vzI*g%#|XjChF z)7X%DM#_Lv@p0xWRW?T{1H=VnmXXa-%7B$ZG4lq<<|zG5Fz%i`3rv!mlmVYV9%a4) zWOE$bfc~fR+`O`7a#gY5NEwjyqGJ}w=13Jl29N<{02x3Aj7j@G`+{V1T=)tg2!bF8 bVsZHkxN9g%={nYf00000NkvXXu0mjf+FU(s 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+M~`?As0!$3D8R z;}taO)jSkulyd&T!tS^yPD^738Hp-m0Id-z-74f=rcm8;U zp8NXYaPQSQ)^~Q;{%881l32IoRI%-!#}QTEP5-{mxSkT%9#o^7E5D;!-uBS>GQo%#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>?$OPNjPE?I9&`{)9?{if;Z~^{BV=R*B~- zNjR*&+x?AsinnW3!+)Kx>FwS7zQ4X5a6CKXbYZ0r7v{ffyuUsYrR9kbA^cK#%WeZ|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?h00Sy!yXxN+F3mL4e*xXyJ!{OJC5ii{piz=XAc-5~4fi?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 00000000000000..2866ae8f75e082 --- /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-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/0a9e4d0cf0afa0ccbfdcbebf2a89ad3ce22083e7 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>%0ovYYCNhwjZA#EbZ42 z$WvCFzx}(K|D-t~UV(R0Cr^E{XU-L;lihS;H!Rnt#r7^p zE@d=nI`{V3^*`IP>Y~-f8>iiqjr@IM)3&8ryVr5bbEZ$r7h-+dB6VM|97wKeNX?~u*FB_YQEZk)Mnz&WqDCWVvF}% z-z~{sU%c8gv@F(G+tncFj#kyImrNhl{hDl~v3=GQ6h9Vd1<@+^x)fn7azTA`trtFiCkH^pNUR~ z1mA47tF(R+RkB*;0uz$3LED z^^VGLT@&DCePf}B&doa^cS%RnBw&_<)tv+by+VOot~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`jgeCfSwteegwl9VdFo+?VCti9=Y3XJ-V&(Lsbfz2We`ak}eK+%(^53bRU(cEQxmiE` z%Y8DlPyeJ{zr6ikv8ii69Fg^4l1abryZzhR?G0bPIUdZ4c_*>^$*IgfdDhQ47G=eA z4PS0Ox7Xl^>mdKI;Vst0AXB9zyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_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^yPD^738Hp-m0Id-z-74f=rcm8;U zp8NXYaPQSQ)^~Q;{%881l32IoRI%-!#}QTEP5-{mxSkT%9#o^7E5D;!-uBS>GQo%#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/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_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>?$OPNjPE?I9&`{)9?{if;Z~^{BV=R*B~- zNjR*&+x?AsinnW3!+)Kx>FwS7zQ4X5a6CKXbYZ0r7v{ffyuUsYrR9kbA^cK#%WeZ|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?h00Sy!yXxN+F3mL4e*xXyJ!{OJC5ii{piz=XAc-5~4fi?kYwg dhth%F{}|3J$g<))TBZ&X_jL7hS?83{1OOy$h}8f9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_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>%0ovYYCNhwjZA#EbZ42 z$WvCFzx}(K|D-t~UV(R0Cr^E{XU-L;lihS;H!Rnt#r7^p zE@d=nI`{V3^*`IP>Y~-f8>iiqjr@IM)3&8ryVr5bbEZ$r7h-+dB6VM|97wKeNX?~u*FB_YQEZk)Mnz&WqDCWVvF}% z-z~{sU%c8gv@F(G+tncFj#kyImrNhl{hDl~v3=GQ6h9Vd1<@+^x)fn7azTA`trtFiCkH^pNUR~ z1mA47tF(R+RkB*;0uz$3LED z^^VGLT@&DCePf}B&doa^cS%RnBw&_<)tv+by+VOot~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`jgeCfSwteegwl9VdFo+?VCti9=Y3XJ-V&(Lsbfz2We`ak}eK+%(^53bRU(cEQxmiE` z%Y8DlPyeJ{zr6ikv8ii69Fg^4l1abryZzhR?G0bPIUdZ4c_*>^$*IgfdDhQ47G=eA z4PS0Ox7Xl^>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 3add3a471b6fa3..3e793381d0fa8e 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 From 665c7a711952464f3747f67d9d5b2ce5a3db09c7 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Sun, 16 Jun 2024 12:09:24 -0400 Subject: [PATCH 02/13] make it available somewhere --- Resources/Prototypes/Catalog/Fills/Crates/cargo.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index b9d45f0f960ab6..3477a104b3c5b1 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,9 @@ - id: WeakKudzu prob: 0.01 orGroup: NotUseful + - id: MagazineFoamBox + prob: 0.001 + orGroup: NotUseful + - id: BoxDonkSoftBox + prob: 0.008 + orGroup: NotUseful \ No newline at end of file From 7dfecf43881fcf00684d204e68f74dac05480182 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Sun, 16 Jun 2024 12:12:39 -0400 Subject: [PATCH 03/13] add clumsyproof and nuke dev item --- .../Guns/Ammunition/Projectiles/toy.yml | 1 + .../Objects/Weapons/Guns/pneumatic_cannon.yml | 45 ------------------- 2 files changed, 1 insertion(+), 45 deletions(-) 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 4b14f27db940fd..5757cec3f19839 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml @@ -60,3 +60,4 @@ path: /Audio/Effects/thunk.ogg soundEmpty: path: /Audio/Weapons/Guns/Empty/empty.ogg + clumsyProof: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml index b67cb4e77f4225..1251172946080a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml @@ -140,48 +140,3 @@ path: /Audio/Effects/thunk.ogg soundEmpty: path: /Audio/Items/hiss.ogg - -- type: entity - name: mf 58 - parent: WeaponPistolMk58 - id: WeaponPistolMf58 # the spaces in description are for formatting. - description: Woah! Careful where you point that thing. - components: - - type: PneumaticCannon - - type: ItemSlots - slots: - gas_tank: - name: pneumatic-cannon-component-itemslot-name - whitelist: - components: - - GasTank - insertSound: - path: /Audio/Weapons/click.ogg - params: - volume: -3 - gun_magazine: - name: Magazine - startingItem: MagazineMagnum - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineMagnum - gun_chamber: - name: Chamber - startingItem: CartridgeMagnum - priority: 1 - whitelist: - tags: - - CartridgeMagnum - - type: Gun - fireRate: 2 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundEmpty: - path: /Audio/Items/hiss.ogg - soundGunshot: - path: /Audio/Effects/thunk.ogg - clumsyProof: true \ No newline at end of file From 8fd5017620f8df11e12a3dfe5f719549ef2b9d22 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Sun, 16 Jun 2024 12:15:24 -0400 Subject: [PATCH 04/13] reorganize --- .../Prototypes/Catalog/Fills/Crates/cargo.yml | 3 ++ .../Guns/Ammunition/Projectiles/toy.yml | 30 ------------------- .../Objects/Weapons/Guns/Rifles/rifles.yml | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 3477a104b3c5b1..7ef8a8262d60bd 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -393,4 +393,7 @@ 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/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml index 5757cec3f19839..9b6c288e378664 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml @@ -31,33 +31,3 @@ removalTime: .2 - type: ThrowingAngle angle: 180 - -- 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/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index c034ac5749ae2a..9300367cdec3d3 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 From aebc02144c2129d0052e6d5697948884b43d84c0 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Sun, 16 Jun 2024 12:19:29 -0400 Subject: [PATCH 05/13] oopsy files --- .../foam_shotgun_inhand_64x.rsi/inhand-left.png | Bin 824 -> 0 bytes .../foam_shotgun_inhand_64x.rsi/inhand-right.png | Bin 876 -> 0 bytes .../wielded-inhand-left.png | Bin 726 -> 0 bytes .../wielded-inhand-right.png | Bin 731 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-left.png deleted file mode 100644 index 931a8ef973260a4b9f20ddd7a1da57820f4690f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVEXUr;uunK>+M~`?As0!$3D8R z;}taO)jSkulyd&T!tS^yPD^738Hp-m0Id-z-74f=rcm8;U zp8NXYaPQSQ)^~Q;{%881l32IoRI%-!#}QTEP5-{mxSkT%9#o^7E5D;!-uBS>GQo%#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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/inhand-right.png deleted file mode 100644 index 570f8be130ba975ad5fb6cd555d53ae03b5d2178..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 876 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU^e!2aSW-r_4e*YZ)Hc3;~(Rj z7^kyv3h^|#u4y^l*m_n>?$OPNjPE?I9&`{)9?{if;Z~^{BV=R*B~- zNjR*&+x?AsinnW3!+)Kx>FwS7zQ4X5a6CKXbYZ0r7v{ffyuUsYrR9kbA^cK#%WeZ|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?h00Sy!yXxN+F3mL4e*xXyJ!{OJC5ii{piz=XAc-5~4fi?kYwg dhth%F{}|3J$g<))TBZ&X_jL7hS?83{1OOy$h}8f9 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/foam_shotgun_inhand_64x.rsi/wielded-inhand-left.png deleted file mode 100644 index 3526954b4e2d7eea3d1b3eee9d0eca653dc1e9b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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>%0ovYYCNhwjZA#EbZ42 z$WvCFzx}(K|D-t~UV(R0Cr^E{XU-L;lihS;H!Rnt#r7^p zE@d=nI`{V3^*`IP>Y~-f8>iiqjr@IM)3&8ryVr5bbEZ$r7h-+dB6VM|97wKeNX?~u*FB_YQEZk)Mnz&WqDCWVvF}% z-z~{sU%c8gv@F(G+tncFj#kyImrNhl{hDl~v3=GQ6h9Vd1<@+^x)fn7azTA`trtFiCkH^pNUR~ z1mA47tF(R+RkB*;0uz$3LED z^^VGLT@&DCePf}B&doa^cS%RnBw&_<)tv+by+VOot~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`jgeCfSwteegwl9VdFo+?VCti9=Y3XJ-V&(Lsbfz2We`ak}eK+%(^53bRU(cEQxmiE` z%Y8DlPyeJ{zr6ikv8ii69Fg^4l1abryZzhR?G0bPIUdZ4c_*>^$*IgfdDhQ47G=eA z4PS0Ox7Xl^>mdKI;Vst0AXB9zyJUM From 91f8f9e7a7e21f5b9cebfdb3ef2bfb7b6bee03f2 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 13:56:02 -0400 Subject: [PATCH 06/13] Strap! --- .../foam_rifle.rsi/equipped-BACKPACK.png | Bin 693 -> 2075 bytes .../foam_rifle.rsi/equipped-SUITSTORAGE.png | Bin 693 -> 2075 bytes 2 files changed, 0 insertions(+), 0 deletions(-) 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 index 84769a698dfb6e7baeea0637b417d02cbc755610..9fad788460b8ee3b5234b25a510f599556641607 100644 GIT binary patch delta 2063 zcmV+q2=Mo{1)C6%BYy|tNkl;meo>}Q$u!RCl(L#tS~JQYt6@fO!!$u)~>uWWpsT;sR=?327| z;RL3)l{c^73CduS&SQfK=Jh*e;g@v4Kwk@gH-F=&PJW=Tg)ch@4)nF~k3Y0g`279YZ)ksRoDz?MvAGj>(vzrW zW601=&{=HAMh7(shD>iOZ(RQ{OctAP?RI(+*(*a5{E<^`zRkN%xaYHPE@AinFjW=< zVt*vT&85K2rO@VG2Qd?@-2o~a9fZze1LtVf)OZ2^%6|}Y+)SPk+{}W;6B}ZGB+JhN zwbuNl_u(}}y?`A97AAFGi{P`?sPZu~gfjj9*;XB6WPVnctcsA%))e&Tl8=Bf- zu&l;>IthbiH4IJdV0ys=K&bXFcsE)p7y}z#N-|-e`i+Tzhw#Ug;CwdpBDJ!>>)w0RU#0`I7W6yAWb} zTlsCrX8{0pwY7p1780eMP%8BTz+CDof-`49=nep55e5JxajT*C$X}mJVJyO6EW%*_k$)`O*6%MHzwA1I4f+vyZ9AgTDCn9R zi4&OM2>`&I^d#7zU-{HGn*vs(I_@LkChIg|SV-W_q{&4`nj|WyEH=9(Z z5F*~s#6x-Dco2ctwj&mcNtkd?^P|YbL&(L00Dw$9qzDTL{%s~H;B(1e@cr?l(C>4@ zX@9E{D6ik=hHK`Yd|G6ZW#gB{fLuH%nbTpv57B58_q$x!ez0E>1g+fxia0_s28i&_ z_4NuP4*;*8ScCmXvhX%ODGOgGSE;byhvDJjMPq`}^7Cf_3GH8a{a(akF(E#wwieJk zJSFKwm_XOm;L)SM2(;BZJc=5wZ`g!ypML=FZGaHzUp=t~u~-b_@9r&{Hu{E5$~r)2 zv7wYvnRp0czfXt>k9}Z--r<4HViV$q5_0~;hwwH4V^hG{*T)6p!+swO)phxNZmI_W z%G9)%RoHfX7?DVX8nS?Q*8}6z z@<-oY4-8!gg41`6AA9>LNm|Z`rhjQpMvF{VON@Y#qDM@(NF+j$Q75A)SH`Es?D-DfngA z0gE*{ve7|gRi-L;?fkOhugHr0M@5nI0ZUzgsF4-q;!|?L^$w3@Nv!s+&|+ChycAZw z5GrLnkl!BD;*0>fni++Tiy4mHw7B%@+UL&4o^{!&`jHb zi)U1g1J>>Ug^Op3*8aJ8Q0Ph#9aV7v*?<%Sil+gao>rayYg$32=@#V~ko!1XG}_`7VqsmN zrW6)ng{&aDs@f4^gMREjSp}!l364!56AwY@J;73=d zz+HcrYDD@Ew!uu>^M88<3U7;-WMVuBoy7(-ZAbsXHVOU3I;zTmQayONefj0auc#^d zc$sh6zZV50}>OX!V#EkbWlP;3lqlWV=mQ7;mgNdyoCu%reHQY2(n?D zm>AWT0pg%XB5=dHRjQ3XdA2wcRT_9@J3xFWN}QUeew$Uz0e|G#;xt&eFjKV<0)R%V z35khOG+Ip{>vFA1;SDc^DEw1!8Jjy{rtL5`cOn}d#0};)8m%Uz)O0{B4b%Zxl4Hmfx}`Z*FP=pzZmp%;5sl3!bktpyruTRkOvdj~?Ku)I7vH tL%FF5?HzFE=2fsauPz&PmHJ`E-`RjLl9*R{*8l(j00>D%PDHLkV1lFg^|=55 delta 670 zcmV;P0%84|5VZx6BYy&XNklHwOp-x~BZ>(~;F{}TP8Gy*eU@cQ`2Dss zr+4rB?%k8o0R%x11VKb;R4e@UY>zkV2G6sOX5HYoXM4O+t$)PoP=<+ryZbyGf448N zec&j06u-sF;rPq9UwHT7{DBU2*u(8h7lH2~@I7p?GV)dlLcGw>zI0>fJ}}^kwhRDp zJ3Y9a9s=J3)3w}~(5xGr=^6sx3pGS_{r3onV;~+_Un>9ro|YcLZgs;sSvnTc&0)G0 zioUw>0RX?de}9ISf2;v<3ou;+0IU>>nduGDat9D@(zv-Tk26UG`)9=9cgqCdImX;f zuuO0O2z*ak_{b(Wihj+3-Rgqr8kP=?Fo}7HUph3vbPaZ^i+;_SD2|fkysfVlaCPIO zUvn_aN)Y13`bqjyqNFdrzTl!c&dP-7&byr+%CCMXbAN9_{?C`ZSvPpv$H6keqw7s0 zrkXUs_JN~_2ENUg!DX$0LlhH`oh7^}(R7^?#l(|o(AX$9Utf#TdHi{ac&Ry_nk5ClOG z1VIo4F@Gf*)yl|g=Dg-9^*vzI*g%#|XjChF)7X%DM#_Lv@p0xWRW?T{1H=VnmXXa- z%7B$ZG4lq<<|zG5Fz%i`3rv!mlmVYV9%a4)WOE$bfc~fR+`O`7a#gY5NEwjyqGJ}w z=13Jl29N<{02x3Aj7j@G`+{V1T=)tg2!bF8Vi$4w3%F}2O6fY*g8%>k07*qoM6N<$ Ef{0%{NdN!< 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 index 84769a698dfb6e7baeea0637b417d02cbc755610..9fad788460b8ee3b5234b25a510f599556641607 100644 GIT binary patch delta 2063 zcmV+q2=Mo{1)C6%BYy|tNkl;meo>}Q$u!RCl(L#tS~JQYt6@fO!!$u)~>uWWpsT;sR=?327| z;RL3)l{c^73CduS&SQfK=Jh*e;g@v4Kwk@gH-F=&PJW=Tg)ch@4)nF~k3Y0g`279YZ)ksRoDz?MvAGj>(vzrW zW601=&{=HAMh7(shD>iOZ(RQ{OctAP?RI(+*(*a5{E<^`zRkN%xaYHPE@AinFjW=< zVt*vT&85K2rO@VG2Qd?@-2o~a9fZze1LtVf)OZ2^%6|}Y+)SPk+{}W;6B}ZGB+JhN zwbuNl_u(}}y?`A97AAFGi{P`?sPZu~gfjj9*;XB6WPVnctcsA%))e&Tl8=Bf- zu&l;>IthbiH4IJdV0ys=K&bXFcsE)p7y}z#N-|-e`i+Tzhw#Ug;CwdpBDJ!>>)w0RU#0`I7W6yAWb} zTlsCrX8{0pwY7p1780eMP%8BTz+CDof-`49=nep55e5JxajT*C$X}mJVJyO6EW%*_k$)`O*6%MHzwA1I4f+vyZ9AgTDCn9R zi4&OM2>`&I^d#7zU-{HGn*vs(I_@LkChIg|SV-W_q{&4`nj|WyEH=9(Z z5F*~s#6x-Dco2ctwj&mcNtkd?^P|YbL&(L00Dw$9qzDTL{%s~H;B(1e@cr?l(C>4@ zX@9E{D6ik=hHK`Yd|G6ZW#gB{fLuH%nbTpv57B58_q$x!ez0E>1g+fxia0_s28i&_ z_4NuP4*;*8ScCmXvhX%ODGOgGSE;byhvDJjMPq`}^7Cf_3GH8a{a(akF(E#wwieJk zJSFKwm_XOm;L)SM2(;BZJc=5wZ`g!ypML=FZGaHzUp=t~u~-b_@9r&{Hu{E5$~r)2 zv7wYvnRp0czfXt>k9}Z--r<4HViV$q5_0~;hwwH4V^hG{*T)6p!+swO)phxNZmI_W z%G9)%RoHfX7?DVX8nS?Q*8}6z z@<-oY4-8!gg41`6AA9>LNm|Z`rhjQpMvF{VON@Y#qDM@(NF+j$Q75A)SH`Es?D-DfngA z0gE*{ve7|gRi-L;?fkOhugHr0M@5nI0ZUzgsF4-q;!|?L^$w3@Nv!s+&|+ChycAZw z5GrLnkl!BD;*0>fni++Tiy4mHw7B%@+UL&4o^{!&`jHb zi)U1g1J>>Ug^Op3*8aJ8Q0Ph#9aV7v*?<%Sil+gao>rayYg$32=@#V~ko!1XG}_`7VqsmN zrW6)ng{&aDs@f4^gMREjSp}!l364!56AwY@J;73=d zz+HcrYDD@Ew!uu>^M88<3U7;-WMVuBoy7(-ZAbsXHVOU3I;zTmQayONefj0auc#^d zc$sh6zZV50}>OX!V#EkbWlP;3lqlWV=mQ7;mgNdyoCu%reHQY2(n?D zm>AWT0pg%XB5=dHRjQ3XdA2wcRT_9@J3xFWN}QUeew$Uz0e|G#;xt&eFjKV<0)R%V z35khOG+Ip{>vFA1;SDc^DEw1!8Jjy{rtL5`cOn}d#0};)8m%Uz)O0{B4b%Zxl4Hmfx}`Z*FP=pzZmp%;5sl3!bktpyruTRkOvdj~?Ku)I7vH tL%FF5?HzFE=2fsauPz&PmHJ`E-`RjLl9*R{*8l(j00>D%PDHLkV1lFg^|=55 delta 670 zcmV;P0%84|5VZx6BYy&XNklHwOp-x~BZ>(~;F{}TP8Gy*eU@cQ`2Dss zr+4rB?%k8o0R%x11VKb;R4e@UY>zkV2G6sOX5HYoXM4O+t$)PoP=<+ryZbyGf448N zec&j06u-sF;rPq9UwHT7{DBU2*u(8h7lH2~@I7p?GV)dlLcGw>zI0>fJ}}^kwhRDp zJ3Y9a9s=J3)3w}~(5xGr=^6sx3pGS_{r3onV;~+_Un>9ro|YcLZgs;sSvnTc&0)G0 zioUw>0RX?de}9ISf2;v<3ou;+0IU>>nduGDat9D@(zv-Tk26UG`)9=9cgqCdImX;f zuuO0O2z*ak_{b(Wihj+3-Rgqr8kP=?Fo}7HUph3vbPaZ^i+;_SD2|fkysfVlaCPIO zUvn_aN)Y13`bqjyqNFdrzTl!c&dP-7&byr+%CCMXbAN9_{?C`ZSvPpv$H6keqw7s0 zrkXUs_JN~_2ENUg!DX$0LlhH`oh7^}(R7^?#l(|o(AX$9Utf#TdHi{ac&Ry_nk5ClOG z1VIo4F@Gf*)yl|g=Dg-9^*vzI*g%#|XjChF)7X%DM#_Lv@p0xWRW?T{1H=VnmXXa- z%7B$ZG4lq<<|zG5Fz%i`3rv!mlmVYV9%a4)WOE$bfc~fR+`O`7a#gY5NEwjyqGJ}w z=13Jl29N<{02x3Aj7j@G`+{V1T=)tg2!bF8Vi$4w3%F}2O6fY*g8%>k07*qoM6N<$ Ef{0%{NdN!< From b3c9ef3896bf722ba531392272f13a4a0b23a3d6 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 14:05:08 -0400 Subject: [PATCH 07/13] woopsie layering --- .../foam_rifle.rsi/equipped-BACKPACK.png | Bin 2075 -> 768 bytes .../foam_rifle.rsi/equipped-SUITSTORAGE.png | Bin 2075 -> 768 bytes 2 files changed, 0 insertions(+), 0 deletions(-) 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 index 9fad788460b8ee3b5234b25a510f599556641607..9f39b02159dfc2e4d9a640ecb0650dc11efd315f 100644 GIT binary patch delta 745 zcmVp;(FE+qrE% zzpZ@4_QR^;Me$q4n)&?l%?I4yKOWKHvl?7KX`tWhpx^6Y%UFZgk|4wj4fT`8*x!yA z5DY8<02-|U8m$5Py$%d5fbGpq?iKNd7C^t(F*OY9`sWr9+dvFZqki0b+(j%F!?&|D zl*(nrjiSY8Lw^gHqCb7@0RT?BKP=-v)&MIsP2&I%3I<(e!f@OHpu)NUFmd1VO*#={ zOaXxK%8F~YLm>?g0R3JE71l+Cb+P|sAl0;eG7~b!lv=HZ8_Ua%n@~uDUwNd%&;qEi zF3z7<|5&I=nJUVfrtx?@j&`%@$aWCo)u`Xx=Q6P$W`Aj#0)D&9lgT6i@I{(1yz-6K z08gLYM7>^@UU^#ya4HEGV{ccybPsT{Clu1)Mg(T3pM`ka30PDTg!oDec>M)<7ri?Z z@wO9iF$s6p*Ucn|Bg)OnZ#dTGkdj8sVlJ!eHCst zA)iU`4SiK=jFbV9&{fwbRklVc1H=nRHzQl4lmXZLApk%!nRMMY5H*P!Cq?>FG?Tvt z;MAP3SS%`T5H4!l+nHm7vAU#mG7VO9=Tex@DPnN`;@C4swoI))yDOlos$)V`RkfW! zDFgKI=y%y{*0CO7HMdobb4$SgfGq=@J^^M?10{eAAOpyNiK%~gzaZHfFMR?Cf*=Tj bxV-!XPHTD&@1toh00000NkvXXu0mjf0Nqp6 delta 2063 zcmV+q2=MoS2AdF&BYy|tNkl;meo>}Q$u!RCl(L#tS~JQYt6@fO!!$u)~>uWWpsT;sR=?327| z;RL3)l{c^73CduS&SQfK=Jh*e;g@v4Kwk@gH-F=&PJW=Tg)ch@4)nF~k3Y0g`279YZ)ksRoDz?MvAGj>(vzrW zW601=&{=HAMh7(shD>iOZ(RQ{OctAP?RI(+*(*a5{E<^`zRkN%xaYHPE@AinFjW=< zVt*vT&85K2rO@VG2Qd?@-2o~a9fZze1LtVf)OZ2^%6|}Y+)SPk+{}W;6B}ZGB+JhN zwbuNl_u(}}y?`A97AAFGi{P`?sPZu~gfjj9*;XB6WPVnctcsA%))e&Tl8=Bf- zu&l;>IthbiH4IJdV0ys=K&bXFcsE)p7y}z#N-|-e`i+Tzhw#Ug;CwdpBDJ!>>)w0RU#0`I7W6yAWb} zTlsCrX8{0pwY7p1780eMP%8BTz+CDof-`49=nep55e5JxajT*C$X}mJVJyO6EW%*_k$)`O*6%MHzwA1I4f+vyZ9AgTDCn9R zi4&OM2>`&I^d#7zU-{HGn*vs(I_@LkChIg|SV-W_q{&4`nj|WyEH=9(Z z5F*~s#6x-Dco2ctwj&mcNtkd?^P|YbL&(L00Dw$9qzDTL{%s~H;B(1e@cr?l(C>4@ zX@9E{D6ik=hHK`Yd|G6ZW#gB{fLuH%nbTpv57B58_q$x!ez0E>1g+fxia0_s28i&_ z_4NuP4*;*8ScCmXvhX%ODGOgGSE;byhvDJjMPq`}^7Cf_3GH8a{a(akF(E#wwieJk zJSFKwm_XOm;L)SM2(;BZJc=5wZ`g!ypML=FZGaHzUp=t~u~-b_@9r&{Hu{E5$~r)2 zv7wYvnRp0czfXt>k9}Z--r<4HViV$q5_0~;hwwH4V^hG{*T)6p!+swO)phxNZmI_W z%G9)%RoHfX7?DVX8nS?Q*8}6z z@<-oY4-8!gg41`6AA9>LNm|Z`rhjQpMvF{VON@Y#qDM@(NF+j$Q75A)SH`Es?D-DfngA z0gE*{ve7|gRi-L;?fkOhugHr0M@5nI0ZUzgsF4-q;!|?L^$w3@Nv!s+&|+ChycAZw z5GrLnkl!BD;*0>fni++Tiy4mHw7B%@+UL&4o^{!&`jHb zi)U1g1J>>Ug^Op3*8aJ8Q0Ph#9aV7v*?<%Sil+gao>rayYg$32=@#V~ko!1XG}_`7VqsmN zrW6)ng{&aDs@f4^gMREjSp}!l364!56AwY@J;73=d zz+HcrYDD@Ew!uu>^M88<3U7;-WMVuBoy7(-ZAbsXHVOU3I;zTmQayONefj0auc#^d zc$sh6zZV50}>OX!V#EkbWlP;3lqlWV=mQ7;mgNdyoCu%reHQY2(n?D zm>AWT0pg%XB5=dHRjQ3XdA2wcRT_9@J3xFWN}QUeew$Uz0e|G#;xt&eFjKV<0)R%V z35khOG+Ip{>vFA1;SDc^DEw1!8Jjy{rtL5`cOn}d#0};)8m%Uz)O0{B4b%Zxl4Hmfx}`Z*FP=pzZmp%;5sl3!bktpyruTRkOvdj~?Ku)I7vH tL%FF5?HzFE=2fsauPz&PmHJ`E-`RjLl9*R{*8l(j00>D%PDHLkV1fYL^@RWc 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 index 9fad788460b8ee3b5234b25a510f599556641607..9f39b02159dfc2e4d9a640ecb0650dc11efd315f 100644 GIT binary patch delta 745 zcmVp;(FE+qrE% zzpZ@4_QR^;Me$q4n)&?l%?I4yKOWKHvl?7KX`tWhpx^6Y%UFZgk|4wj4fT`8*x!yA z5DY8<02-|U8m$5Py$%d5fbGpq?iKNd7C^t(F*OY9`sWr9+dvFZqki0b+(j%F!?&|D zl*(nrjiSY8Lw^gHqCb7@0RT?BKP=-v)&MIsP2&I%3I<(e!f@OHpu)NUFmd1VO*#={ zOaXxK%8F~YLm>?g0R3JE71l+Cb+P|sAl0;eG7~b!lv=HZ8_Ua%n@~uDUwNd%&;qEi zF3z7<|5&I=nJUVfrtx?@j&`%@$aWCo)u`Xx=Q6P$W`Aj#0)D&9lgT6i@I{(1yz-6K z08gLYM7>^@UU^#ya4HEGV{ccybPsT{Clu1)Mg(T3pM`ka30PDTg!oDec>M)<7ri?Z z@wO9iF$s6p*Ucn|Bg)OnZ#dTGkdj8sVlJ!eHCst zA)iU`4SiK=jFbV9&{fwbRklVc1H=nRHzQl4lmXZLApk%!nRMMY5H*P!Cq?>FG?Tvt z;MAP3SS%`T5H4!l+nHm7vAU#mG7VO9=Tex@DPnN`;@C4swoI))yDOlos$)V`RkfW! zDFgKI=y%y{*0CO7HMdobb4$SgfGq=@J^^M?10{eAAOpyNiK%~gzaZHfFMR?Cf*=Tj bxV-!XPHTD&@1toh00000NkvXXu0mjf0Nqp6 delta 2063 zcmV+q2=MoS2AdF&BYy|tNkl;meo>}Q$u!RCl(L#tS~JQYt6@fO!!$u)~>uWWpsT;sR=?327| z;RL3)l{c^73CduS&SQfK=Jh*e;g@v4Kwk@gH-F=&PJW=Tg)ch@4)nF~k3Y0g`279YZ)ksRoDz?MvAGj>(vzrW zW601=&{=HAMh7(shD>iOZ(RQ{OctAP?RI(+*(*a5{E<^`zRkN%xaYHPE@AinFjW=< zVt*vT&85K2rO@VG2Qd?@-2o~a9fZze1LtVf)OZ2^%6|}Y+)SPk+{}W;6B}ZGB+JhN zwbuNl_u(}}y?`A97AAFGi{P`?sPZu~gfjj9*;XB6WPVnctcsA%))e&Tl8=Bf- zu&l;>IthbiH4IJdV0ys=K&bXFcsE)p7y}z#N-|-e`i+Tzhw#Ug;CwdpBDJ!>>)w0RU#0`I7W6yAWb} zTlsCrX8{0pwY7p1780eMP%8BTz+CDof-`49=nep55e5JxajT*C$X}mJVJyO6EW%*_k$)`O*6%MHzwA1I4f+vyZ9AgTDCn9R zi4&OM2>`&I^d#7zU-{HGn*vs(I_@LkChIg|SV-W_q{&4`nj|WyEH=9(Z z5F*~s#6x-Dco2ctwj&mcNtkd?^P|YbL&(L00Dw$9qzDTL{%s~H;B(1e@cr?l(C>4@ zX@9E{D6ik=hHK`Yd|G6ZW#gB{fLuH%nbTpv57B58_q$x!ez0E>1g+fxia0_s28i&_ z_4NuP4*;*8ScCmXvhX%ODGOgGSE;byhvDJjMPq`}^7Cf_3GH8a{a(akF(E#wwieJk zJSFKwm_XOm;L)SM2(;BZJc=5wZ`g!ypML=FZGaHzUp=t~u~-b_@9r&{Hu{E5$~r)2 zv7wYvnRp0czfXt>k9}Z--r<4HViV$q5_0~;hwwH4V^hG{*T)6p!+swO)phxNZmI_W z%G9)%RoHfX7?DVX8nS?Q*8}6z z@<-oY4-8!gg41`6AA9>LNm|Z`rhjQpMvF{VON@Y#qDM@(NF+j$Q75A)SH`Es?D-DfngA z0gE*{ve7|gRi-L;?fkOhugHr0M@5nI0ZUzgsF4-q;!|?L^$w3@Nv!s+&|+ChycAZw z5GrLnkl!BD;*0>fni++Tiy4mHw7B%@+UL&4o^{!&`jHb zi)U1g1J>>Ug^Op3*8aJ8Q0Ph#9aV7v*?<%Sil+gao>rayYg$32=@#V~ko!1XG}_`7VqsmN zrW6)ng{&aDs@f4^gMREjSp}!l364!56AwY@J;73=d zz+HcrYDD@Ew!uu>^M88<3U7;-WMVuBoy7(-ZAbsXHVOU3I;zTmQayONefj0auc#^d zc$sh6zZV50}>OX!V#EkbWlP;3lqlWV=mQ7;mgNdyoCu%reHQY2(n?D zm>AWT0pg%XB5=dHRjQ3XdA2wcRT_9@J3xFWN}QUeew$Uz0e|G#;xt&eFjKV<0)R%V z35khOG+Ip{>vFA1;SDc^DEw1!8Jjy{rtL5`cOn}d#0};)8m%Uz)O0{B4b%Zxl4Hmfx}`Z*FP=pzZmp%;5sl3!bktpyruTRkOvdj~?Ku)I7vH tL%FF5?HzFE=2fsauPz&PmHJ`E-`RjLl9*R{*8l(j00>D%PDHLkV1fYL^@RWc From bdbc731ed40b4e23223d4cbcf1fb71a276cdf5bf Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 14:27:25 -0400 Subject: [PATCH 08/13] fix grammar to rerun tests for rogue unrelated test fail. --- .../Entities/Objects/Weapons/Throwable/clusterbang.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml index bdf7dada985a04..35174ba34d26df 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml @@ -246,7 +246,7 @@ parent: GrenadeShrapnel id: GrenadeFoamDart name: foam dart grenade - description: Releases a bothersome spray of foam darts that causes severe welching. + description: Releases a bothersome spray of foam darts that cause severe welching. components: - type: Sprite sprite: Objects/Weapons/Grenades/foamdart.rsi From 864b6db9a17442b68c0a3f377ebce38c3bc50f4a Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 14:40:36 -0400 Subject: [PATCH 09/13] cleanup --- .../foam_rifle.rsi/equipped-BACKPACK.png | Bin 768 -> 2071 bytes .../foam_rifle.rsi/equipped-SUITSTORAGE.png | Bin 768 -> 2071 bytes 2 files changed, 0 insertions(+), 0 deletions(-) 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 index 9f39b02159dfc2e4d9a640ecb0650dc11efd315f..09ca5c18fa0fe4b80b42f95c32206b5c72b6671c 100644 GIT binary patch delta 2059 zcmV+m2=w=W2A2?!BYy|pNklmS?;BuAmVe}bEtK3F+1_TJ{I+xl zD6I#s6uw?AIOFaT9fQ}>2ukA9<$?nM!JGV;CnVnl@n`Ge^HNaqB6MyHoc7FJ%yjD0qJ9-nX?~PI7w_s>&$HU|#D!B+! zOao}M6`AmmCc%*HZRQQDUxCqV70x|KP9k&tlmvhHu#0c;tP-yI;q+B(*&d=wVnF0p z9O>Bv(z6M)cveBo1WR{-%7lkNo2^LOn>AHlz`uS9*?;tOjuGkUd6g$RL~g}P&jQt! z+^P6f1^}?4E&bG8(p(G=las-~nK~`X6}KS&*Jh2s()MDya?_>}%r54GwDsUi*+mLqh|&`}gtd z7uyPa-haf{gx_izfdt?*7l+PZguzt(pPOFq6MlQvSp>yzPtF1WrrEio^e?#(VtbqU z7rvYU0Mt}h3r3hvlr}=K)C&N!i5mz`{|rKR02sZ*0)QlLm6Zkwc*vJaceVBP*toO5 z=(U6uN~T1y^7)x2@YR9b`Pl?UFR>WC#A5rN41ZcyZ!a0YlNNS0PH=u65ID=;HiI87CtR^P$8cee!u^*F+pj$@IydC`w#XnMROjQ+L{q&+hTbYh{90JPbP zVoIf=;|Te@LQHt=8v}H9H)yj}h#N}C?+3qyrw$mM0)E~nonEdXFf zw;b82iIVZ3Xn-^qgNd=Bm|s=eodq$0Tt|y)^>W1D;}w+ua6um!cNe&zPjHWOJC?!HoxA7gX7H|BVC=5^x9_S2PW=UR zo&?p=(ZLUNPQlRlmLx5wL~fdu(SIV7l?4dBNYPV_Zk;DVm7_e6GhXM(T)BSY#0iSb zJ7`)bxLP(E1WoJI%>oN$hu8>2frUyb_lohwwTNa0STw1uef;rLZvX{l$pA|RSYSI! zsq5sn!<5F?m-^6R9hrO~*C@SG#P&AxCdYaJKxXm}prWqen#|-MAlEDezklSVvBxz! zGT|X)RHkbB_V0^|za&fYl!_wz0~R^~Q6nqJ#i!(g>+Ei!A3%bnRz}FrN~9qx2cK3# zc_6nuro|osvN)UHn3=C_rqg1LV-8Wg%xWQ?j9fGj|Y0mW{>CGVfixFGDmo6O*941+&hADkI*v3KgTvv#mO~X~?MYaW0bI5J zQH@Cd&X!!S-fV@^%YWiUnHUX%Hd|q0Z0O(FBB8%{jH)uASPx!qUw*Oi%W8`L^hulK zIB988UHN>B{4uC*fY`){umvU)9+FVd%!Y97GpA~$@U_pJyqOJ2Trd+J0@=nBn;6lS z0pg%XB5>WRWvab>@@#P?DmU=THh_3jlsGj_-JDU)0OZ-?G=G>sF;le=0)Tpp5wVF8 z)LV=o^Kz|9;WZzPQ+QNx85-MRVr(!pwj&cB!X5Sj>Mcej)HFaO3Df{s>FJdCzKOAE z-j+5oHX#-m8r!k*Q9OtwRdxX~86kr(F*Z%xVPp(k&?n%NU?^t{B{M+oI=|M^c6?#u zEPHWO$=zU!fqz|=0n%Iyv567zHG0jJ=WFzcO^lTNR~@?CKvZurE*b;sEyl7-@TL6$ zN=#3w#GK{>rxJ6DOuuD2Z+2<|U~IXn%I47) delta 745 zcmVp;(FE+qrE% zzpZ@4_QR^;Me$q4n)&?l%?I4yKOWKHvl?7KX`tWhpx^6Y%UFZgk|4wj4fT`8*x!yA z5DY8<02-|U8m$5Py$%d5fbGpq?iKNd7C^t(F*OY9`sWr9+dvFZqki0b+(j%F!?&|D zl*(nrjiSY8Lw^gHqCb7@0RT?BKP=-v)&MIsP2&I%3I<(e!f@OHpu)NUFmd1VO*#={ zOaXxK%8F~YLm>?g0R3JE71l+Cb+P|sAl0;eG7~b!lv=HZ8_Ua%n@~uDUwNd%&;qEi zF3z7<|5&I=nJUVfrtx?@j&`%@$aWCo)u`Xx=Q6P$W`Aj#0)D&9lgT6i@I{(1yz-6K z08gLYM7>^@UU^#ya4HEGV{ccybPsT{Clu1)Mg(T3pM`ka30PDTg!oDec>M)<7ri?Z z@wO9iF$s6p*Ucn|Bg)OnZ#dTGkdj8sVlJ!eHCst zA)iU`4SiK=jFbV9&{fwbRklVc1H=nRHzQl4lmXZLApk%!nRMMY5H*P!Cq?>FG?Tvt z;MAP3SS%`T5H4!l+nHm7vAU#mG7VO9=Tex@DPnN`;@C4swoI))yDOlos$)V`RkfW! zDFgKI=y%y{*0CO7HMdobb4$SgfGq=@J^^M?10{eAAOpyNiK%~gzaZHfFMR?Cf*=Tj bxV-!XPHTD&@1toh00000NkvXXu0mjf^(s@) 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 index 9f39b02159dfc2e4d9a640ecb0650dc11efd315f..09ca5c18fa0fe4b80b42f95c32206b5c72b6671c 100644 GIT binary patch delta 2059 zcmV+m2=w=W2A2?!BYy|pNklmS?;BuAmVe}bEtK3F+1_TJ{I+xl zD6I#s6uw?AIOFaT9fQ}>2ukA9<$?nM!JGV;CnVnl@n`Ge^HNaqB6MyHoc7FJ%yjD0qJ9-nX?~PI7w_s>&$HU|#D!B+! zOao}M6`AmmCc%*HZRQQDUxCqV70x|KP9k&tlmvhHu#0c;tP-yI;q+B(*&d=wVnF0p z9O>Bv(z6M)cveBo1WR{-%7lkNo2^LOn>AHlz`uS9*?;tOjuGkUd6g$RL~g}P&jQt! z+^P6f1^}?4E&bG8(p(G=las-~nK~`X6}KS&*Jh2s()MDya?_>}%r54GwDsUi*+mLqh|&`}gtd z7uyPa-haf{gx_izfdt?*7l+PZguzt(pPOFq6MlQvSp>yzPtF1WrrEio^e?#(VtbqU z7rvYU0Mt}h3r3hvlr}=K)C&N!i5mz`{|rKR02sZ*0)QlLm6Zkwc*vJaceVBP*toO5 z=(U6uN~T1y^7)x2@YR9b`Pl?UFR>WC#A5rN41ZcyZ!a0YlNNS0PH=u65ID=;HiI87CtR^P$8cee!u^*F+pj$@IydC`w#XnMROjQ+L{q&+hTbYh{90JPbP zVoIf=;|Te@LQHt=8v}H9H)yj}h#N}C?+3qyrw$mM0)E~nonEdXFf zw;b82iIVZ3Xn-^qgNd=Bm|s=eodq$0Tt|y)^>W1D;}w+ua6um!cNe&zPjHWOJC?!HoxA7gX7H|BVC=5^x9_S2PW=UR zo&?p=(ZLUNPQlRlmLx5wL~fdu(SIV7l?4dBNYPV_Zk;DVm7_e6GhXM(T)BSY#0iSb zJ7`)bxLP(E1WoJI%>oN$hu8>2frUyb_lohwwTNa0STw1uef;rLZvX{l$pA|RSYSI! zsq5sn!<5F?m-^6R9hrO~*C@SG#P&AxCdYaJKxXm}prWqen#|-MAlEDezklSVvBxz! zGT|X)RHkbB_V0^|za&fYl!_wz0~R^~Q6nqJ#i!(g>+Ei!A3%bnRz}FrN~9qx2cK3# zc_6nuro|osvN)UHn3=C_rqg1LV-8Wg%xWQ?j9fGj|Y0mW{>CGVfixFGDmo6O*941+&hADkI*v3KgTvv#mO~X~?MYaW0bI5J zQH@Cd&X!!S-fV@^%YWiUnHUX%Hd|q0Z0O(FBB8%{jH)uASPx!qUw*Oi%W8`L^hulK zIB988UHN>B{4uC*fY`){umvU)9+FVd%!Y97GpA~$@U_pJyqOJ2Trd+J0@=nBn;6lS z0pg%XB5>WRWvab>@@#P?DmU=THh_3jlsGj_-JDU)0OZ-?G=G>sF;le=0)Tpp5wVF8 z)LV=o^Kz|9;WZzPQ+QNx85-MRVr(!pwj&cB!X5Sj>Mcej)HFaO3Df{s>FJdCzKOAE z-j+5oHX#-m8r!k*Q9OtwRdxX~86kr(F*Z%xVPp(k&?n%NU?^t{B{M+oI=|M^c6?#u zEPHWO$=zU!fqz|=0n%Iyv567zHG0jJ=WFzcO^lTNR~@?CKvZurE*b;sEyl7-@TL6$ zN=#3w#GK{>rxJ6DOuuD2Z+2<|U~IXn%I47) delta 745 zcmVp;(FE+qrE% zzpZ@4_QR^;Me$q4n)&?l%?I4yKOWKHvl?7KX`tWhpx^6Y%UFZgk|4wj4fT`8*x!yA z5DY8<02-|U8m$5Py$%d5fbGpq?iKNd7C^t(F*OY9`sWr9+dvFZqki0b+(j%F!?&|D zl*(nrjiSY8Lw^gHqCb7@0RT?BKP=-v)&MIsP2&I%3I<(e!f@OHpu)NUFmd1VO*#={ zOaXxK%8F~YLm>?g0R3JE71l+Cb+P|sAl0;eG7~b!lv=HZ8_Ua%n@~uDUwNd%&;qEi zF3z7<|5&I=nJUVfrtx?@j&`%@$aWCo)u`Xx=Q6P$W`Aj#0)D&9lgT6i@I{(1yz-6K z08gLYM7>^@UU^#ya4HEGV{ccybPsT{Clu1)Mg(T3pM`ka30PDTg!oDec>M)<7ri?Z z@wO9iF$s6p*Ucn|Bg)OnZ#dTGkdj8sVlJ!eHCst zA)iU`4SiK=jFbV9&{fwbRklVc1H=nRHzQl4lmXZLApk%!nRMMY5H*P!Cq?>FG?Tvt z;MAP3SS%`T5H4!l+nHm7vAU#mG7VO9=Tex@DPnN`;@C4swoI))yDOlos$)V`RkfW! zDFgKI=y%y{*0CO7HMdobb4$SgfGq=@J^^M?10{eAAOpyNiK%~gzaZHfFMR?Cf*=Tj bxV-!XPHTD&@1toh00000NkvXXu0mjf^(s@) From 54e36f41ba240fa7400ffeee90795c735e6feae3 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 14:42:33 -0400 Subject: [PATCH 10/13] I eepy layer forgetti spaghetti --- .../foam_rifle.rsi/equipped-BACKPACK.png | Bin 2071 -> 758 bytes .../foam_rifle.rsi/equipped-SUITSTORAGE.png | Bin 2071 -> 758 bytes 2 files changed, 0 insertions(+), 0 deletions(-) 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 index 09ca5c18fa0fe4b80b42f95c32206b5c72b6671c..c1b28e29f6eb1d4de9f186d7c4633dfc2970e3c7 100644 GIT binary patch delta 735 zcmV<50wDdD5cUO-BYy(DNkl~Z z>GzvrE2sP3yLX@EGe8goK@dbgm135)_P1DlS7lMwQQuWrYkz->Rf^f6IwUXg+naaX z>kq~eHXa>FQ53(fExXrm-haY_ox=egF|WbaaT8sqgRaxTy0(m{C4r0Q8m!~y(Ekn? zFqfDC05sb@G}}FNoenf5fsM5_78UWDl0et#xElI({c{WOZNLY}sW|RGwUJJz@%{7^ z^}RhQjH3B(O@B$aqCbCi001ZUPtW)dHNXo+Q5XOu=jK9XLVw%=z%Xq97`bo7MxDqs zO$h+z7Z*db9jXN|0O&d$7^V%ww6XK7C)BiKA`_aXDK#1m+?<^a+=OZY?Aj9*nv#HF z+Bkc8@Yh0(%2-iW6oq9n8GLKC0@)5+yqt==`&=aU{eR4iQ@|gWSuU3Y0Ct%s^sjug z-NW-2w_sV8@XGs2Ku}3IAA7&zg?m7dJ)v3v(-z=%`bmiQoq)?q0vB(zfp=ekk12g3 z;(aIJd=l=itRPC_$8LfbHOBsX<^1pKhi}D`#>aB;_g+KNb)8L8{8TCD!Hyn-aUp)k z>$)DjSAX+z-k$;EjwJ|!AP9mW2!bGp2~jC#FZ|3L)jEZa#8%ZMgxQ2jG0RrfC804w z1}r46hd!yIH3}KPKR|{V(HeyexDihR0CKrp=(Yi`iPtzP!l%N;%54BA?u4~kO$vi> zUfcHO6dR1!A!U$h@S3}v$8??oXRi(;^T-ydHCX0%1!P$cOsFi&z7r^9fI2^TuT&}p z)&soe_NsAe3HTrIWkAqRfJxLq2_OT=05V`?tRLYQBwFK@PXIv>1VIp2mtUwTZSRaG RUgiJ*002ovPDHLkV1g4qRRRD2 delta 2059 zcmV+m2=w>%1(y(zBYy|pNklmS?;BuAmVe}bEtK3F+1_TJ{I+xl zD6I#s6uw?AIOFaT9fQ}>2ukA9<$?nM!JGV;CnVnl@n`Ge^HNaqB6MyHoc7FJ%yjD0qJ9-nX?~PI7w_s>&$HU|#D!B+! zOao}M6`AmmCc%*HZRQQDUxCqV70x|KP9k&tlmvhHu#0c;tP-yI;q+B(*&d=wVnF0p z9O>Bv(z6M)cveBo1WR{-%7lkNo2^LOn>AHlz`uS9*?;tOjuGkUd6g$RL~g}P&jQt! z+^P6f1^}?4E&bG8(p(G=las-~nK~`X6}KS&*Jh2s()MDya?_>}%r54GwDsUi*+mLqh|&`}gtd z7uyPa-haf{gx_izfdt?*7l+PZguzt(pPOFq6MlQvSp>yzPtF1WrrEio^e?#(VtbqU z7rvYU0Mt}h3r3hvlr}=K)C&N!i5mz`{|rKR02sZ*0)QlLm6Zkwc*vJaceVBP*toO5 z=(U6uN~T1y^7)x2@YR9b`Pl?UFR>WC#A5rN41ZcyZ!a0YlNNS0PH=u65ID=;HiI87CtR^P$8cee!u^*F+pj$@IydC`w#XnMROjQ+L{q&+hTbYh{90JPbP zVoIf=;|Te@LQHt=8v}H9H)yj}h#N}C?+3qyrw$mM0)E~nonEdXFf zw;b82iIVZ3Xn-^qgNd=Bm|s=eodq$0Tt|y)^>W1D;}w+ua6um!cNe&zPjHWOJC?!HoxA7gX7H|BVC=5^x9_S2PW=UR zo&?p=(ZLUNPQlRlmLx5wL~fdu(SIV7l?4dBNYPV_Zk;DVm7_e6GhXM(T)BSY#0iSb zJ7`)bxLP(E1WoJI%>oN$hu8>2frUyb_lohwwTNa0STw1uef;rLZvX{l$pA|RSYSI! zsq5sn!<5F?m-^6R9hrO~*C@SG#P&AxCdYaJKxXm}prWqen#|-MAlEDezklSVvBxz! zGT|X)RHkbB_V0^|za&fYl!_wz0~R^~Q6nqJ#i!(g>+Ei!A3%bnRz}FrN~9qx2cK3# zc_6nuro|osvN)UHn3=C_rqg1LV-8Wg%xWQ?j9fGj|Y0mW{>CGVfixFGDmo6O*941+&hADkI*v3KgTvv#mO~X~?MYaW0bI5J zQH@Cd&X!!S-fV@^%YWiUnHUX%Hd|q0Z0O(FBB8%{jH)uASPx!qUw*Oi%W8`L^hulK zIB988UHN>B{4uC*fY`){umvU)9+FVd%!Y97GpA~$@U_pJyqOJ2Trd+J0@=nBn;6lS z0pg%XB5>WRWvab>@@#P?DmU=THh_3jlsGj_-JDU)0OZ-?G=G>sF;le=0)Tpp5wVF8 z)LV=o^Kz|9;WZzPQ+QNx85-MRVr(!pwj&cB!X5Sj>Mcej)HFaO3Df{s>FJdCzKOAE z-j+5oHX#-m8r!k*Q9OtwRdxX~86kr(F*Z%xVPp(k&?n%NU?^t{B{M+oI=|M^c6?#u zEPHWO$=zU!fqz|=0n%Iyv567zHG0jJ=WFzcO^lTNR~@?CKvZurE*b;sEyl7-@TL6$ zN=#3w#GK{>rxJ6DOuuD2Z+2<|U~IXn%UjVF 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 index 09ca5c18fa0fe4b80b42f95c32206b5c72b6671c..c1b28e29f6eb1d4de9f186d7c4633dfc2970e3c7 100644 GIT binary patch delta 735 zcmV<50wDdD5cUO-BYy(DNkl~Z z>GzvrE2sP3yLX@EGe8goK@dbgm135)_P1DlS7lMwQQuWrYkz->Rf^f6IwUXg+naaX z>kq~eHXa>FQ53(fExXrm-haY_ox=egF|WbaaT8sqgRaxTy0(m{C4r0Q8m!~y(Ekn? zFqfDC05sb@G}}FNoenf5fsM5_78UWDl0et#xElI({c{WOZNLY}sW|RGwUJJz@%{7^ z^}RhQjH3B(O@B$aqCbCi001ZUPtW)dHNXo+Q5XOu=jK9XLVw%=z%Xq97`bo7MxDqs zO$h+z7Z*db9jXN|0O&d$7^V%ww6XK7C)BiKA`_aXDK#1m+?<^a+=OZY?Aj9*nv#HF z+Bkc8@Yh0(%2-iW6oq9n8GLKC0@)5+yqt==`&=aU{eR4iQ@|gWSuU3Y0Ct%s^sjug z-NW-2w_sV8@XGs2Ku}3IAA7&zg?m7dJ)v3v(-z=%`bmiQoq)?q0vB(zfp=ekk12g3 z;(aIJd=l=itRPC_$8LfbHOBsX<^1pKhi}D`#>aB;_g+KNb)8L8{8TCD!Hyn-aUp)k z>$)DjSAX+z-k$;EjwJ|!AP9mW2!bGp2~jC#FZ|3L)jEZa#8%ZMgxQ2jG0RrfC804w z1}r46hd!yIH3}KPKR|{V(HeyexDihR0CKrp=(Yi`iPtzP!l%N;%54BA?u4~kO$vi> zUfcHO6dR1!A!U$h@S3}v$8??oXRi(;^T-ydHCX0%1!P$cOsFi&z7r^9fI2^TuT&}p z)&soe_NsAe3HTrIWkAqRfJxLq2_OT=05V`?tRLYQBwFK@PXIv>1VIp2mtUwTZSRaG RUgiJ*002ovPDHLkV1g4qRRRD2 delta 2059 zcmV+m2=w>%1(y(zBYy|pNklmS?;BuAmVe}bEtK3F+1_TJ{I+xl zD6I#s6uw?AIOFaT9fQ}>2ukA9<$?nM!JGV;CnVnl@n`Ge^HNaqB6MyHoc7FJ%yjD0qJ9-nX?~PI7w_s>&$HU|#D!B+! zOao}M6`AmmCc%*HZRQQDUxCqV70x|KP9k&tlmvhHu#0c;tP-yI;q+B(*&d=wVnF0p z9O>Bv(z6M)cveBo1WR{-%7lkNo2^LOn>AHlz`uS9*?;tOjuGkUd6g$RL~g}P&jQt! z+^P6f1^}?4E&bG8(p(G=las-~nK~`X6}KS&*Jh2s()MDya?_>}%r54GwDsUi*+mLqh|&`}gtd z7uyPa-haf{gx_izfdt?*7l+PZguzt(pPOFq6MlQvSp>yzPtF1WrrEio^e?#(VtbqU z7rvYU0Mt}h3r3hvlr}=K)C&N!i5mz`{|rKR02sZ*0)QlLm6Zkwc*vJaceVBP*toO5 z=(U6uN~T1y^7)x2@YR9b`Pl?UFR>WC#A5rN41ZcyZ!a0YlNNS0PH=u65ID=;HiI87CtR^P$8cee!u^*F+pj$@IydC`w#XnMROjQ+L{q&+hTbYh{90JPbP zVoIf=;|Te@LQHt=8v}H9H)yj}h#N}C?+3qyrw$mM0)E~nonEdXFf zw;b82iIVZ3Xn-^qgNd=Bm|s=eodq$0Tt|y)^>W1D;}w+ua6um!cNe&zPjHWOJC?!HoxA7gX7H|BVC=5^x9_S2PW=UR zo&?p=(ZLUNPQlRlmLx5wL~fdu(SIV7l?4dBNYPV_Zk;DVm7_e6GhXM(T)BSY#0iSb zJ7`)bxLP(E1WoJI%>oN$hu8>2frUyb_lohwwTNa0STw1uef;rLZvX{l$pA|RSYSI! zsq5sn!<5F?m-^6R9hrO~*C@SG#P&AxCdYaJKxXm}prWqen#|-MAlEDezklSVvBxz! zGT|X)RHkbB_V0^|za&fYl!_wz0~R^~Q6nqJ#i!(g>+Ei!A3%bnRz}FrN~9qx2cK3# zc_6nuro|osvN)UHn3=C_rqg1LV-8Wg%xWQ?j9fGj|Y0mW{>CGVfixFGDmo6O*941+&hADkI*v3KgTvv#mO~X~?MYaW0bI5J zQH@Cd&X!!S-fV@^%YWiUnHUX%Hd|q0Z0O(FBB8%{jH)uASPx!qUw*Oi%W8`L^hulK zIB988UHN>B{4uC*fY`){umvU)9+FVd%!Y97GpA~$@U_pJyqOJ2Trd+J0@=nBn;6lS z0pg%XB5>WRWvab>@@#P?DmU=THh_3jlsGj_-JDU)0OZ-?G=G>sF;le=0)Tpp5wVF8 z)LV=o^Kz|9;WZzPQ+QNx85-MRVr(!pwj&cB!X5Sj>Mcej)HFaO3Df{s>FJdCzKOAE z-j+5oHX#-m8r!k*Q9OtwRdxX~86kr(F*Z%xVPp(k&?n%NU?^t{B{M+oI=|M^c6?#u zEPHWO$=zU!fqz|=0n%Iyv567zHG0jJ=WFzcO^lTNR~@?CKvZurE*b;sEyl7-@TL6$ zN=#3w#GK{>rxJ6DOuuD2Z+2<|U~IXn%UjVF From 0538b330e66e2ee13fcecc5edd57e899381fadfb Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 14:43:54 -0400 Subject: [PATCH 11/13] For real last necessary commit --- .../Rifles/foam_rifle.rsi/equipped-BACKPACK.png | Bin 758 -> 775 bytes .../foam_rifle.rsi/equipped-SUITSTORAGE.png | Bin 758 -> 775 bytes 2 files changed, 0 insertions(+), 0 deletions(-) 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 index c1b28e29f6eb1d4de9f186d7c4633dfc2970e3c7..ec34a1b9ea107466407b7cb7164ca1dc253f967f 100644 GIT binary patch delta 751 zcmV`mhcrz5#_A*M z`g8RgR-V_SAc|ks=B?`wpT6SR*5L&mp<#m?M@{t1E_!Ac%i27GmIN-IYiJxbNB;JL z0nx}50HE3KquK7GXLg|}5v(jNv7m_8ln8oe*V16ub>$Y|+kg*{6Jb1kX&{+Q;`hl3 zD*OAAA4T)entu|pM1TKf0sxMUzeD3c(tu$oioyUO7LEGK1bf^8psE`HFm~SxjXRO9 z>ku09ZESc0O*-rRCNPY-N4qXzEIN+iA<>Lx>T>%aesQ+a}!EAusbhQXi5ZC z-N5PF+PQ@qmx-dRC<;rZQs}f=o@@s$UQUFqeJ&DvJAYG?6!70=mdRuQfZe1C_LXn8 z`*{840UC{l@X9+%fLBQvjJ;Fw!acyto>0nxX)~}oy&K{kC*Y=%z{OYFz{j7!mqgYT z@s1NPn1sg*3kZ_jv1_+=W!@IJ-x!b3Q$8izf(zAP9mW2!bGpD=6mEmmV_*wN9b; z0gLJ!{A@xopJt2doX{8{17>1(eVHV?uBCjfJ`RiyKTU0;x&$o z@LS=0@gaa?Yr=B5Ecrn=uWe)X8XF9MRXwTzFKESccGhq`Pl3~ShkX43!w delta 734 zcmV<40wMi}2KEJzB!9h0L_t(|+U=RKZ__{+#h*hZ$Us`9Z3g5jl^~0Q>cK;$whHPJ z)s%=8#NLU&0*QYj8v{`XmWZ%0fD(mDMe@+0UcykT2q`2)twD06P#puD6&k1H;-t3e z_nTrXr~BT!cc0}mKoA5$5JW$fVwSb`w^)5wWl`2q-&I*_e}9WrirJw$BroyXn|Ivn z55^HT9vw(g6u+)5yVq~tf5L;E!vP&Juff)F6J4i+uG7J~wv4DHfs5xFtmEd;{|*>1 zmzV(nG}}Ei+dXuh4m2f!jkPrv74e#qK-cNG8v1qpa|`fozz4{wIPO2Skxr-a{qz*| zy*(+6qWN!4Nq@MaKYw)q04MfO&-f2DzzaoD7yu;a=0ascf7}7UFl_)Bxo^croyasz z2>|977elihss%6r=sF!3rVYcivGc4a)U;zF6Pl(eH5v`voShBaglYlo+7lI;l7L~_ zID2{U*FufTSW#9Kg=I1sd~3A=*$!O1oQk{qTqO4W%zuniz#o@cE|&uUc9|yhuY9xJ z!}AxnU|E*%%KJ({P)Rr+d%xm^dq9vqp;`db7T|XJNr?BIfXhk(7jLwIcVB>yDSaa1 zeJ9|267H_7AWGuLZh{vz#{PTd{O{|BZ^e_w$8z!aUPID#olR2wR4M1djvj+?A%4f} zx*ok(^M7*Qp8?~JB?y8b2!bF8f*^Wsqs`n!B9Gbe;lduMQ*g$QG$J=2v$GWLXYOs4UCA6DVYWIzM=?R4N75 z1H9(;s&Q%w_#g0PK+sQsNz_0IAOpw%GGJt^AK@1yTH}>Z06`E0K@eA$U#KW;?~Ep1 Q<^TWy07*qoM6N<$g2Td8<^TWy 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 index c1b28e29f6eb1d4de9f186d7c4633dfc2970e3c7..ec34a1b9ea107466407b7cb7164ca1dc253f967f 100644 GIT binary patch delta 751 zcmV`mhcrz5#_A*M z`g8RgR-V_SAc|ks=B?`wpT6SR*5L&mp<#m?M@{t1E_!Ac%i27GmIN-IYiJxbNB;JL z0nx}50HE3KquK7GXLg|}5v(jNv7m_8ln8oe*V16ub>$Y|+kg*{6Jb1kX&{+Q;`hl3 zD*OAAA4T)entu|pM1TKf0sxMUzeD3c(tu$oioyUO7LEGK1bf^8psE`HFm~SxjXRO9 z>ku09ZESc0O*-rRCNPY-N4qXzEIN+iA<>Lx>T>%aesQ+a}!EAusbhQXi5ZC z-N5PF+PQ@qmx-dRC<;rZQs}f=o@@s$UQUFqeJ&DvJAYG?6!70=mdRuQfZe1C_LXn8 z`*{840UC{l@X9+%fLBQvjJ;Fw!acyto>0nxX)~}oy&K{kC*Y=%z{OYFz{j7!mqgYT z@s1NPn1sg*3kZ_jv1_+=W!@IJ-x!b3Q$8izf(zAP9mW2!bGpD=6mEmmV_*wN9b; z0gLJ!{A@xopJt2doX{8{17>1(eVHV?uBCjfJ`RiyKTU0;x&$o z@LS=0@gaa?Yr=B5Ecrn=uWe)X8XF9MRXwTzFKESccGhq`Pl3~ShkX43!w delta 734 zcmV<40wMi}2KEJzB!9h0L_t(|+U=RKZ__{+#h*hZ$Us`9Z3g5jl^~0Q>cK;$whHPJ z)s%=8#NLU&0*QYj8v{`XmWZ%0fD(mDMe@+0UcykT2q`2)twD06P#puD6&k1H;-t3e z_nTrXr~BT!cc0}mKoA5$5JW$fVwSb`w^)5wWl`2q-&I*_e}9WrirJw$BroyXn|Ivn z55^HT9vw(g6u+)5yVq~tf5L;E!vP&Juff)F6J4i+uG7J~wv4DHfs5xFtmEd;{|*>1 zmzV(nG}}Ei+dXuh4m2f!jkPrv74e#qK-cNG8v1qpa|`fozz4{wIPO2Skxr-a{qz*| zy*(+6qWN!4Nq@MaKYw)q04MfO&-f2DzzaoD7yu;a=0ascf7}7UFl_)Bxo^croyasz z2>|977elihss%6r=sF!3rVYcivGc4a)U;zF6Pl(eH5v`voShBaglYlo+7lI;l7L~_ zID2{U*FufTSW#9Kg=I1sd~3A=*$!O1oQk{qTqO4W%zuniz#o@cE|&uUc9|yhuY9xJ z!}AxnU|E*%%KJ({P)Rr+d%xm^dq9vqp;`db7T|XJNr?BIfXhk(7jLwIcVB>yDSaa1 zeJ9|267H_7AWGuLZh{vz#{PTd{O{|BZ^e_w$8z!aUPID#olR2wR4M1djvj+?A%4f} zx*ok(^M7*Qp8?~JB?y8b2!bF8f*^Wsqs`n!B9Gbe;lduMQ*g$QG$J=2v$GWLXYOs4UCA6DVYWIzM=?R4N75 z1H9(;s&Q%w_#g0PK+sQsNz_0IAOpw%GGJt^AK@1yTH}>Z06`E0K@eA$U#KW;?~Ep1 Q<^TWy07*qoM6N<$g2Td8<^TWy From b6d08e53a084a7815c682e46da24a594eb56e6da Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 15:24:49 -0400 Subject: [PATCH 12/13] Oops I broke the law! feexed --- .../Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json index 3ca59e4ac6892e..ba5198513b6377 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/foamdart.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-NC-SA-3.0", "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/13630", "size": { "x": 32, From def7f05825775273ee77aa1fba02f5b1b8b326b8 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Mon, 17 Jun 2024 15:38:35 -0400 Subject: [PATCH 13/13] Decided to just change it to the same source as the poster source in our repo for consistency. --- .../Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json | 4 ++-- .../Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi/meta.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 index d4926d03af5eb3..ceffec91b5067f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/foam_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "taken from https://github.com/tgstation/tgstation/commit/0a9e4d0cf0afa0ccbfdcbebf2a89ad3ce22083e7 and modified from the foam force poster by IProduceWidgets (github)", + "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 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 index 2866ae8f75e082..b89b33c08ffe9b 100644 --- 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 @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/0a9e4d0cf0afa0ccbfdcbebf2a89ad3ce22083e7 sprite created from foam force poster by IProduceWidgets (github)", + "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