From e31cf20871662df6794354f66354190ed24c8074 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:23:57 -0600 Subject: [PATCH] Ports the /tg/ shotgun sprites (#22539) * ports the /tg/ shotgun sprites * webedit fail * i'm wario and my furniture is broken * hopefully finally actually fix tests? maybe? my couch is broken * update shotgun cabinet * update shotgun cabinet MORE * ohhhhhh my god... --- .../Weapons/Guns/Shotguns/shotguns.yml | 33 +++++++----- .../Shotguns/db_shotgun.rsi/bolt-open.png | Bin 286 -> 328 bytes .../db_shotgun.rsi/equipped-BACKPACK.png | Bin 912 -> 499 bytes .../Guns/Shotguns/db_shotgun.rsi/icon.png | Bin 266 -> 301 bytes .../Shotguns/db_shotgun.rsi/inhand-left.png | Bin 750 -> 0 bytes .../Shotguns/db_shotgun.rsi/inhand-right.png | Bin 777 -> 0 bytes .../Guns/Shotguns/db_shotgun.rsi/meta.json | 10 +--- .../Guns/Shotguns/enforcer.rsi/bolt-open.png | Bin 347 -> 282 bytes .../enforcer.rsi/equipped-BACKPACK.png | Bin 1214 -> 492 bytes .../Guns/Shotguns/enforcer.rsi/icon.png | Bin 347 -> 295 bytes .../Shotguns/enforcer.rsi/inhand-left.png | Bin 326 -> 0 bytes .../Shotguns/enforcer.rsi/inhand-right.png | Bin 334 -> 0 bytes .../Guns/Shotguns/enforcer.rsi/meta.json | 10 +--- .../improvised_shotgun.rsi/inhand-left.png | Bin 500 -> 0 bytes .../improvised_shotgun.rsi/inhand-right.png | Bin 512 -> 0 bytes .../Shotguns/improvised_shotgun.rsi/meta.json | 10 +--- .../inhands_64x.rsi/db-inhand-left.png | Bin 0 -> 661 bytes .../inhands_64x.rsi/db-inhand-right.png | Bin 0 -> 664 bytes .../inhands_64x.rsi/enforcer-inhand-left.png | Bin 0 -> 550 bytes .../inhands_64x.rsi/enforcer-inhand-right.png | Bin 0 -> 551 bytes .../improvised-inhand-left.png | Bin 0 -> 643 bytes .../improvised-inhand-right.png | Bin 0 -> 656 bytes .../Guns/Shotguns/inhands_64x.rsi/meta.json | 51 ++++++++++++++++++ .../inhands_64x.rsi/pump-inhand-left.png | Bin 0 -> 584 bytes .../inhands_64x.rsi/pump-inhand-right.png | Bin 0 -> 595 bytes .../inhands_64x.rsi/sawn-inhand-left.png | Bin 0 -> 517 bytes .../inhands_64x.rsi/sawn-inhand-right.png | Bin 0 -> 535 bytes .../Guns/Shotguns/pump.rsi/bolt-open.png | Bin 280 -> 301 bytes .../Shotguns/pump.rsi/equipped-BACKPACK.png | Bin 933 -> 492 bytes .../Weapons/Guns/Shotguns/pump.rsi/icon.png | Bin 278 -> 317 bytes .../Guns/Shotguns/pump.rsi/inhand-left.png | Bin 776 -> 0 bytes .../Guns/Shotguns/pump.rsi/inhand-right.png | Bin 805 -> 0 bytes .../Weapons/Guns/Shotguns/pump.rsi/meta.json | 10 +--- .../Guns/Shotguns/sawn.rsi/bolt-open.png | Bin 250 -> 293 bytes .../Shotguns/sawn.rsi/equipped-BACKPACK.png | Bin 794 -> 456 bytes .../Weapons/Guns/Shotguns/sawn.rsi/icon.png | Bin 247 -> 284 bytes .../Guns/Shotguns/sawn.rsi/inhand-left.png | Bin 559 -> 0 bytes .../Guns/Shotguns/sawn.rsi/inhand-right.png | Bin 581 -> 0 bytes .../Weapons/Guns/Shotguns/sawn.rsi/meta.json | 10 +--- .../cabinet-empty-open.png | Bin 486 -> 357 bytes .../cabinet-filled-closed.png | Bin 749 -> 594 bytes .../cabinet-filled-open.png | Bin 757 -> 505 bytes .../shotgun_cabinet.rsi/cabinet.png | Bin 449 -> 332 bytes .../Wallmounts/shotgun_cabinet.rsi/meta.json | 2 +- .../shotgun_cabinet.rsi/shotgun.png | Bin 396 -> 313 bytes 45 files changed, 76 insertions(+), 60 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 3c4fa05327..f43df5f37c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -105,12 +105,14 @@ id: WeaponShotgunDoubleBarreled description: An immortal classic. Uses .50 shotgun shells. components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi - type: Item size: Normal shape: - 0,0,4,0 - - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: db - type: Gun fireRate: 2 - type: BallisticAmmoProvider @@ -134,25 +136,22 @@ name: Enforcer parent: BaseWeaponShotgun id: WeaponShotgunEnforcer - description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells. + description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi + - type: Item + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: enforcer - type: BallisticAmmoProvider - type: entity - name: Enforcer - parent: BaseWeaponShotgun + parent: WeaponShotgunEnforcer id: WeaponShotgunEnforcerRubber - description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells. suffix: Non-Lethal components: - - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - type: BallisticAmmoProvider proto: ShellShotgunBeanbag @@ -166,6 +165,8 @@ size: Normal shape: - 0,0,4,0 + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: pump - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: Clothing @@ -188,6 +189,8 @@ sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Item size: Small + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: sawn - type: Gun fireRate: 4 - type: BallisticAmmoProvider @@ -261,14 +264,16 @@ id: WeaponShotgunImprovised description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: - - type: Item - size: Normal - shape: - - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi + - type: Item + size: Normal + shape: + - 0,0,4,0 + sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi + heldPrefix: improvised - type: Gun fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways. - type: BallisticAmmoProvider diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png index dcbe062978ecbcdb9f1a2c6e1ada2286b9952fc6..f593424bf52ad6fb330b46abd406efa2e2f8f02e 100644 GIT binary patch delta 292 zcmbQobb@JuL>dP(0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rT!2rA ztBQ(>j~s)&y}hKQ`H6ZG z^>aO4978Pp-%hX=JFLLN60RZf@}KxQE(3eG7A!*I iQKowr)o`)Li{H8bXp%x(sCP^&$RnPvelF{r5}E)ljBbzs delta 250 zcmX@XG>>V5gcu7m0|P^2NcwRg#aJBV?!(hGHfxhwxJf351FO&FOUqh)w??JD;SlYZV`*$;d?UcZ$b~`C;A-Rv z#{)W71=R$yWX>p@IAC*@Wzi9%D>DvC;ZDDLjjznQ0e8F9UgTe~DWM4f_+wn| diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png index ab0cac8d09673d5674233048e25b7f1b831a1e5c..79fe8aa7cd242b9bd0909256d2d3032664d293cd 100644 GIT binary patch delta 456 zcmbQh{+W4#BnLAC1H;_yjc+C@D%2YU_=LC`3p1o?F!;zZ$jQmsSXpUlX?c2j>gwwH z`}+fxW@KbII5^nZ+4=eTMMXscMOHg@)B`Djk|4j}|EPfBfpV-QP>!>}BeIx*f$tCq zGm2_>H83zR8hE-mhD5l(y?VEZNs)&&frqu;%eC_Vc2kEkE)TQczmF z#l7~vt>4e6ZJi+d>lZ`9e)i{A7T7b)ke%_5RL4x8d2N{Y)SJ=Pf8SZDf~I>|lwj+~80p+VUs4 zR%*q(^R@!>o*sBQlZEYrq=xbQl7(-gK5cWH`P1XTvH}Lv3kqzjW}60_eVzDk#<}{I r%MHsNeg3ruuVd*;Wr}Aw@`GuP#nXaS#l79YFlF#`^>bP0l+XkKf9kzr delta 872 zcmV-u1DE{s1CR%h83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0009eNkl4e-6vxLz?@Saq2qnaEKp;l{%e*jIS2J(s&FoHYelX1L9qhdM@0;13{g29I0^qK^- zAO;tl1uz?49(;^)=ZC{#QR7Ll{%v!=O`l9~5&#YE?EX?H4_Uhe^Qf=8jm!YEk*?%p^jvNTRs02%_mBrAXvUIN7U0#t^^JtjgF-x$0Ekp4Pj z3(}uTT`^=bnM`IX3Himx7k`)7@|&Qpr$uBR530QeLIf4-@>>>XfdfV4j^iA!v3 z0h+w}a*54a0HhXq^GyVX4aLV921jBNTwA=l=ej>ZRDe2+3HX$)VsgD9E7({RSgi#(s#pm?8U}oXkrghb7(7*O7r?V?XzwL{=bQF2ESyF@v!%Lz)Iq1w*Iz`#vDWRTAVE{2vAwHl5KqKT%Jj zzRA&_$QCVH_HLt~Rt zYM9#Y-TWrS=Kp&_`u1>JxtsnE{w8_6RbBg8y)WtMGLX3r(fq|hhB>gy$Vk{1FcVfJGQm1}mokYE2fKP}kP}IxIOGQORKtMo2 zK|xJYxVODEL4|8UW?-wAmbJC@)ZJbefr_|Gg8YIR{=-3SS?yJzaJHw5V@SoE+s58H#%rC%YZ}vLbY%LzR}R zN9ofuGpEj7>bOeu@@Z%01g6W)!Xi%2&Wg`M&*|{%rUp1g$VAGW66ks}sX*l32PTH? W+vKwaEZjl%GI+ZBxvX%O3EC!(lY%u}+j6KnIRDKf}erR(N`TNpiuwM}oT# zdCbH7*exmmyb-o*dkgu1dGd|2kP^kDr~r_>V8i+T`rIgxyAOFZ&QE?s`WGz+(BAg- zLjr+G5!W%6iA~}g z46xg?-UPVLXef%m?uQd_0#3jQH~}Z%1e|~qZ~{)i2{-{KkRO3GhbXyy5z5c~@k&|< zg#?i1b9x~G&^P+Hzj2F1MA5(5&GKjhZ*J(kk_#`jECb`Pae9a3I8Yn7Oe?@ zF=-mUAj5gA$A-EDj8Z8Uk|wS!x34q_(%HAutEPGkr}>fYwpU$=$cAAu!DWG*nX) zKv`|i1WS3V8UphOpn>fFstMpdZBOT8)DT1kAkX^cSnIfylk??R$}Hs=yN74j!Z_$* gG+5|!9X|xV0rMC44{@%*n*aa+07*qoM6N<$g8nsC0ssI2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png deleted file mode 100644 index ba969a5ab16116726d3a59f51b322f9d88a659d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 777 zcmV+k1NQuhP)sh`M&u{xLKv-5(b0;VL%uV2801&Ko}4PgaKhd7!U@MW}ve+ z|A|ish}jU~D$5e^_10>Tncf7@20_|O77hgu^SlWt8B1x~&AE1Jx7#|Oy4~)KORfrY zmoM)#9rYTN|FGK{0RX?*TFp`9Eb zeWC^sD^q~i2m$y^zXV2Mc_<7B1HynXAPfit!hkR!3{s;VO#piC=oq2@&QqaigYxthP4?KWZ!#pW|DFdZ zZ=OOw)_Dcz`2d%3zWsNXj?lRn=M}tDz+|jX|J}6C_ZfK~J-t}x6(%CUr~mE?Hcu|r zd4-7x@aezj0kh3>@5el^Fm??f!}I#@Bo}h00!wRRo>!PC0?0tRoBHoG=X)pc_}wq# zyh33F@SZy#`vT{3d_5m?nM#h~J>+f?#z7B7LlOE!hlPPJycPL0fn;`000000NkvXX Hu0mjfC|zH~ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json index df70db984b..7408c3f4ac 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide, sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "bolt-open" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png index c794549c55faae7f32d12678ff65b85e84c7ece4..1ce79958173281e91f24caa94969d17065e80b88 100644 GIT binary patch delta 246 zcmcc3G>d71L=p!x0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rbbwEY ztDvBul9H07q@<#vqOq~Dy}iAfnwqPtD^Q-3A^anVDhcun{tpEV!TuFO6ZItOi#=T& zLoEE?_B-+&P~cz@clq*P|DDt9V`^*Tsta~BSSPu}Z)lyopL4?Moq@8fB1+10xH2YA zSbI&2!R79zEnCw9xFvSG9IlqJ@y=v^)i|@d&r>gT9=~!?luUfR2-Dq|a#`EX+8(5~#9gxNuD7y4iQvzhJj{y85}Sb4q9e0C{6okN^Mx delta 332 zcmbQmbem~{L_G^L0|P^2NcwRg#aJBV?!iIj#whSudL4!p_9dBY(tAShxY0tBrqlS;yj3>hve zsGd1??3h|srmKSJp>qzZ%aru=^n_#;E*(8;aACs2oi}gX*bunERD_4gSAoePw`tMl zu(eTJ11BupxOj1(K!mooP-H4CNOZ7=h#+#(ePLh7|`UpFwm)?Ini8z zVeQiwFESD`rY1abD6Cw-5+K4^z_F-6Qo`jTtCZ@6LrsgDmn>M!%D`}QukMKr>IOG} PK49>4^>bP0l+XkKV;yyx diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png index 9d5dffa44997fda2ae525f786d17c13b2bba1dc2..c5e9fb432414425101c12d0499a31c53bf1d2dde 100644 GIT binary patch delta 449 zcmdnT`G$FdBnLAC1H;_yjc+C@D%9%+_=LDhN=h0V8_UVb*;rX=X=! z)n#O4I5;@i+1dH|`9(!V0Yz9&8~6Yz{*oZS;QuIq;mVyE3xQIc1s;*b3=DjSK$uZf z!>fUTfl=4f#W5tp{q3~7lbRKH+$Or7nl|lwef=G_rp+uJ2j_R6<9oh{ZT5SUM?GP! z-986vn}p>ig`7@2EOwK{oj2>E%Yv_l%ulip?r=<=$I%qD;ore11-Hbyt*RddxHtDn zD69|P`z%zEp=ToRHMfKDKqZwPY_D~G{`FFbV}0_NrE=;5rbISr&FAb|jt2YpFg`Z9 z&rz1vU{Qb5Zi(QA-wA6kW#7IxFEK6Qlda>e_UFd>Mw$QOir>c=IPQ#k@ayM3h83R@ zP8^r=GdLsSLMnYI1^xiGI+ZBxvXJ@`KqLHML7Y2dTe zOOT*h;m=GA{DD8B-E8Z7+_MeC?#!9pnQ;d02ZlSd?q0v=+;h*|nRAs!qtR$AXn$;I zOryPZGfr(7V6Cj(ijqv56Yik8rdA#7@2QQ=4a@Hb1?XnYz)JU-Oq&z@u)N}|N+y%! zgfPIyLo>A74Vt9`qRnmTWlhv)A>{fWY`?Xf5jrmf#}0_c&zIogXMJsz9N<(}K~um_};#)x06NdcijQ8j(@K7{K8ze-(nqr z7Arllzki_icDE_(yJ0+V-2qsk@nWQy&}7{1&lez?m#S{yc7Ga;Mx)VaG#ZUYPMFr> zPPB?%h@dirVgm?rnVhvjt6fcy5j|SMqv+JGJQf6;Y86EQkA9etYIgKaFbsPHoN5#~ z0O17qC1j9cjjY)Yk$(dQ1_r4OQv|SPS3qLH5#&1n*DRos_0k_~5a$4to>7S4H?=_m z)hd+Cp$!_LRf@;~(hiN4BfmhMva+%=bM+soW?Kg!lu&vGNHF;lp{+7Gxw4a`MaXoY48wto&lQG&}-$gt)+0gt?& z)ncwt17msKs1KSYyG1M=z#+s-N`x0`bqsHkz#Q~zhX_X-FgqODcnYv)yJ;Yr0?4jN zD)8=`sgqq94CbJp`vf+>f1@^+!=Vitp;daf5(#H7a(ES5>~sU%Y4Vll*=TbV6b%*^ zFJHV$d%69^Eq|a9TBVCN+bMwE8N4AOOh7ZVXD;(%>i}~d-k5}fj${vkCgozqC}^?xEs)|V3Gxg6j{pop z_s^XJigOltL>4nJa0`Pl<3xM*`VvnU#}EtuxBZSn4GJ8tj2oTa*Wb5$VPY1%EB9hD z^FQ^z5b-}wkF%Ky^YvWZ8igJR`gA5RPB(pi=62nN8E&4MuAWyMbKda2OWdHL=zb>9 zwA-*_>50dQpJc?29hcw9V1DiEV(WeU7rnXCA`Scx>YIo;tyTXrN4 Mr>mdKI;Vst0En++8vpiIj#whSudL4!p_9dBY(tAShxY0tBrqlS;yj3>hve zsGd1??3h|srmKSJp>qzZ%aru=^cLwUTsnHx;KGE3J8#~&u_17SsR$2~uL6@pZquU8 zVQZtd22NPGaq;3nfe!1a?JX@WISC0FISCV9Okm(D&#|rgqT#V1FrdkGVW3k(bE3Hb z!`i1WUSuR>Oig&=P*}NuB|wC;fMZdCq=d^wRw>mBhnf~QFIljdm4Ts2Ot-NusE!@z O0|rl5KbLh*2~7a4m~?>v diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png deleted file mode 100644 index 3878a18861d6656f68a6b606ea52949c129549ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_<>cfn%*^?Z54`+}`F?T=9&Pvb@2gOmDg{1Ut}%N O8w{SVelF{r5}E)%vU(E$ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png deleted file mode 100644 index 201a669d7bf19269ee652d9d9baef14e48e5c046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_<>cfn%*+P84RG?h!U4U?W}pZTKp^sQ!F zoCVW?9Xp~D_IW;*+#A_qFqh-OzB;*Y>BRxxO0Hzo*giVDDuCrjT*89SAz3NnZ3|9^ zUS?11^k`>&bcE&K#7`U9T$7kKtSd2$XKB6nImJ_?j^$0_1_>3*Kre|O{{P>yS28{C Xk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}z?%1)Tt*tFCE>2NV(a+CMP*Bj=*jPzPNkl}X#)o%eq=2z7LxuzQ z-IME1ZJi!y$N|*%&~xuAASGB5Eaj?;r@2&>1l@)1YANd2?fag|G%|uqw(RzQa*RiKFoWQ9Bj@xd)E>DnN6A=UsyA( zD_qKJciwyS)~c?}<<#+s3pdw1cW0~I{+ykyaB1D=lM5alD&`f_3DkUKxp2yq>GvG& zey&luWMj&~utJimB9pn=cr`P<`66_4#4^hG$t`5K#)eGZDKEK5*0G5ylPc@Ng# zvHE&V@JZ!O1@2ROG6YylPk;W?EoYk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}z?%1&-E-tREtxZu;(a+CMP*Bj=*jPzPX=0>6jSsJgh{)ZO>oOd; zjfELbZJi!y$N|(>aa8R;kP<8j@(cct1{hS=&P)PIau#?*7BevL9R^{>$dNQ znVrqQ%&ki}P*>b|o9%Lb{DWl&zwK6k!=5-zDlY0q-7kIzjytO!wd%4-$sM~Tsm8Fo ziqU7CM(Q+%{9ucN(hldgX{G+GiFFiy@jiXws*cjgm7kd2nsZGEI@|Rsw&D6B)Aktg zkPG~30h79PvSPQ@*&W1>K|hfJ%1vhsoKO*SYp^ oPJ?Z$fA=?8n;ewq*z%9@Oyf_3dqwsC|boFyt=akR{02Xu85C8xG diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json index 3a12cd6330..92bc382a42 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, inhand and back sprites modified by Flareguy", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy", "size": { "x": 32, "y": 32 @@ -10,14 +10,6 @@ { "name": "icon" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..749dff75b0e677fb5633457fd4e62133d5456e89 GIT binary patch literal 661 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|73-AeXRZ&qfHa51mx0jTZOw(YfH)imWV=xwGnCQX|RPwf}bP15+Dhcun z{tp8To6hK*2a0kQctjR6Fz_7$VMb96uLhunuRL8GLn`9l-g@2FtRTReFeSS7zj&O+ zhP>TJEf+6ca?-LsD=5Y8gOISn?I!{b42&#L;=pyrGeP`u>4E$nl}(ZT{uBQFmyfMh z?hDBKC=&YF#xA-){`jir4wrx3+s<-|JDtOm=ETW4QCyySS}Y|n8%{H zHC0F*#wVk4rzW3~dp2Xvdk6c2 zyYC6fv1zE!Xa7;a8=xIOqcQLAd4@Uf*DrKxm}T5h{r_6o>wdNwTmO9XXJvT%#Q3Xt zFjowd#y372)%^#SuygEUDRpl!TUmG8p+K-eukugQ-^Pah@&U#S{PG3D44MC42cCP* z*e}0<{i{3Ur61o{xqoH9*RsEq|8+mhl?_~{K5bL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ca804b82702c1ce817d7cfcad6b4fa46b5a8979f GIT binary patch literal 664 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|73-AeXH8wU@QBkqCx0jTZOw(ZSkz=SgW-u0JnCQX|RI=#6)`vift0c%T z_&*FVY&xTJ9w^FL;1OBOz`%D1gc(IOyc&QOzV&o*45^5Fd+X+;W(5J(3kEq4|JPSU zJZ^GW{3S*1U2VsbQ(N4xsDyqwU26$60}ejiXV9O>9wYeN*lw@5{hp>>|0Go+o4T@!I@SLzZh@s2*LH4Q*OBuFA>VFXJ5ZCgv)5H!4U&;toWAy7f+8|?;kh-OlKjDnP zhTF>bww_?IOB|{&&fMkj9<@_X;>-8Aa|gp zfzx3>R}90Z2407^j2TQ{{g{V7pJ;9071`CGAjx>-jQ;Iu zUlKhd{>w4GIlFGzwXE8y4^8X9Ml%G(4 P5+vg3>gTe~DWM4fO}quB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..82ae89a0b879fa0da140747552b976b291b17afa GIT binary patch literal 550 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|74)6(aRZ>zC6cm({lvGnwD=RBgR8*WeaiX!YF;ITmE%ix2inAohFZe$c zFa-No2!R9(JR*x382Ao>Fr%o3R|C+pdQTU}kczmsw{GVhRuE`OB_#();|bcGKO!_sqM0?Y+U2U87Zc zFZP(2#bNiqzRYe}hO@2KJ1zND%kycM)%xEVUvnF6%>Jf)cZpjc*deUx8&!g zlNVcR2l(aQd%Ku%&#!A$OL~3YajoIM&aicb@rAy7+Qz?KKkExQRQ>zE^vbmWG3 zZLz;T+2DVq3QvL1st=|vOkSdP5@ww24pl`=j8SkmqBGb(eB8{O&U2vb{lBmh2cKG5 zg*mc2L`4_8n|oW3G4ZRbLrg92g88yLP9**IVUkE^zqdS&dkddUY-3g>TSZj;*47oi zhuS08DqL)M{Acs41cL`R-pxPGbm`w4PYs6^@?0LLPEK|>5V8OJS7ydXzm<6w?AyPH xL9_e)d4-05zjZkl{IBbo-I4@%)IOdUe_1z5{O*k{ExHU6^>p=fS?83{1ON@{)T;mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aef5cc6c7153d585f8864b3fa85a05a9aae3d3ca GIT binary patch literal 551 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|74)6(a6%-UyQc{wXlvGnwGd4C>R8%Z0E1NiRB2eDD?8de74HfKwRbabY})e76AtsVZy*!S`aPe;KJ=>{q$}21_h5bi_3SJPEZQC zaQ!`_pazHG)r<933;_YJ%7qs&Brt8=$9BWT$YH_taK=>g6ZWM$bRH^Jt*!dY`b`&c!aj-EcC6SCgdWs19)5cf8-SHJ3088+0LOrP`F^1z~#H&3hoj;nC+ zYW`HtpmKC_L#SXa_nMuI27Jg)LpT!5QeX&X|G;q|gqz`s{tUr{YX^>eG-op?Waww~ z;c#Hse}L`8*3HrR!cCkLNh{4m<&t;ucLK6T&#lxKd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..aa318a6151d553e5bf3ee8286e0b6ec3058625a5 GIT binary patch literal 643 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl`{4)6(a-LYdwTU%RPT%3}UlCiO|qN1XRh=`z|pr4=L#7Kb}AKtqs*JU_x z8w)d>+B!YZkOQdiz{mR~KuWMA$S?Rm8emXeJ2MF=$ywkLS)<2~iPY)|R;91kXs9sp-g-ip( z@>lm+UKkxIZeK0w`?N=Q_RbF_oFO4EesE;eodY6C!X<(_XgF}lxGSJsmPu{cn8G#q37`Z z&4HsC3^(p=G~#OTtYji2fE-)3aCBhoeAwHMe{D&%1x{*G3kLCvW-{7wp^L@ccR-!#?}73@?7)=3@9?Z@~26e|!!@MZNL? r=6CtqIW7t~Ffg)!i2t$yr}!^y{O+{EVM%xNb!1@J z*w6hZkrl`{4)6(aZEI`Wv13PET%3}UlCiO|prD|Lh=`)1qMx5%jSug{NC9JEh71Sp zyC>J3+B!YZkOQc1PuX6OrGh0ve!>6I0E6n=JsqV@rjJ>9{vBon8Uq6j z_G}VvT2GAb{rmK_Oh~-vu#4!^XA{L-{w|iBAbRBQW5p>VD!-01I6AJXXA)pB4y`p_ z{%biyU6cyT=Si>Tv#fc&E%>JX?``Ws;wCZGaLbikR_5PUFD1a@ec$wk_%eHDj;4Ld z2E~6R9U}CXu6!rB_E7ZFUt(#je?FRoeC?=|3vqqOaPQJq_cagaA7eVS>*7{JFUz+p z{94#8TwSB5m^M0?ccz3Xd|o}vBD=`{6oZxT!pmmgm+&mOE@3sjI*9FqHL_n|euB^s zwYt9eV@k~=Q!6PiER~&l5>Qz0OJ*o3Wv+fB7aJ<@I9E5D?DYMV*VM%xNb!1@J z*w6hZkrl{S4DbnYRa8_I6ckiaQkoqt6RpBvEX+`E%wTM6JaOX0`ucjHsB9}XD2{24z1g*gj6B8wRq_zr?Fvmp?0T0WCI|jP{ z{~uJH`a7Ug#W-_q=+&9xn=Wm#(`i(AShClGi9?}*0ZM%M&Y=1Gf#ytmxw8IA%Nt^9 zSlU_6ynfGNabVTIwg#ptF|+yIGpC9eG{pV?@KJ+ZTY;gxHu~y*)?=In4wk$t?z5H& zF-c6gH%<71w&naEg$wWdyf66c-`IbRk@2Og>Lu8j-uO2Bp2qQ~bYer>on6X|?3?6SI(lG^ zMK~MI3TVjud?-zV;rBZ}E=G=({tQX49y2VcOw`t3$c($e#c^Pkc-zc9dk-^Yd_JTx zd9NbF#XTQnq`4IsF7NpuA-(@^8-x8mhTA`6mDoPK%}e{NF16uLEysrWTi&E~vNG(| zU)aF(<(>=EgkKXICh^YLTiCF#=10La1BP8Su8a?!T5}ZG+coy{8#c78mosEY`pPxC nC4)u4fq@Z7H2mk=v5vp4ze?C;N!mqV%rSVn`njxgN@xNANcZ0+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..56c4aff8745ce62428b7f1663804ede483f14d8f GIT binary patch literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl{S4DbnY6%-UyR8&+_Qi@h#m>n%+EX+`E%wTM6JaOX0`ucjHDiy{J>OhLS zB*-uLKO8W4`7?e33Ud~CL>4nJ@ErnSMo|r~2B4)&JY5_^D&pSWx|?@cfrmBWIs2_o z|M+bdE%f8vm^^(>-lcOpodTunRj0%xXzrI`;!tQ{fD%8F8D`#Mn4bB4ayi4y+ZAN&NB~@2^Ee_w$9^$x9k>#_l z{1tnKE7?W6>+EN|`^$8vs76qsLguSPTpurH%>=3zhAUD06TsWGg5&Feuq_2skX^KE%K?=PuhWg%F2Le$xJr-#1-g z_{x{8zWg2^gXjhxCNoFrnSqR%KVF1oM^^NHTxe2NWy|&BoP+jpQw9g;v)<VM%xNb!1@J z*w6hZkrl|73-AeXRZ&qfHa1SvV5m1{@R4J%x3`y+lr$D*nCQX|RAOJ18xN$oN`m}? z|HA;orZYO{fufuR9+AZi419+`m{C;2s{v?Xl&6bhNJZS+Tc?GZ40u`}-eQ~Zy*{zK z>{#zsb%&HWKl^9vIejji=SHE|$6lLBu z-TqYLrgFiY(2d*Vj&?aKh%M7h-C8gDWb=B5S^1fn*{Y{+He}9wzU|7Q@a%?L|B@U& zeJyv{A9*k3ZM-t$m*@XwwZE#%XfST7{KvFjXWH63$C=)8{rGLqdMb7TL-ntGCRVxc z0%46z{VX0R&VjoN#Q4Ljz@wG-X4Z+_i{46Kk7vH}@6~qZxnI;fgbsXsd*Jzvyxm#Yy2 O67+QSb6Mw<&;$UlTEgA{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a51a641f0b1830f8edae5b43be2e4d462c54ddf0 GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|73-AeXRZ&qfHa1SvVDOP+s5fS?x3@PIW{{MWoan+1RHAo5D;h{~l?3?( z|AzsFO=on@14TItJR*x382Ao>Fr%o3R|C+(98VX=kczmsw+?PPq`=dfsKW8>Z+yhN zsjXIuOP$tq|IeBAGUG?fHQtuDPk=@szyW`zJpozqPt$h%;P|rdm94nr^3`R=RUBF8 zZ=9N*q3ju@ze0BMmS3u`9E1*+?o?Ry_;rJByLY4x$4=4wmps8-0;^ldVIAiA0 ze``OkRW;aGsuH>8)PTuAw3uETUMRoTcIDAq$a4TQ-^o4Kb<(#V)OqEaP3Shl9@B6MV*ENsV zAGqM;cZ9)4FL-$*+qU`NZ?&%!w&iBH`84EmaM|qYIayWb>fZnAf2JvsRr`*|0?9=U clNoQ9vClTP{T z$>pzGnb~M5@R0xBfj9S=COqB9*vIIjqV&K#+4P{P#rmM^vx$G-aBT?;f9uS}DB!Z% z)ULVj!Y>K$=CyBDKJ(h3Q;~C>%eDjyf^Y?sVYx*sINnb-i TV77065Xj-4u6{1-oD!M<07z^w delta 265 zcmZ3>G=ph^L_G^L0|P^2NcwRg#aJBV?!yr0{~wz*aA<-u70r3imvqBJPqPzhH*{a8O%T zdle{L>FMGaQZXkvL1IxuU_GN3H@7r*Q={RG^Fq^>X=E&!1_Vov1-yH7?tx+C$s0Fr z+`TL7VKk+rWJk#^ZB0$d(y}rwO-*pkdu?Mv9i+A((?55)YaAX z_xA@X&B(}baB#4*v-9)wi;9W@inz}I*9@ctN`m}?|Dyti2g9ke^q|@NoXKA~f%#0oDw*y~{nB92d_MDeJCDPr z`+EXj*Vg|R|B%GC;`K&9hBwt8;sk4%64DZWi3Hp`{I*S+$JV}uX_Bv2kHdoBCJd6l z6dpX6;G1!dNo>OAhT_JznM{3Yvq#g9k4OqM)Y*KZBmVc#t9@JrxhqlNZl^2O&2> zk$CYaxkN!PK`0hNu_+X4)N#Q=bhPEJ3m- zRd#%|Kcnu>WLYKyTYIu9>pq~isV@%L1R&mi=&2GvKH6pzpxf=%RM9&tgLk5NZkfde ztPU8BMzuRPJF3PHwSA>|QQkRV9|9rxGWf1a?yw5*JiF@c7a&iR4#1e?d^1N8r33C> zI3?;!OXBgPi!`Ci@}er8bo*P+gX5@ z_pTiT@aoghtNqtsY^V|+P6Ff~e*OJ7?_1==b}wPW>RB?VYie3ymGHcI%St4A)_AzTIxC5`RBvdpI1* zJBCAXYi#qgXe0nS*c$H%T+`GJxhW!ChM>_GNnzi!{WS7Bz|GzLgCPLQjx7if0Q(KD ztuUyZS`RMQCs+#8YVh^fvC}g+FNDhCERTYK-#aX3EJCR6~g%E!LKxSd0 TLY*Yr00000NkvXXu0mjfb*7Qc diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png index d2f0b8f80d09fd74dee6bb812620cc1a7b5a9422..161c387047d794373475771c83cd25dd5be81459 100644 GIT binary patch delta 286 zcmbQnw3lguL_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rZh%jS ztDvBul9H05qGGfPgR!x(y}kYX`ST}EoLE*?=IZJ?J6dLQm0P_rgRwAB14DD*A6X#9 zUlQaO{2v7{T)8u2AyA65V4|^beVwO^V~BybFx5TaTJukrp;BD_fL%kY3(Fhrb7DK#o(E*D-EmhwX#Q-b+$*8KCpa;* z$Zot96=LP|I{Aps$E>rdp@k7)Ip4m@c}KclxKUBWwlRI)L(M-oyqDJ%z2ai|E-sR& WWAsC!Y2`DJn>}6qT-G@yGywo;ws5ro delta 262 zcmdnXG>vJ3L_G^L0|P^2NcwRg#aJBV?!#icBn1_VovU3mED;DenJCnY$1 zqM~N?N=BufE1CIp;gTgOOP1^`da9Jlwmx)qnC?pkO@nQpJ{6fUa90?JOEmOkWo9NY wa8)p9Cbyi`)#H`nJ>i%6a>3Sgc0LA%tqpQdFU*=33v>g6r>mdKI;Vst0Cg)}-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png deleted file mode 100644 index 65c7d1ff04a36134fac11739d022ba2c789b1415..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 776 zcmV+j1NZ!iP)gw5Yq%r3mzh(;9O!N?yE`-A{<{}$$2q%G35Q=Ir@HWIXyLssPB}m+5kS(GdgFC9Ta>bUpb2aMnAWj@#ecP1F#w9{?I= z|NP?8mCNO1$X2VR=BKy<2mwx4DwQbdvoA})Yq#5K!NZQq9>4&0X1eZZb=FZ0G(@Mr&UWy<-R zX+Rvgo2V)PUZtsk8zjB%|6J7U!@jx#U<4|->&~E>r~qpm7dA=;4|VYV+Qe(`QJOSV z{HLw}_>SKNwOXwghF`}`|1;|R9ntGBDizFj){_ADsfJOB*Wxe&M!*Od0V7}pjDQg^ z0!F|H7y%<-1d1aNbBI#N8=>Mt|F#qgVI%>>yiOlU0N*Ce7Y4uQA=5KNj1xIu;n+uyFgzr^grhKd3(FjSD06M*kyE(WiW zL!hDn1UD!rAO-;1{@WY^%pTTmY`|&lF%H#`_PyQ9LEsBou@M-zxS!_$0000><7qg?ly^e^E zHj$MgLfrKZHB5@V8Y`w|Bx*$E5hvr1Oai4h)ItpZ1se7{)FNG`s4 z`^}8oPxQ_;J*i78fA;&?^OW?dlN5P4m=84=D4ln}FRA60m)m`TdEC1&?oDzo9Ca#>lEpt_fmZM$h>Z@~n^?2Xs-P>2J{%Y>j{~N5$ zm>BA6OI44weK_SM74vp|yUPS&XN8H}%8W~cG#TPon_qeNXZa=Zo-_Vmbu9%e9`S5l z#-J8!cctmW`KIrQ`HTOpo4~iDOtQA=$gQ_`_nvzG`JmL7}T~$tv%Do{;?oxVL%6OZIPcpufltKJKNRWXIV=F-b{#5t538qVBqK4 zwNl}mz=FjwI_p>N|C79Mz2Up;8~ifc1lzX1`}?`qvdnO!rsQ*Lk$i!|zrU7#E8F%v z%Ta(a#NfmQ&kuHqhOUi$=I-VR>^qw_ntnd`Ys!R8TmC6=#aSIaU?Z!}l`6paw8(Oc z?DaYCGb{{`iXRX@dL#MW&zqUzrVWc0K7Yz`mtp=(Zv#gG)-H?y2gkw$4d%$qo&v|? z@3>xb`)XArlqfMYMc!9pXS-aWcEIFkysfj;icYj{^Uh_-s-0%(a_%}$tzE!_{?ZMjTkM}ecbIs@}eYt=3vz>Oz?|<8@ zHxOZ5c5bz{#kx7``@YW4W?*!1WDzXl-;9$@Q771v4(xmqDMNRy@ z_I(SL8M+m?9{qY>abA)o?)_tsDJ3incMklsZf}ggnW1lQ{9N>b?GruW^?@?4156}X fpClUb{9)ip6t-QZE_@Q0{24r5{an^LB{Ts5r^#m8 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 c1c901f2eb..7408c3f4ac 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8backpack, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi, backpack sprite by Peptide (copy of db), sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "bolt-open" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png index f4b03e4603cc963b8b22a5f7bab3066146bab357..1d44a5bb539eb74e652d98a0b0687a783a34b36c 100644 GIT binary patch delta 257 zcmeyxxRhyvL>dP(0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rT!2rA ztBQ(>j~s)&y}hKQ`H6ZG z^;MoOjv*HQZ~HFtF)MPgL~64C`_Er~@L1BVCGV&A>Fe~YI3xe3^{6guqFwaNfRqV_ zF2@t6d@yLze5|x8+}z7Ry&+pku-1LrLCtO1&i^3SF?hQAxvXw?Tc1qB5!FRxZFEo*D*gHwAa0~K+X1o;Is{D*_uvf8Ua;b>16$B>FS$q5p# z90C|yPrngbb)Z8hVOr3|C5jD86fWPWo$9SHsp+I%uhO(-9IErwd>EPXPI9Q8Q{yph z;?cPr^Uy0o=D?xJ6MY!Dckkp{(6z(IG5FAfMF$L~Ffg=o@;-No4$T4D!{F)a=d#Wz Gp$PzCVNXl| diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png index da66a1846ed015371d89d3812ec9a3867263e35f..d4e3306e6bb1b20fcb71183369b02a7a90f221ce 100644 GIT binary patch delta 441 zcmbQmc7l0=WIZzj1H;_yjcNS%G}r0G|+7 zV_}9g4F(@M201x78!IaEaj?;r{ljqfoN~4{JaRQb z%im86X`IKCz%YT)hUZ3nSj`7tn`PHkXTN#0m?68>`*EfW@0xQPU3P4m#86{&=-cL9 zybHd67A%-wvEUP9Bf~V_4r3$P9RlUOnr0owvV0j_tS3x1Onjlnv@Vr_xq;`vZ~gYF W>(9+~vSNXO#o+1c=d#Wzp$P!-#;ef) delta 782 zcmV+p1M&RG1DXbq8Gi-<0063Kaozv`0^vzSK~#7F?V3MmQ&AMgPi(a&#iZg;qy!zb zLN+IZ1u6a^;8YhoY6pi1B8mvcy@OkEaB#4WU8F-Pba8NSDhLV>tb-4`)uh0IocGx@}{&>U7e8`O(~H=sS3)M;!=FbeRQ*G*$8|vq*H=0^e%OsNyZDTx z|9zGZ2H=~Ynp;*gj}5O>DslV-^Y<>Eh|i^8f&%yd^V;UiTeHA?Uy0sw)}-+mH~ z5ZVdi>DXkxdZGDd?H!#QZqSXZ)qmQhnFtX8R@K<;S3#3oIUiU5oqIu;a|W+!QkA^;!Wzt;33(&D6uG{(Pg z6(p2$8Q8&G!q$4tkgZ}hX_i>D0vcPG=UL!jG-~82kuK-5RgBz@YY_nCA}C z(nmM$G`-}%yRq~meeoX9j}W@MtW4bq7y%<-1dMdP(0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rT!2rA ztBQ(>j~s)&y}hKQq_MH_L>KmYV+LbkhBOVJ3WiSa_kBQ$t0c%T_&*FVY&xTJexja4 zeW9m|V~Bb`qocQKP zkAgbD1UOg{YOZfs@@dnSEnAp0<}Wqg5u@1B~GnEhNhBJ#J~HnFIzg|YV(U6T}FwidLu`aZG$k?Og5clqX| zkNPpwywl3k_RY*OemrLyM@Iv8G(%v;s;tiAPd4sRx=F~kq|0>H({MNmTSF`EfoB4Iuy1P%0RtEDv{%DcGe__Jk_T%c|BCd~5)!6aB z+WPh89;O!@bKZUb?YY!H_FcpF2%Sx={MM207}yH7{e7F)SAOU8>*!+fmVZKL?4B%S z|9eMUyWwEL{kQLAw{&6-0Wq|1MbxRM|DMUhEK0WbRSo}*=# z{WZSB^YVp#uS{`URhj%`{jFOJC)2v_m-xO_o5`GEEj%Gga*kqytzNxF^ZnMc%kK=L zA1N-jtaHEldo$-oGoR@5EEBAR1zzhsjrb*I%(6^0!BF^sLh|=@#w^du9bWl3BS7qg>4TlhvH z+n@+d7j9w2A1sHyCaFf4|<(gXlXl~uD7xdmwP}(@*b?byfhtxjFpDFy9_dQM6 zeENxcfp<6V&Yb%*ZSz_CV;>Y5g%q%&#vTWmPur+}RF=Q48SzX; zLYi{|13q-c@xk_Qe6kCDGC3uqJN_Cax(HXqX*ONRm^|BLU(NN7g2&n6Tkml*%y~MS zf58r>CXJ1uv(H-1e;+>MYWrC~UWQrLOVnPxFa5^#$Mnt2rTLsoyy~}4yxw>EBLCI( z58m(>u&%s%Ki011xziWz75|x14`zM&Ze;y-Mu>gN{zEYgCck!@-CR|=@R#T_CV`;( r^Wp#Zf6)#Ro%vbCfk|aU0h9fKvTc?eEBMNQ$%Dbu)z4*}Q$iB}yRHFB diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json index 04f71999e1..bb01559033 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, https://github.com/tgstation/TerraGov-Marine-Corps/blob/master/icons/obj/items/gun.dmi backpack sprite by Peptide, sprite modification by Jaсkal 298", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sprites edited from db_shotgun.rsi by Flareguy", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "bolt-open" }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png index f867044e8ea79743302196a7b5de781925636361..7e8df53b12c47ebfe08fd745522bd5290faf223b 100644 GIT binary patch delta 341 zcmaFH{FG^eWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hHfKP~P zA_LQ6ZLNJgqPG5VK5@A&p{ZW+MZU?U8fsdGrnVB|Ql?f;dd4&+R-ysDa*J#(ft*fN}|KGT6@yRxWkCFbDTDG;fEDMnP;Lao)#FF$ZxLIuG+SRq! ztyehCe7Q%t#aprEwXVSWLt7dp8dW@<`yVwi?C9RAdTmF5(2co%=2{DndpIaNylL!D z_cVCRx_X(>sXZ#D3)RJQmYL{paLkJNu;y_2p#t&OX17c8ZeOuDVt>ZH&hf-g)^rp7 U1{tYWppawmboFyt=akR{0O4tfX8-^I delta 471 zcmV;|0Vw|E0_Fpd8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00E#$L_t(oh3%G4O2a@D z#=kT(NxKk1Q7GC91|%3y(F=G1U3d*QdI_N}w4kec16||ms3 zotEtfCP-M^wCq$wMX{GiSH;k|2?+pBjdkC&Y}{;aCC;lVYNEJ&ArAoXBnp|x@Yx3z zP7Y8pbZlE!5(x*luP+lDD9p}-P>No!4>|X>q(NI%6}XInP>R;~`18Xp0AO)>72!n@ z3@9^mJQ)B;GJk=~82a5;L3rT#JmGI?J>Cgz^3z~Iv8-X>`NB-nf{YJA>Y`zCf0lU! z#j+-}6MccWBm>Wfsw%>!+uPs8S-lSP{9@#L?{DI<9BZI@d?X|-X*#-{CIFz{h48FZ z520_Yp`__>8RI5h#sDB99x+fXYr@eYl=7s(tOM~l98jkL$7u+Cfw@r#2I3q#on|Cy znoN8X4nqLIwCv!1o``6;?(l1GxEccKRK&PyXj(Qe$y5Iy$jHc;I-iJEt&@b(=6C=A N002ovPDHLkV1hAC(a!(? diff --git a/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png b/Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png index 7d8a7b05312ca4b9fc1f2669ee779d9f58f06f30..ccdae198566f0725e700c403bc5246f82de997f0 100644 GIT binary patch literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik91o(uwCNeNB*4Em`BWmUqW$vF~8<}GnoMsF96b6Xg(-Zyla( z8(pC79%dDsW)qrj6P{`86J-(*AL(fu;pbu>p6V8#YZjR3o?PUeR^||$-I^cJR2Vj~ zwJ65VyCB@9z9d%LEzHa* zwF0wiGux&(C07P!RAjeKtkTqK)YJkxwtN3ACLm=|666>BpFF@|9V2)OXa;A2M`SSr z1K%MKW)#)%Y5)qp_jGX#vG9L->2}Z|1A&HzF0<8aRYXi(S$HNT1+HEp^Xp&!Gqp%Q zKBey;&X!nB{#$%mH`9N|f(98;CMV6kRt)V^c4?k5{Ld`1Wa*PC?JkM#CW~iEYG1+` zj_Y_zp8nLsd2;F`iIT2GFUszG{iC+SRpO52tfxM&H(mF>^!s1)b@`m8hXp28CT{)5 zGb5*EEtt3GBnz_y%Q3Z6D_3c*n3v6yR+rYhF@{U?$LZBo%%yj8nAU!M^Y?I+;di_J zEYt6oUd~~jpgS$*T=Mz73A?z%{C4zQ<6!=O_gl;DK7PM_}}4Z9y~%Y{srj^ zY8J1nnLHVfS(Ad8ILiUT6VaOS>Kji^!4C$IjK~t2=#qfW4GId zUe#^ycS>7?Lw_N*D^;5>n*d*LpXCg|AqeQY&R(f#*}BhPq-GfGl(yL0+r{VWA{+{_ zrmDvZS5_1N2HFYGe%75tJz8T?S){u!OwBM591bG8t0-lWo44-*psG1WuEbDQ6rz`- zghIi#0#r3eC=_J#?W@BDnB>DFqtlmv5+UfzKK#6DQQIx!VGb5PyIXR*Eemg zvQk9qkJ#26c?eB1QykPkiMKCIX(P*n@o{E9d|~UycclIZ6BGBDo1aHn`UK|MrdH~| zgizCL9DgkWOtmK2!^ck=PJu3Ih#Q}00H{8H${j%0b@a6~@`Y}Kg8??AA+l8+(PyB# zU3jZHS!f||5ulVsq8`oKb(b`R{BD}yV1V5ILA?I{4YTpFLnAge{gQ=55&&WUF|-Q8 z5mB}YNTlnBEnynci@5i1rRjR6uT3SHMk5orx04a@O_ zB8wRq_zr_GS1XwO`Jc#n&3Z=eYlUX=y7MNb?DUf0ceG+sWSkPV z!-2!Mk*#6tyZ*0f8&pMRFqlXrZ}#!nDV<`*W_imxy~`;oyH)hB+q~(iJY0|VaQNIX z6w+96XlD62=gJGJGX9I47&3W2uwDK5WUtj?@7i3E2hJa^89KbW)v)exaPTh$uDre5 za`j6~)I|dRIdSYer{q&?b*^yMj(dybpDm8(*!7Na;*(^%uzw=iKp!%Ay85}Sb4q9e E0I%u8{r~^~ delta 744 zcmV2an|0@P*d2AnIRz&GMUxGS)j~#?DS2 zi+Qi5m9@iRXMa~wu-a^FmhW$;)(}OJ?;F3-Hbp1EezHwX24J#S*;N$se}3wS3&j%K zsWsB+G_9?zh@wa+6sjp&k|Y2wR1=U}4+G$LW%oB_1YDgWg<=Vd*~H-X7o?29^&7VV z2!&-XUm8M^B>a9qVxO042!&7aXPxslT1W(HUvyRd(O3L74W;VczSzCCL%gfp57h+l8FehXdEdcu$f&q zJYl88XHMqGSu-E?w)2~>VpGR6+1faz|$YeGR?z7|; z-ZBLgy1FT3wwQVH6mNeoG4~*=ih{GHM9^W!r6{a|f!rWK$_V&fS)`1hl2ww1%P-=1 z`Ui8nhgWRsTa@`oROie8Iikb|1x&cw%C_v-Tw%kO0^}f90H<(*0x)H$n?{7SMqhz= zH35re+tE97N{!U@;o?C7fuLMDpBq9@3);D(9(xC;Av9(p9ySdFL0KKi$NoRiL=#OM aJN^Q*@D|lR>V4Dz0000U)WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$h2fKP~P zA_LQ6ZLNJgq8e&ihNiZrR!$P)QhLTVMi!16wr-D#OYrv%D6cF7DlfYEssTvxl?3?( z|3?N4t_SX%0LpL{ctjR6Fx2xM0;)R1D5~KFQa{nt#WBRf|LLTQe9ZhW1wP8z&_&Nh0zFciAL5%B-O^%$v|pq#b$y*f9oNm};Yl=qe5=JP2(67_zvDn2*Qj#sGSn<9Gv=sE^ZS3j3^P6J~28Gi-<0047(dh`GQ00DDSM?wIu&K&6g00DbRL_t(oh3%G4O2a@D z#=o|c1{WeI3Pl^iKpCi~=uNza8$Cu{XxH@yy2#cOM3RDnqFA&F(uFjWHZJOndHI7{ zrtQM~HeudO-uDe}CNDriLBW5g6dxR*94$h$gNf2*aq(7@tA9n?cQ0DR9(Om>LD!3< z2^JT3Tu+NA6?;vET1~D@Fd1-M4_6JITC9tewGA-Cz;Mt9To0`#N5{SXF2Sq`N236h z^0cIKY?@VsLXi2V`x^kj*3KTuLkv_`*HtnAC{-9jArK7Ti12t4sf2&!`QbL-Kyp%2 zvuunf5!s0@et%U0-J)^IbIY7V&9cdOrb8%8VwzQQ=#GvLao+91xwy=I@8g|b%O4H2 z&rV6wy3MCo2|zFed3M?-;QI~KZH`a~Wik{308-*912xMgSBDvfN-B3P#k27J9(=z? zV$xh5#6Xrqf6z}Q)ycvSVG;%a&ex|A^XLT`#QTo=>?}& zyODno)T$aFs-#&?E)SR;^By})#UQ( zI?Gu<5Y(zVs-$$fJ*)8k?iPSfx5qpg1Mq-vy)gp-w3)HJv&%dgTk$4&MM}B;2ck+! zBk(g3LnHVQn{_8+rjr?R>G6~<3L8o(0odAn17JFtSy9S`C0-a{6(eSbgU^!)A@s%R z3CCyWB_V{)H