From 5fd3d4552c8cf783fe8fe03dc0cfa472958e6282 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Tue, 9 Jan 2024 13:23:11 +0100 Subject: [PATCH] More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408) * tally ho * yarg * forgot some shit * Update projectiles.yml * fucl * glass ball * Update snipers.yml --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Guns/Ammunition/Projectiles/shotgun.yml | 38 ++++++++++++++++++ .../Weapons/Guns/Ammunition/explosives.yml | 30 ++++++++++++++ .../Objects/Weapons/Guns/Snipers/snipers.yml | 25 +++++++++++- Resources/Prototypes/Reagents/pyrotechnic.yml | 2 +- .../Recipes/Reactions/pyrotechnic.yml | 2 +- .../Explosives/explosives.rsi/glassshot.png | Bin 0 -> 546 bytes .../Explosives/explosives.rsi/grapeshot.png | Bin 0 -> 544 bytes .../Explosives/explosives.rsi/meta.json | 8 +++- .../projectiles2.rsi/grapeshot.png | Bin 0 -> 254 bytes .../Projectiles/projectiles2.rsi/meta.json | 6 +++ .../Projectiles/projectiles2.rsi/shard.png | Bin 0 -> 302 bytes .../Guns/Snipers/flintlock.rsi/base.png | Bin 365 -> 376 bytes .../Snipers/flintlock.rsi/bolt-closed.png | Bin 180 -> 0 bytes .../Guns/Snipers/flintlock.rsi/bolt-open.png | Bin 189 -> 0 bytes .../Guns/Snipers/flintlock.rsi/icon.png | Bin 387 -> 0 bytes .../Snipers/flintlock.rsi/inhand-left.png | Bin 653 -> 519 bytes .../Snipers/flintlock.rsi/inhand-right.png | Bin 660 -> 530 bytes .../Guns/Snipers/flintlock.rsi/meta.json | 11 +---- .../Weapons/Guns/Snipers/musket.rsi/base.png | Bin 387 -> 714 bytes .../Guns/Snipers/musket.rsi/bolt-closed.png | Bin 218 -> 0 bytes .../Guns/Snipers/musket.rsi/bolt-open.png | Bin 217 -> 0 bytes .../Weapons/Guns/Snipers/musket.rsi/icon.png | Bin 453 -> 0 bytes .../Guns/Snipers/musket.rsi/inhand-left.png | Bin 696 -> 736 bytes .../Guns/Snipers/musket.rsi/inhand-right.png | Bin 706 -> 735 bytes .../Weapons/Guns/Snipers/musket.rsi/meta.json | 11 +---- 25 files changed, 109 insertions(+), 24 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/glassshot.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/grapeshot.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/grapeshot.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/shard.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index 300935d901..312dfa35f3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -178,3 +178,41 @@ types: Radiation: 5 Piercing: 5 + +- type: entity + id: PelletGrapeshot #tally fucking ho + name: grapeshot pellet + noSpawn: true + parent: BaseBullet + components: + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grapeshot + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 15 + Structural: 5 + +- type: entity + id: PelletGlass + name: glass shard + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: shard + shader: unshaded + - type: EmbeddableProjectile + deleteOnRemove: true + - type: Projectile + deleteOnCollide: false + damage: + types: + Slash: 25 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 86da8e6662..d3d35f7180 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -135,3 +135,33 @@ - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi state: ball + +- type: entity + id: Grapeshot + name: grapeshot + suffix: Pirate + parent: BaseGrenade + components: + - type: CartridgeAmmo + proto: PelletGrapeshot + count: 15 + spread: 40 + deleteOnSpawn: true + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + state: grapeshot + +- type: entity + id: Glassshot + name: glassshot + suffix: Pirate + parent: BaseGrenade + components: + - type: CartridgeAmmo + proto: PelletGlass + count: 5 + spread: 10 + deleteOnSpawn: true + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + state: glassshot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index be1ca7b272..6b7b02e70f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -69,29 +69,48 @@ id: Musket description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. components: + - type: Sharp - type: Item size: Large - type: Sprite sprite: Objects/Weapons/Guns/Snipers/musket.rsi + state: base - type: Clothing sprite: Objects/Weapons/Guns/Snipers/musket.rsi - type: Gun + useKey: false selectedMode: SemiAuto availableModes: - SemiAuto + - type: UseDelayOnShoot + - type: UseDelay + delay: 8 #it's a musket - type: BallisticAmmoProvider whitelist: tags: - CartridgeAntiMateriel capacity: 1 proto: CartridgeAntiMateriel - + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Piercing: 15 #you fucking stab em + Bloodloss: 2 #no way to apply bleed, triangular bayonet wounds are hard to fix(source:that one copypasta) + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: entity name: flintlock pistol parent: BaseWeaponSniper id: WeaponPistolFlintlock description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. components: + - type: Gun + minAngle: 0 + maxAngle: 30 #miss him entirely because the barrel is smoothbore - type: Item size: Small storedRotation: 90 @@ -99,6 +118,9 @@ sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi - type: Clothing sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi + - type: UseDelayOnShoot + - type: UseDelay + delay: 8 #it's a flintlock - type: BallisticAmmoProvider whitelist: tags: @@ -107,3 +129,4 @@ proto: CartridgeAntiMateriel - type: StaticPrice price: 0 + diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml index e74ccb5fef..39aea03cac 100644 --- a/Resources/Prototypes/Reagents/pyrotechnic.yml +++ b/Resources/Prototypes/Reagents/pyrotechnic.yml @@ -176,4 +176,4 @@ flavor: bitter color: "#9e6b38" boilingPoint: 190.0 # Perfluorooctanoic Acid. - meltingPoint: 45.0 + meltingPoint: 45.0 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml index 6b1aff4be6..318490931f 100644 --- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml +++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml @@ -72,4 +72,4 @@ products: Ethanol: 5 Hydrogen: 3 - Sulfur: 2 + Sulfur: 2 \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/glassshot.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/glassshot.png new file mode 100644 index 0000000000000000000000000000000000000000..33bfe248b2e0334137270c50858af6a006043912 GIT binary patch literal 546 zcmV+-0^R+IP)lV~Ly9AaasakChgk><8Bowi=PU+?5{P~M z_7{dUeKCUO<5hsq_aNU&i}Hhm9Rxs@f&eIyf*b_`#6$%}4ggtHlOG6n1S|wTU);u! z*VzMh1l1e>@(nDtgM1DG$cYl0c<2!K*IIsjP$3Jp-u!z_n66hsqBhy+t9vLkRcUOEQc0J0-aKmNl23Jr7s^0lcf3&BK( zu8$-Kz%+xR1Y{WufE-0kd}9kavK)XjMUo*g>VVM@7!82|4*>vi^XVblj({!z000hU kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g2I^70{{R3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/grapeshot.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/grapeshot.png new file mode 100644 index 0000000000000000000000000000000000000000..c67ba454bb94900f4f14d325a5ca3f5c361d9aec GIT binary patch literal 544 zcmV+*0^j|KP)kK<~Y-Xr$TtKwBL@NY2Kuc2%?sHqObZ|6)g8%TgnedRfcKsG@8~~~{VNn3` zxum);gMgqg!-w~88J^$V3=RppL;=WBP=XVa*JltF6<~P%`UAtOhZh+@2@~WPxHzen z9IQ@w_3jJ9k+V06HkW9HFb9BYKo9`cg6M3J7+oBI&2pHdXyyQr1)xw+l@$d09t2?R z0T@lHTF0000!lvI6;>1s;*b3=DjSL74G){)!Z!;ABr1$B+p3x0ejL4jb^WUeJ$MO;(IPDd54} z`t3xl*EE@h&h0!qJyNcg)iP#hJ+v1%^ld?Zu7IH6->sRuZW_d_(TjC@d-mDSd2G^2 zAz%L9lszPxAhSMm!GSYgvh9mr`>hjL$Drt;IZ=iw;A)BR#(CQcStG75fAWua!hFS~ w`}b4VPyNlWb9!+b!?w3irTko6zA!iNpZcPg+i+db0q8siPgg&ebxsLQ0F?4wDF6Tf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json index f2543b0b6b..505d97a075 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json @@ -72,6 +72,12 @@ 0.05 ] ] + }, + { + "name": "grapeshot" + }, + { + "name": "shard" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/shard.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/shard.png new file mode 100644 index 0000000000000000000000000000000000000000..badb333185fe1f476839f267c2baa6299e973f34 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;9*Y}$B+p3w-@#KnhiwQK5Q?OTezozL#eye-7b^gog;R!v4-!9+U zX8ZW#?_KMxqq65$s0v#&UoEYj`CRhUraMV4PFf%8N-lr@drN{jG&I&wO;Pm3rZ;wd zizBA7wg^}rQ+cA_v4~?%@q#IbTH0b1d@s9CQhBg9KG8*~kgfZ1g*ngRx>;%&v!1mS v8hm2ga*bW{=~|7hezOA-$#3p6?qQI;XR?OD^uu?ccNjcf{an^LB{Ts5_X2j9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png index 39ce4fe713a4ea25829e684c5588e2908f743624..77b10f839dff3785056cb922f4e207586f4bc52a 100644 GIT binary patch delta 337 zcmV-X0j~b-0{8-uFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG z4M{{nR9HvtlsyiDKoEsTD?^M%3Z=l%TG`rg1$&OjL5PVrup%K~p$Rb>W9%?*+$F1G z05w+gH8Zm;^WOdd34$O9bp%0B_`YB0oCp7nY2w#(RICLCqJJprm`0K$QCWM^G-d5Z z2CxHJmXT#yWZO26p@sp+aky?n9LJRBc{2mc`Ls9;JaS!^MQ5~APhQ!bt~43+R8|DbIAPMik}%+K)K)q}FZ!W$LiVP94EGjDsIpYR|6 j6Ds|SxF86EKtyx{AYO(c1>1?Q00000NkvXXu0mjfq4SKf delta 326 zcmV-M0lEJ80__5jFn<9jNkl8`#6=WA7tz7S5D1bz9mK`S46cHL zL%)Mx#7~exXu;8?n~ONKdkBHh#0>40C@8whdcNR&(<$hE0=I+gtmmFxCrfL7o zXxgCd9f^z1DFD~O4TIs`pL#Ag4N!M>-Vw5TuNz2%EhNCh{ePgkJ~(Vk*Yvu9w5|-` zyPg1WcDLszC<_3dUSCLV`&Bv4Clsq|SawUfRT<#e-vS^FzZ=!-GI0)j?&ptt%Wf&h zuMBW?c_PwqsrriO?U`&88>Zz5Csa=)D+|(@=UG{>o;)hogX9$Wt|z8rkMjvxSrCmA z1HiN#vGV@$Yd^!f>0Xt&KVdXZ4AXK1KsJgSAKN-mxS>zN;I#We4VcLe-V6*nu~IRt TvU}rzHZyp-`njxgN@xNArAs@7 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png deleted file mode 100644 index 46f122e61ad80fdbf1b47c5ef361923b4c8c62de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}<(@8%ArY;~ z2@;%R%I%zyjTUpPx$JxN4CR9J=WlfO&DKorM66&F#2b}4nx7z$B>x}}4-I5nG-py1F&(0{6f&_Z`{ za}j^En@XsGw2d8FT$0tLo`a^gF-a*ET<){nz2m*_``+UYBoc{4^3SAZ6(|_{;-qv4 zz(u)6y>UI2=KQn`f<3_PO`W#$I+lNQToO?_)k-reh^HZLl z9~rbR6AZw*{xKFOHIFq=G_!Q9x#2CE_6q>_4|g1B8?gpl-=kyY#^UAB8wvBvnW-Bh z7^B_o?=5HG&QgCx6F94KuhAXS_ h=S?LNi9{k9pGoJmAMRCr$P+P_M}P!z}U+b(e^Y8MSca1xx%DLM*ju&MgGKpCt`6xjDb)b~z^i00000fPdcdJYUuy2VqdN* zefL;Y_ljXuAAh6KYpd5+$|SA+7mA|zv#u4NF3Rd$1uMkrB%{U+000000000((sv@oy*aw8=@6}6Z9Lv(Mgp|#qr^R9CQ zt^wR!WJ^6z-|3KbbWh!TRq1CauQqNi75n0T@z;^_M8K-LVNi#4o*?YP;hE&XXJImJlaDYhL{Z-A~lbf$N z3b0Ikr>hhjv!!DPCl{ZUW=X+^b`6n|OO62r#SkWrwItDzu-p=EJBlY)#W!^0H}9PX?R7S~u) zggn*bZTc2EZqQ4xxcqRR+T4k6cs3Pp{vX#;$~gU~n*SlcJkgy`MW65YPT0vV!P(Bv z>f_^QJzF|^p=wC~<5^MHSY>SYFWkTP?Bows!7RS4(*uN7{AeuUdMEMz_oYKCoPRG~ znHt?x%GmmNuf(KgzIsmuJH0Z4333bjO+5{cUbZ+K{?TTG596eOg8RR%s_z(!yPIcC z4v4Htz1aQpt%NUQUvg?J`<#38gEyWN5VE*+|In2$7P;T1CUnKe-~P1h!aL88x8KL~ zhka|EF!95^TW>_4`wGf?c)k2{tFmU-;dgJ_C6D{XhBYmlvHDWvga37t>JNA7wJIV7 zfffUD@Subauf9Uo?K!GS!Tlv1t@;`*j+QMouF{5U1g3THlv^#?^yAgF%KUJd#3Gg) z!I>H_Cn#jh-;%%o(R1VEh0!mQp5}A+h;f_^^(Xn`zCXw+ukw>FVdQ&MBb@01m(l A`Tzg` diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png index c81fea48099b1f161cf5242353a9b57da87572ce..44ab7375248f41b0fd2e664b2411bcbf8d24d80d 100644 GIT binary patch delta 504 zcmVpGr%6OXRCr$P+A&VUFcb!0(%deugin-M$fss71zEHtN_g7 zu}}&hO7Zx-kAE+@^;vPx7ee*RQhdBB%IhKh*Z(5N1BxhC_-@PdO;A>W2;qFPIqPF7 zUdR{Z+t0Kro`{Huh=_=Yh=_=Yh;}uGsS)phgv;%}V|D-`V30!J>WoaP=*wVs4!~?M z3Upl&0;Wj148fdK32m<(0Qc8+ds#w2$F;8i-WHx|PI0QZf4{B0yQFdq&^>l{h1+^= z%Wc_1=(c_92T33Z;_T>9J+DrJgdoM6!x|8}Z6EAmvKvB#P*;3c^9n&9Y95LI9tU^Z ucRi^R{K0Z0+Du{~gt1Pl5D`&-DD?{uTk#;GXn_I%0000C3xDXKB7*Oxw>>Lox>*yHm;^FNqxG4ItpyNtUdk(GUHnqyn)g{L> zpTB%sSyH!uzH6mp<^1!%_x(C#J2#<^gQ3`kVTLl(0hxM1hG!iN2JS2kmP!m~Rz^GM z$OLlg-fa_GysY8u+T7AjJDX2N=nF|j@wqcz`w+QS)-ffoE>QN(`>?w^Ls>7d>+1(K za>rMOEKXMb5)|6BmVwJ(e#zDIVotvzKD`zGFUw_rMP5ty)|RMP`)ka>Z7Y8W?cF-{ zgLi}AzKZgszQ7;#A-{AC>>H+9Put{jeA$b)`kbjuYaYJzE@~}jc{}~T+W#1{^ivbA zI!QF_WeIK&tjqr{u-Nvl#okK=e@moSd?@SwI@!@zq36j@MKQ7T%o|e@xE3^?dAql& zvi8VJXTySra}88#N=sjG=h&W0byx6senVhYwK7 zL}h_!l=3>35VmFS7z6^p{IJ}&=}w5CTjb&FhwH4IzPz~`HF=@>36(}QH{qOVEos+E zV&ogQ-srjIAv4pFm-C9+%24;8+-LJvUD0jWCU4?cRidqS}A;X9gO_}8KX;x12s~Z= KT-G@yGywoC#uFw0 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json index 494e6cc88a..43f600b580 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json @@ -1,24 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1a574ded496e5ebb5373a8221c2c563820fc137/icons/obj/guns/projectile/obrez_bolt.dmi", + "copyright": "Made by Pato Grone for ss14", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, - { - "name": "bolt-open" - }, - { - "name": "bolt-closed" - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png index bf84659ce61335733e55951528a86afafc9666fd..94d8949dc77bc9d2c65df2d76e6ff5e0c5083847 100644 GIT binary patch delta 690 zcmV;j0!{sc1Ih)EB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pHMM*?KR9HvFmCsHZQ51)dA||#-De+&W8EZf&(y=?5m|C_jnzCv8 z2s{N(!ZY+8nv{hL8%;=KD~SP#0$N3c)D~!So8NV2GJ~TGGk=%yTQI{N!gtQO=iH(D zBA3fCT*vvh5t2+Mxkyhoo7L7v8UWz zgLiK?+4mnMYPFjbi-ryIa(VDEYlST-y!&UpE_srxRf{J`=-bk_57u}C?%eGH>>4B5YW`jGrSF&%G)X*Q6D z=L7t{{ijQNXFb|09ShA|%WNAr!U{D4;g&Gy%O-Dqyg z0S^F@=2g#iIWP!Ni5YLtHMuDWLb-JTqW_%-Eh~}2YuKp(000hUSV?A0O#mtY000O8 Y00000007cclK=n!07*qoM6N<$f{~atk^lez delta 360 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 QkpKVy07*qoM6N<$f@Fj}ga7~l diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json index 608323e460..7609e516b3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", + "copyright": "Made by Pato Grone for SS14", "size": { "x": 32, "y": 32 @@ -17,15 +17,6 @@ }, { "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "icon" } ] } \ No newline at end of file -- 2.51.2