From 554d251daabf0575f987fe8e667c55d47ca23f9f Mon Sep 17 00:00:00 2001 From: Icepick <122653407+Icepicked@users.noreply.github.com> Date: Tue, 17 Dec 2024 20:00:13 -0500 Subject: [PATCH 01/12] slinger belts --- .../Entities/Clothing/Belt/belts.yml | 35 ++++++++++++++++++ .../Belt/holster.rsi/equipped-BELT.png | Bin 0 -> 390 bytes .../Clothing/Belt/holster.rsi/icon.png | Bin 0 -> 467 bytes .../Clothing/Belt/holster.rsi/inhand-left.png | Bin 0 -> 309 bytes .../Belt/holster.rsi/inhand-right.png | Bin 0 -> 326 bytes .../Clothing/Belt/holster.rsi/meta.json | 26 +++++++++++++ .../Belt/syndieholster.rsi/equipped-BELT.png | Bin 0 -> 334 bytes .../Clothing/Belt/syndieholster.rsi/icon.png | Bin 0 -> 426 bytes .../Belt/syndieholster.rsi/inhand-left.png | Bin 0 -> 289 bytes .../Belt/syndieholster.rsi/inhand-right.png | Bin 0 -> 287 bytes .../Clothing/Belt/syndieholster.rsi/meta.json | 26 +++++++++++++ 11 files changed, 87 insertions(+) create mode 100644 Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/icon.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/meta.json create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/icon.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/meta.json diff --git a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml new file mode 100644 index 0000000000..83edf7007c --- /dev/null +++ b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,35 @@ +- type: entity + parent: ClothingBeltStorageBase + id: SWClothingBeltHolster + name: slinger belt + description: a typical gunslinger's belt. holds all your guns and ammo! + components: + - type: Sprite + sprite: _Sidewinder/Clothing/Belt/holster.rsi + - type: Clothing + sprite: _Sidewinder/Clothing/Belt/holster.rsi + - type: Storage + grid: + - 0,0,3,1 + +- type: entity + parent: [ClothingBeltStorageBase, BaseSyndicateContraband] + id: SWClothingBeltSyndieHolster + name: syndicate slinger belt + description: A customized slinger belt, on the inside theres a stitch that says Syndicate. + components: + - type: Sprite + sprite: _Sidewinder/Clothing/Belt/syndieholster.rsi + - type: Clothing + sprite: _Sidewinder/Clothing/Belt/syndieholster.rsi + - type: Item + size: Ginormous + - type: Storage + maxItemSize: Huge + grid: + - 0,0,3,3 + whitelist: + components: + - Gun + - BallisticAmmoProvider + - CartridgeAmmo diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..eb736551d737830cc02d1e769c4339c1ab27cd50 GIT binary patch literal 390 zcmV;10eSw3P)=^E>_0H*Q2~@-4rqA^Gfg`c|ZVenDxgSpz@DV-XQK?cT?m z3{%%+Tvd|!%aH2}0000000000006MGay1%#&(-M;@cH4setG!n)CQ3)Veh)K4za1h z+}C#3j!@%m4rY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/icon.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c6882154caf6f2c9478c4032cae593a99496b206 GIT binary patch literal 467 zcmV;^0WAKBP)f@eG| zLI&(uu2mLYFrQ@E@_6n!bLWh~VzF2(?;TMz=(;W^dt3Ud^$CEZ`7bl35)Hs;GE3F? zveVOfwN~FrDa#u;JNTe?yKTOzI;UM{DXbLJa89kZ0l<&zX=={#=Uo84eIKXZ*BrrU zG80(?Zjpg3=RpDphV2&9a86@$lf#{lxRnY3y#vRHw>PS(x#2^cTeHxBN;HpBnm!F% z%kHkkt8T@JCrJW0De-=@ZffzBCa1=E}d}a{Q8s z*Bjq&*6BCvNGZ*=czDd!_-hCO2HV}WU^Oa&Naf~@{Z7L?$0}LgrR4TcOtu51GT`}v z7;JZSr~1+``FsjIKUiDD0Q7#RVZ@6l+=8r$yEsXS7k&HlE-F>Gw1E{X@kr_1)#njs zj@~~T@cckTN|zG%{6P5ki$ZZI8N#>lI>4SEto?{A7K`P-^8^@nw_IrZwb}px002ov JPDHLkV1kBS*UJC^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c14678f17b0ab77c848d14e8424707fe4fff4b23 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=e>`0rLn`LHy}6gSDM8@a$IBTn zaynF*Z&)_2<+fn4j@ZoXY|$!w!;oRAp`t@Ya;qq3r`WOG%31&R&tu>5eQ~7=&uIgQtRZ}n9{pXv`*wJC4=n*%? z*w-y?%H|YV?@fJc?Ou1D7F==boXL95gC_ZBa@jjxY%kd5S#^FsJKTnkdBtmIh9}?4 zeRsp)#p9o!3fW(V_4;0XGw+p0?9ti$2^qy(&wjAh$*TCw=o6ckm0dAi`Ga@wx}OZI vwoP93R&6J9TY2V=`N95=75xjJGyJgU@6m~55Opkz0@>i{>gTe~DWM4f(LjG( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Clothing/Belt/holster.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..12d4bc860d1c93dc5c2e91c1a13ce03d20ebd277 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC405aSW-L^Y+$m-a`f=tq-MH z7A@`!s%j|laX8JyGf{TM%|^u;O{@!&8>Vn*DrtyKT{$76W9|(@{=f0LH{GxG&K4E~ z8U_Lf@^9-rOWQm{divJn>1SPBuKiAaB&{>;Q%zx<^(NgLvCB8@_S?%;>ormPwa6Af zhl$#Y)5=$Fo#wnFra3rLODQk-wiV;;;F(vV*twttqL2TBGeB0Ae{o6ZlN|mqNvwK5X^Lvq`H3&UdD~tpB42EzUJkSJo4=4e5W_Xj1Sh^GPH(8 UZS@oSmOg`7Y)8IPJH)$t?15=u6f_qeYLb-x%=ZiiT_h#PgtsZYE69^dEfeX z+}tmLpzT8qYafS}$H#wK><6(5L^f;|H9f0a^mx1a0shQa^6&Fh|N3>Uom*n2$R~T~>+R!^4F33JyIsfhzJgXMYzi%^#vekz_vsfdBZ1gmAbUT-(Kwecc6xxddv zf5EI0!Vc_iNXoM?q*df3yCL*<%z>D5-57>q&A2my}xE1T`Fm@SS)|b7q^X+ Uczlb7rvLx|07*qoM6N<$f(E_2d;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Clothing/Belt/syndieholster.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a3fae22a1c7c1a255989ff6c019f8d4112cbde42 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=FFaiwLn`LHz2(St$Uvm!;l+%? zt9s0Prv})xZx=e!T^i{)#cL(EU>65hrT&UP_xCYZ`fi%(0n`WvDmSkc-nmxzXWN=^ zF}a1+qG^%4FW=O8J$0x1iz<8CjX0h^?iPUWP?gS=aGZtT&lGFC~60g^H z$0gGizmK@`;o02>i_dve=hGy3zf~4NFEeGo&6Y0t#Ki8}TAdA6=a-x_-uQP<$5KY1 z-1@?p^_x6`md?2zHUGd{%L>uWQ$sYDt0(;VVe1jIP8ebZ1H*y5qdtAkb5nbd`6Q_w zpI$wq;hIF>temMbyPy4ACuXitR%E08X Date: Tue, 17 Dec 2024 20:00:57 -0500 Subject: [PATCH 02/12] Changes PrototypeID for slinger belts --- .../Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml index 83edf7007c..794aadc9bc 100644 --- a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml @@ -1,6 +1,6 @@ - type: entity parent: ClothingBeltStorageBase - id: SWClothingBeltHolster + id: SWClothingSlingerBelt name: slinger belt description: a typical gunslinger's belt. holds all your guns and ammo! components: @@ -14,7 +14,7 @@ - type: entity parent: [ClothingBeltStorageBase, BaseSyndicateContraband] - id: SWClothingBeltSyndieHolster + id: SWClothingSlingerBelt name: syndicate slinger belt description: A customized slinger belt, on the inside theres a stitch that says Syndicate. components: From bb55e0faa2e9be522b8708b5d3d3158c43286ecd Mon Sep 17 00:00:00 2001 From: Icepick <122653407+Icepicked@users.noreply.github.com> Date: Tue, 17 Dec 2024 20:25:20 -0500 Subject: [PATCH 03/12] Fixed Human template, Resprited Baseball bat This also changes the Construction Graph for the incomplete baseball bat --- .../Crafting/Graphs/improvised/bat.yml | 2 +- .../Objects/Weapons/Melee/baseball_bat.yml | 44 ++++++++++++++++++ .../Textures/Template/Humanoid/human.png | Bin 1599 -> 1593 bytes .../baseball_bat.rsi/equipped-BACKPACK.png | Bin 0 -> 550 bytes .../Weapons/Melee/baseball_bat.rsi/icon.png | Bin 0 -> 329 bytes .../Melee/baseball_bat.rsi/inhand-left.png | Bin 0 -> 302 bytes .../Melee/baseball_bat.rsi/inhand-right.png | Bin 0 -> 279 bytes .../Weapons/Melee/baseball_bat.rsi/meta.json | 34 ++++++++++++++ .../baseball_bat.rsi/wielded-inhand-left.png | Bin 0 -> 381 bytes .../baseball_bat.rsi/wielded-inhand-right.png | Bin 0 -> 365 bytes 10 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/icon.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/meta.json create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml index cecd031f97..6cd585bcd7 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml @@ -28,4 +28,4 @@ doAfter: 4 - node: bat - entity: BaseBallBat + entity: SWBaseBallBat #Sidewinder diff --git a/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml new file mode 100644 index 0000000000..b393abf3c4 --- /dev/null +++ b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -0,0 +1,44 @@ +- type: entity + name: baseball bat + parent: [BaseItem, BaseMinorContraband] + id: SWBaseBallBat + description: A sturdy wooden baseball bat. + components: + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 10 + Structural: 5 + soundHit: + collection: MetalThud + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 5 + Structural: 10 + - type: Item + size: Normal + - type: Tool + qualities: + - Rolling + speedModifier: 0.75 # a bit unwieldly but does the job + - type: Clothing + quickEquip: false + slots: + - back + - type: Construction + graph: WoodenBat + node: bat + - type: UseDelay + delay: 1 + - type: PhysicalComposition + materialComposition: + Wood: 250 + - type: Tag + tags: + - BaseballBat diff --git a/Resources/Textures/Template/Humanoid/human.png b/Resources/Textures/Template/Humanoid/human.png index bc47dfeceff7818608e011038d5fe60a247422bd..fe1311447cc692a11464e4fd86a50ebe29731f9e 100644 GIT binary patch delta 1576 zcmV+@2G{w&47m)DB!2)&L_t(|ob6k`Z`(!`{wPWoEsJuZ*sc^5N$Xh6P(TIbXei(* z9pX;j3S`S@pnJDW+42`?bk=S~hI;8{z=K;BRT31kwNbZ(#oOT0Sywxk z&O%tc&BPzr0t`(70BkMYcl{>qal-@$tA9H5V=}t4z@JhZbt_X@#aZ_NIqfBM@j6oZ z1@!hd6LE%WqknE?7C%EazhJkWb`Q||)mge z`2&53_y9vwaMnGr+f(@k2x1AEv=OT!$Qn;yU%~X1CG@*(r1S6L_0ei9ulcL zd%eGN%?o15{yQ!u{G ztKSAMtTWd$;Wtm()Urn^fM{Qrn*$;dfHzTnE!hfo^ zZGNNu1b_VOwLu4NVCDSmH5lzDHvg&Grsk)z08^G+Ys%^Lyw8R89gYknD!BM_^L9Iz zavWvewg=@8yc7I4;p~kbS_ai=kT2JuHb7<0YNKxPUhwJTax;7TMa&?GUmz%aS$Y-KB9}rnnou6!3=F!i-eMx&^eTU0+_o?|W^a1Ay z(SM{3h_!prq>Z8F5#=t>E6cgOOj&~NXg3-7nW6wOFS6;0%G_xnh$W;_yuH*+Swbqs zGs_DV2FH;MJ&)hJH=)J5xexH10fwFf;N4U}gqSE`+yfXls1-navWqJ<9v45=S%5Yp zMEXR1Q=~TPmhk>906_2HDKI@Z)Tejw6n~^o5Ps^bu~CVR-rgp9w1OC6{Qmt|`6rm* zKZ;1|1AyeW#ZmDyUybqQnkyd=_pOkZ-x-xiLY9S}sXo9vc>u^%Ruica@ZL)TgB-;m zZI{6HxE~Bn!OHUoQHY|#%JT=2UB@$($dE(?u>wIXVQc9=1hEurxePJ=Ep63x{C{=c zNdyIx1@PtC5TPKJfZfNj`hmjw4u{>xLuY?emVA@8GzhE!a`E6LG&BWT_lRi_L7;Vy zhRmOQA&EFaKNy;lSdj!tlt$$Pn4&UO?&xeDyyMt5||X=bwGkx8eB|7d@b$=QK%+op zJHsF;++s!G(;!&}^M$M{3?{J^CL0{J0V`7(oCq_ORrK~Y@uzwk*!+Qj7CBXwNS8%X(+Aj(0PGS3J}B+ljn^J^M!0^2R!isVFmEz8n{kBim?O&*Xc)c{AOOf z=3xsEOM_imxeB!b%POWZ`^9#w;qcYhpITg}59iI0dDvo>$E<*};~^K&j$benhecHX anDIA#AwMQU^d_+Y00003`t2g z??_Q;st+(E9`EkEdwTcY-MeRCj4}S#;8+`~m9j;?XV$lw`+pfVf1H(EEUh`7VMQr~ zF!^IF#x%k-iNy=$KJ!-X5wh{}UA(@`D%g$SeX#e_s zB*sv!l&wTz1%H>VL!`7<(8W85rRUJz-C*Kp8n9X^TazDs4qmtc)A$=_JKsg>35XB~ zSSJrq3V^J!_?=};-daSb)j&M`9?p*U(0R29V7M-k*Z@OQaM?Pv%VX&|2x1PJRHf$k zUHJ`p1AHQhgmA-tXI|*&v~?t>W|#&+!%yH`^MaVOzkk#6`>NQ_^#H(G^8l0C4|~eP z7Q!I@L7?Hk)(bevy_Pnfy5)K%?}PYd8h$TW_~tAzHA*r zld3RJ8-BW_f|FmBzIMGM&xD@_R|vGLEzdsF-r8jFTHEWl1F~?Ej-}21* zHb({$7F_&r8$ItcEkE^6(22_nJxKGn0=`az{LDS56}Z%?qc_1%OroPV5l?09agk0Dr(GyOuwm%7ULr+mk2dr~FNrM|FGM zhJjdm4*e$8kAu&b5KGVb=D$_|hNj>m`w6DZ6JGiOlrQUICtZLYn$fr;kNwh=Oqf9YG7lxNnrxm0UE(Ei-Z@7&m=^2Hv(>vGK& z27hVem;YKD;O)ezUZyNTca)n0+62L%zBH){v9tzFs`e}o8h&aoAc#4{V!W+trYs>A z<7vAI1ft$#(-UO51#*K|`Q|7PhNiIzz;g!ZdHxR}kOsU97z<$30~j@Y3&8KmZdjr5 zVe$Jq3#gT{CA@zh0MI^s0Zh*H)M+2S0Dq|y_DzxBh!Ckm!|(fQ%=qJnf$!S88)*CO zh!Ix>I-=koV~lqcq2vbu(dP(+#m{^-=CsNrAQ_bqNYuv}4`98EV9F10-pc{qGkP~{ zHT)cbev=1)L}4YG>u~^B-h0A)9X$*fnu6uMCroXrQe=qgZ)z*9* zAm*^S_!xqiquzv3X+UOuo5Rktp0mFxOMQcu!vdc#^$1)LbHL6sYCAx^1hm$1kNT4V zMPUTV#fMkmhNeJk9aHy5EdUa9eA{dQYY>+CI7}`o4NXBRUu3qzv>;w6l`q;qf-_ly z7EC!p{oD}H6~>=Gev7+b)rPVZ_J5xit@)+ZzVS!ay$F*AcsC#fL4FCpaB?`g`~4t( zKrH}1UxF^zZ1qbNR;cgf!+<7LK{jNDra+f#OrD57Pf(WZq$DSzG>Tp>LCke8W*GJ& zOiQ5O8jSK@AWVL00kkq7GZ94rma$O@VE<{+N~RXu2B!92yAsA*e zNhtL#I|Zh_yJ5dGGzDq(CH9{dsa!FY0A@az0^qj9QEq{~aB`C|kumxOl>m-@I|bl& zIV5o@YIqM|WK3j?enE8_BpV#H0xMDIo(L0#6|{FZ@Rxc%RP`qy%V0K>bh*LEx59#$ zbL|D@msSA`H#A22o?lvZO@BU!2MQDubY^gdkr6_}O*9Y)mYO@h8w}ET6vi*?F)$0j z%EqD8w?-NlFf;{9eG68W>7U;K1k`}pOmZZtF$98`3+#EuHh{Gu*X)dR7f8V8OW>Lv z=JwQ!=k+(AT3oXO=gp9LRA(LlE6k%hAm+L|z g0@?kEP)!Q7tT33H#{@|48t%C!!QSmf>|VlfJRjluBR%)(QDe8V&Ut& zH*?T=dfB=D2zyiOwg}qQWo&_I;_KAUJ_L5p31*S&smf-ai>_=B_~u7r2V758?vVRX z4ahn{^P7ts)L8qV8j#hwZ&Wn_01(wYfW!@GR5f8<8^6pi-dCX>7^(qT!#97LJBH6M z4*-6Q1B7p@bOCIef19n~dAJB&eIKbt;BWJ@$mRhg3Lp*h0FsQrws~jn#;Sb~X&MkT z-y0-j9w3DP9v^JnQopuG~O_~u%3l4x<05u!{wE${30BQl$ zZ~)W-s5$rm(Ekg_h@$Mackm710H_5}!vRnWpoRmW7C=p?09rL&*p``=me|;q39XtQ z>d=A?pjFd_RZ_vouQM5fZJA)?*TO2Pp+X2f0^WIP|G&y2iJ}d)q0_FwWV#e(qmWti zL42)=eIoOp;Q%m;Cex*8){ALtNsMN_2$Sg&^&;d3Pz#`j1E3Z_4Jv@LQBb;lCv7c> o(d|1R%bA5?7=~dOhGB^K2D-*HDW#{f>;M1&07*qoM6N<$g0@uYumAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e656047532546eb6f79a0831b2e9ced9b690db16 GIT binary patch literal 329 zcmV-P0k-~$P)66d6|N+}x4j8mT7atUN&-dayeS+|*o0J-O9`;*C-W@;kilyS z5$OI>8_c)_RW$)L2$+2d5?gTe~DWM4feUWk` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ffbbe0cc4386f6673c26d0dd19526b6f8a98f47e GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_dH!3Ln`LHy>(EqSwW!n;am|% zcFQP+$%|zR&YrZp)Npi(fb|B})e7xA+fx>?Txb3N{@srJ)B}tzK)nnMuUX$evMBlZ z!s=h?$x4k1@%Mj2msM)U_SYWV{iEhi(uZ}w*6){mcwQ>b<;j(YuJ@E5ypX!GRp3{6 z+xpW9QLnP{oXXm!sqI;#^Z0_Ppk3zE^`c-?85nXjcm7_r)p%~H{e#Ju%Gs7xPR!y< z`)1{_@=-(DdnI3U$JG{_eJ|)}nL0j>U7cAkD6D+IMUXW&iYR~LgXzYWM-Pgg&ebxsLQ0LpH1ZU6uP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/meta.json new file mode 100644 index 0000000000..cff50acf87 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprites by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4dbdbc5359de4aacd78aaf94b844cdcd4fad21fd GIT binary patch literal 381 zcmV-@0fPRCP)U00000Y?ns*gzvegNWq{NCTjYgYsS-=uI^tmy_PvYIWV@> z%+$&&{Va>>S?L>2j}IkDPOB-$wzO-vw7<8rvQhN*q4)7bqw!QhFHDSeJ8fM*402Dt z+i7QN{iKE@jV81Blu3t>2;h6L&(*zEw4ft|$Ni000000001N4c~K3(aqD} z##(>L7vFQu#o1AOXry}g+T!5L?zwRQlGGnYlBBwWs51PG0|~DNq0{#lIjhj zs_=8IfXmxKx|xY5)gMNM_w$#T-?pC*zl@%_0$4IJspNkO*7S-k>{->j;!pUGUnu|p b0954@h3ARqI?ug400000NkvXXu0mjfrZ1|M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/baseball_bat.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0b34b7b597c1d24c8156997a41111f71ad15d2d8 GIT binary patch literal 365 zcmV-z0h0cSP)M_N>Ym z#Yz82Rj~1FovF3|q8cxa{C=C2$*zZb` zymm{Hay`^F8uWB|_hei*4&eI!rBbYpRj2v2ZuORB+4c+o0000000000Y=|)M6Prt0 z-_d7mSg(a*#3lU>;I{ZXaWEL0BFP~4(50 Date: Tue, 17 Dec 2024 21:30:55 -0500 Subject: [PATCH 04/12] Knives and Slinger Belt Fixed --- .../Entities/Clothing/Belt/belts.yml | 2 +- .../Entities/Objects/Weapons/Melee/knife.yml | 109 ++++++++++++++++++ Resources/Prototypes/_Sidewinder/tags.yml | 12 ++ .../Weapons/Melee/cleaver.rsi/butch.png | Bin 0 -> 391 bytes .../Weapons/Melee/cleaver.rsi/inhand-left.png | Bin 0 -> 360 bytes .../Melee/cleaver.rsi/inhand-right.png | Bin 0 -> 359 bytes .../Weapons/Melee/cleaver.rsi/meta.json | 22 ++++ .../Melee/combat_knife.rsi/equipped-BELT.png | Bin 0 -> 234 bytes .../Weapons/Melee/combat_knife.rsi/icon.png | Bin 0 -> 330 bytes .../Melee/combat_knife.rsi/inhand-left.png | Bin 0 -> 270 bytes .../Melee/combat_knife.rsi/inhand-right.png | Bin 0 -> 272 bytes .../Weapons/Melee/combat_knife.rsi/meta.json | 26 +++++ .../Melee/kitchen_knife.rsi/equipped-BELT.png | Bin 0 -> 246 bytes .../Weapons/Melee/kitchen_knife.rsi/icon.png | Bin 0 -> 351 bytes .../Melee/kitchen_knife.rsi/inhand-left.png | Bin 0 -> 248 bytes .../Melee/kitchen_knife.rsi/inhand-right.png | Bin 0 -> 259 bytes .../Weapons/Melee/kitchen_knife.rsi/meta.json | 26 +++++ .../Weapons/Melee/machete.rsi/icon.png | Bin 0 -> 295 bytes .../Weapons/Melee/machete.rsi/inhand-left.png | Bin 0 -> 470 bytes .../Melee/machete.rsi/inhand-right.png | Bin 0 -> 396 bytes .../Weapons/Melee/machete.rsi/meta.json | 22 ++++ .../survival_knife.rsi/equipped-BELT.png | Bin 0 -> 249 bytes .../Weapons/Melee/survival_knife.rsi/icon.png | Bin 0 -> 322 bytes .../Melee/survival_knife.rsi/inhand-left.png | Bin 0 -> 243 bytes .../Melee/survival_knife.rsi/inhand-right.png | Bin 0 -> 253 bytes .../Melee/survival_knife.rsi/meta.json | 26 +++++ 26 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/knife.yml create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/butch.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/meta.json create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/icon.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/meta.json create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/icon.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/meta.json create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/icon.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/meta.json diff --git a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml index 794aadc9bc..77e49616cf 100644 --- a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml @@ -14,7 +14,7 @@ - type: entity parent: [ClothingBeltStorageBase, BaseSyndicateContraband] - id: SWClothingSlingerBelt + id: SWClothingSyndicateSlingerBelt name: syndicate slinger belt description: A customized slinger belt, on the inside theres a stitch that says Syndicate. components: diff --git a/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/knife.yml new file mode 100644 index 0000000000..906573f596 --- /dev/null +++ b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/knife.yml @@ -0,0 +1,109 @@ +- type: entity + name: kitchen knife + parent: BaseKnife + id: SW14KitchenKnife + description: A common Kitchen Knife, cuts all the food you could imagine.... probably. + components: + - type: Tag + tags: + - Knife + - SW14KitchenKnife + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi + state: icon + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi + - type: GuideHelp + guides: + - Chef + - FoodRecipes + +- type: entity + name: butcher's cleaver + parent: BaseKnife + id: SW14ButchCleaver + description: A specific purpose Cleavers Knife. Sharp enough to cut through bone! + components: + - type: Tag + tags: + - Knife + - SW14Cleaver + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/cleaver.rsi + state: butch + - type: MeleeWeapon + wideAnimationRotation: -115 + attackRate: 1.5 + damage: + types: + Slash: 13 + - type: Item + size: Normal + sprite: _Sidewinder/Objects/Weapons/Melee/cleaver.rsi + - type: GuideHelp + guides: + - Chef + - FoodRecipes + +- type: entity + name: combat knife + parent: [BaseKnife, BaseRestrictedContraband] + id: SW14CombatKnife + description: A sharp knife built for fighting, watch your fingers. + components: + - type: Tag + tags: + - SW14CombatKnife + - Knife + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/combat_knife.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.5 + damage: + types: + Slash: 12 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: LandAtCursor + - type: DamageOtherOnHit + damage: + types: + Slash: 10 + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/combat_knife.rsi + - type: DisarmMalus + malus: 0.225 + +- type: entity + name: survival knife + parent: [CombatKnife, BaseSecurityCargoContraband] + id: SW14SurvivalKnife + description: Weapon of first and last resort for combatting sand carp. + components: + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/survival_knife.rsi + state: icon + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/survival_knife.rsi + +- type: entity + name: machete + parent: [CombatKnife, BaseSecurityCargoContraband] + id: SW14Machete + description: A huge Knife, almost a Sword! + components: + - type: Sprite + sprite: _Sidewinder/Objects/Weapons/Melee/machete.rsi + state: icon + - type: Item + sprite: _Sidewinder/Objects/Weapons/Melee/machete.rsi + - type: DamageOtherOnHit + damage: + types: + Slash: 14 + - type: Tool + qualities: + - Rolling + speedModifier: 0.75 \ No newline at end of file diff --git a/Resources/Prototypes/_Sidewinder/tags.yml b/Resources/Prototypes/_Sidewinder/tags.yml index b514d94e96..2103220ef0 100644 --- a/Resources/Prototypes/_Sidewinder/tags.yml +++ b/Resources/Prototypes/_Sidewinder/tags.yml @@ -5,6 +5,18 @@ - type: Tag id: Prybar +- type: Tag + id: SW14Cleaver + +- type: Tag + id: SW14CombatKnife + +- type: Tag + id: SW14KitchenKnife + +- type: Tag + id: SW14SurvivalKnife + - type: Tag id: SWMop diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/butch.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/butch.png new file mode 100644 index 0000000000000000000000000000000000000000..99b21075eafc24bbde60bf85eeb5bbadf5562c48 GIT binary patch literal 391 zcmV;20eJq2P)8UqK^T{RG)FBp;x(n|l{$LFlYF3ZjFbLGc5$L%)W5X~DN4Lz32z zILH%nX;bf#v@Z7>pG)}N^M8&zK%r15*1+xEL;Upo5-(a~s}`ReA91x#yTv)Rb&2z+ zG=V&E5KIwrx5Gh(+kMTWsUM324|yGDYZ}S3Vv?uDB8Z9!1^}n~yK^tqU*c>EvSLCb8Es;q<_iIE}$y6rum`1WIE2 zeK@{6%m4rY008KO@9zaS#U*A8anc4C9t6tWbGypI9^W(iR zyA)U@yw>l(D3^6b7C`umho561Oy6D$Gqb^9s9I7bNdQ&b-3#+VtJH-s8IL4qf+T>& ze0KG{N%1Zg!e+bs_t|?$0@!SKg}?VH#k-VyJFo8G0{{R3000000M8|Nn>+V-(hf|x zSnm{dX*{zQy2DLc<4ySUK3=Y!AlU);c86oU_`_j;bM4WckUfCh#XD69*SlBme*act$5DV2h+4h2&-c0000J1B}Bk?8+BAsk2k zUL0RuBme*a004SvyW8JlV}rUAy2i4^GL;JOYC;!XE>}s?&*50g^i%-5V7ZtVQh$mt z9DY20`$ZUp2HfC%DZ*$pmLz@8z6$sMM*(cWE_8LN2%pnQX|1vFlJ^S4im+L)Qm!$p z-@pH-kX7NOz#-@tVY!$W{!P0k7QRyG!~_5U00000001zlTWD>x^WEBg4KA%csId(#$8>S9#+AKn&SHN$ZrwH%P zZ=+40q?+5^{+24d%iRe%55ihPUtmc2+Ud0E0RRAy#~m2=jfj?o;u8P>002ovPDHLk FV1g69nYaJ| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/meta.json new file mode 100644 index 0000000000..281e477324 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/cleaver.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e , Modified by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "butch" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..17e18a38cac2dc2e5dd37448536be03b30c8298e GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=8$DedLn`LHy>*b2$xxv6;qnNN zt{KZ%_@_N`+#smm)axO(vEhrsy;S|poUe5Lm&?y^_t2{p0%`=BGhyb>_2n-%zLhjH z&R^SmOI6(XbCB1o%hQ+KowRUeSiP zKTg9i9ERbSe;%W@lvHA<45E}X&^=ut}j`9 zeu@90gFe9yS4vUWHJkiL>h9Axga3F{RTM?x>;$#G$Tw~+a10z8&H>*zG;G4MECIaX cAt50EfBpYxy;-tRB>(^b07*qoM6N<$f>&UWdH?_b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..daf7b0feb9458f98173c16866f4e594adb175862 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=S3O-ELn`LHy=BOC$U&g>p`eY| zw$L}hQaMF}2bJ763hX&y)_6zdUg}yUvq?wJbZh^K-+OazJ zr1EN&Ppq`~-seD>b*DoAbFP~v_J8`>_vP%K7gyCXg3SgJ4^C!3TYrMj<1=INX2xWZ zn~gcgAJ4DoKdUOfAggXdZP@{3X#=(2ZyI*((3$=JD$o2kAdSzenQpC54?XJf$OOdo MboFyt=akR{0GP*f^#A|> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b83f7e70fcfb83641ada41f3c1ffac5f88c68c GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F9YvLn`LHy=BOC$Ux-SM-I8A zk)q%G#HPo%6nxO&YZ5;x^uqU5>?09D-<7vi&Nlzg&+)E^Z_|4p3^JC1;m$ho{a<)2 zd!9z^x4*EfvaZHvZun02)4C}acXjUTXL~dE>*0cMuao;)u7CL5-1$s`SN*ThK2H0U z<=1Af6aDFL5c|41{rOov)0zn-|K6slKQdZ!h7)WskWh$URp+>J-XVAU2l2txKjNpp z(p0guIH_f|=tx)Hw}m?ov0wczGU?4j^^p6)Cv0P;KAe8*@aF&QKp#r+w|!3!jql-j P3Np*n)z4*}Q$iB}qULgN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/meta.json new file mode 100644 index 0000000000..18aaac978d --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d , Modified by icepicked on discord for Sidewidner", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..fdcc26f3f8de15ad8c9018e3cef102b08a5972fe GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dp%toLn`LHy`{*<Tgn%;osgM6{^=Dxr}kwPy72z&X$DC=K$&k8n#fR`QNT~ zsmrq-i8SA9JGe?bK8R=6ZJn6?`%bh=UnpODZd&%t_1muft+~5o%Yye&wRZ0&6;J#8 zG%DtQeixg>?GH+=@d-JHnZbqui3QV^pK%DadmwAXe9nkDP5ObUaYE74uQg`oHyPF+ no^2s3oy%7p{$CELROu5_@o69JNg?a^fpmMi`njxgN@xNAPLN+h literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..27a36f71cc329a0d1d49f51ce35a5db0843bdf41 GIT binary patch literal 351 zcmV-l0igbgP)R<*4+d)7A7(f!Ny{Yfw_P;*hN?fmRf|=xr?2Jg&xBjB-q$lcmTH$QmI(@ zry4=XWOgU>r<$+bWxw~{EDR6`?10J5HJP66am$N5Gs@Wm6nREx!{Nqv*a8%JM*V)z z`W{OFEsx`P_W|n20ieMtPrC;w%M$kwk4BHT1?o1}cv)bbyh?k(!ve0&HCruUl2>iN zRRAAy!0`x_6kg;2&~%ZX9unHWOZ-Gfh@zIW9H_Z~l7dcpO(g9u0N{E4gwL;UXL&7@ z6m)qppu5`{P4jb7QvBU=o32|Ml@jabY0^O_*~jAT123=dUfNoZK+ChMv3EIOS%9;- x#<&1?bB*zXN(vesr>t@-N{WAfdms?tUof=gKky^`+d*H9tF}FnQ**9ZT|q zRJ$j{HJHu3S@SWhMml^I$K*4I<0spPe!X2T%m4dX;eJ<_BR`9LYm=kc*My&TJn8N- zXI0guGN)?3|4OfqmoNd%V_-O7FOhv|wxOY(ncV-YpM$tBl$$T`KK9Px)|=WFc@EPz uma_+0J(zsAL9dLx?&kJ77j*`P3-^V;CAiJsAR9UXWP+!wpUXO@geCyOt72vV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/kitchen_knife.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b0ec965cc5b9bd7b677363ee00d1ea0278b9d62a GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=r#xL8Ln`LHy=BPP~_K0!Ats^fu^mx46{=|DuOSxwdvRMhJm4V?wgv_m-*)tBU zk6AtAa9rurpIHa2?tj_$#Pft;QSGTM?bAQ6tTp2o6x@05-787{dxxiou6-6z-?(Yj z<_jDD=DjWwa=IJ)Q1I|+m5P}Fw69-*QmI#%EV;%2Az7{Tfr_9quP9*YsV|+2aA|Ktog?&FUETL=ANrAE(;=S zGmcnYSXw362sGgATK-1nANk(gK;;QP!kL6VoMQ_5;KwxSg92l6&)gn&k3$DPi%TTu z%zOUkJA2@c=?%@xGrg9X-hS)H!>6m9ap?7~XHlUHbM(apf4Db>7kF+seO&MhFT2Nm r**p2>n{-}_^6APJ825K}zBJ}{)=u167?rpK=yL{7S3j3^P6LZ zSG_Vk^h($z=6F)?q}IkRzP(OUUoW_$boV5qKvJ=qmUdA`^5;J*e$@v}7r691-fZPB zIYFRtK(Kk)x-*IUjn`$j|2=0?`gD)kaf#2rg&(QDSjTYr(H6bA*Oy;+cIud@!=SXN zPGa%8Vh*|$XPIN|peeegLTQojy!6X{KQ>PZdUj=7 z;O!gF|J_*ccujf2p;vtkL0wND9{sxW24l?8f^N(2+m_UGt`lUMpywb(n7Fl{pFv^b z&YKLg@4ndZ|D~jr{RfXt?+h;fy~!XS^O^aiT$A^gpB7cECvQJqxFhQM8pa>z*nT{i zC7+Pp+j@@ePFZ!#+jZ&B*yR#$G8%4Xw0rZDaow`aDKl<1RL3{#E#GFkk#WsB>o>(L n)3&@2oN%XawGAlB7&at@AC_W|)2#`d2jY6V`njxgN@xNAY{Jx0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/machete.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53c28c1d5f433da4feace26dcfc0dfb57bfb1769 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~$jaSW-L^Y)f^-XQ}4wghYK zkgpOSuU+rDp>!inC?A1_D@8gEccWJ%caKE?c%$d21ZrtNf>g#SjdHP9a%D3iq@)FLEo}YRj z*ASx_DH470>*3R-j9^cW6`(XKld%+!14foSN1Q)#5ba~$(Va+zDn(HFhhwD6b zTIU37r!f5h$^q>^XWROqKjl7;-IM5sWPimK%v-MAV{H*weLwg@)Z~0Nf0xC#ji22K oKES^)-7jjBY<`j*cust}#oOePoJk($vtL@WMxsbtda2i){_v|JK{T^qaPRr#d50I|GAC*52;@ z?-Y;QEZ^}}&rbe((B2!Ds>Jp4l7D?w%`{xLV%6-5y{x5wHz5efei6K}z&MT%VSXvHj7>L-ZlghT~6QlD99*NUDJ*U`tHqMgND0;fJ#!P<` r^BTVRBi{=8UjIFLWj{LuL&Fk&hoG3Vw!ImLKw3Rr{an^LB{Ts5!0uiD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/icon.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1be627f4f1f7cbb7ac9aa91b19989f9e2dd3932f GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFmigjIEF;DCMQU+E=~}+ATY(e z^soAowoC=x=8Z`7J|Mq~A2=6`7XI z%$=PDNzo_jHKzshO!u3&xa%no5FD909Y{t`^Z#}Jtmd%;M->k#XnpB^w3deruanDu<)lk S|F3{y!{F)a=d#Wzp$P!bEQEUi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..abc97dd73723ab272785209a33d00865c7d7b586 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yF6VSLn`LHy|t0+kOL3Hg^(}h zu}2&oyEyb7UGo26E?T0sZ|S_Yh%_bnaph8uYN!8y8QjpJtgOl|CJLIT>e+>Yj37(!RxZgllnU{w!dEX zzU80HKi6yhFIj-*F)%dL2V`BEZD_d8Om6<`%9X4VyQK|OlFJoxzuA?VCwRQP+c<^q oN1Ay;$K6KD-&gxz0CgR!W}NUQKt8V7R1;)^r>mdKI;Vst0MPDbc>n+a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7c82805619d88ba11733ca4c1d97479dd9c73a6d GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=M?75|Ln`LHy>*bQ$wA=QN5fC0 zdt2I>CUWd*5tmmdKI;Vst0H4NemH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/meta.json b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/meta.json new file mode 100644 index 0000000000..ce3fb75fc5 --- /dev/null +++ b/Resources/Textures/_Sidewinder/Objects/Weapons/Melee/survival_knife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by icepicked on discord for Sidewinder", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} From 4bc389d10915e94f99f2a213183b05fd5f50852f Mon Sep 17 00:00:00 2001 From: Icepick <122653407+Icepicked@users.noreply.github.com> Date: Tue, 17 Dec 2024 21:56:25 -0500 Subject: [PATCH 05/12] PrototypeID change per new rules --- .../Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml | 2 +- .../Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml | 4 ++-- .../Entities/Objects/Weapons/Melee/baseball_bat.yml | 4 ++-- Resources/Prototypes/_Sidewinder/tags.yml | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml index 6cd585bcd7..1202e3e1dc 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml @@ -28,4 +28,4 @@ doAfter: 4 - node: bat - entity: SWBaseBallBat #Sidewinder + entity: SW14BaseBallBat #Sidewinder diff --git a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml index 77e49616cf..4160c0fb40 100644 --- a/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_Sidewinder/Entities/Clothing/Belt/belts.yml @@ -1,6 +1,6 @@ - type: entity parent: ClothingBeltStorageBase - id: SWClothingSlingerBelt + id: SW14ClothingSlingerBelt name: slinger belt description: a typical gunslinger's belt. holds all your guns and ammo! components: @@ -14,7 +14,7 @@ - type: entity parent: [ClothingBeltStorageBase, BaseSyndicateContraband] - id: SWClothingSyndicateSlingerBelt + id: SW14ClothingSyndicateSlingerBelt name: syndicate slinger belt description: A customized slinger belt, on the inside theres a stitch that says Syndicate. components: diff --git a/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml index b393abf3c4..9f1f92395d 100644 --- a/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/_Sidewinder/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -1,7 +1,7 @@ - type: entity name: baseball bat parent: [BaseItem, BaseMinorContraband] - id: SWBaseBallBat + id: SW14BaseBallBat description: A sturdy wooden baseball bat. components: - type: Sprite @@ -41,4 +41,4 @@ Wood: 250 - type: Tag tags: - - BaseballBat + - SW14BaseballBat diff --git a/Resources/Prototypes/_Sidewinder/tags.yml b/Resources/Prototypes/_Sidewinder/tags.yml index 2103220ef0..99a3ecd40a 100644 --- a/Resources/Prototypes/_Sidewinder/tags.yml +++ b/Resources/Prototypes/_Sidewinder/tags.yml @@ -5,6 +5,9 @@ - type: Tag id: Prybar +- type: Tag + id: SW14BaseballBat + - type: Tag id: SW14Cleaver From 41fa95fac1e413af3e4ec6e98f93f082140ca389 Mon Sep 17 00:00:00 2001 From: icepick Date: Tue, 18 Feb 2025 06:56:12 -0500 Subject: [PATCH 06/12] absinthe --- .../Objects/Consumable/Drinks/drinks.yml | 2 +- .../Consumable/Drinks/drinks_bottles.yml | 4 ++-- .../Objects/Consumable/Drinks/trash_drinks.yml | 2 +- .../Reagents/Consumable/Drink/alcohol.yml | 2 +- .../Drinks/absinthebottle.rsi/fill-1.png | Bin 136 -> 140 bytes .../Drinks/absinthebottle.rsi/fill-2.png | Bin 136 -> 138 bytes .../Drinks/absinthebottle.rsi/fill-3.png | Bin 140 -> 122 bytes .../Drinks/absinthebottle.rsi/fill-4.png | Bin 156 -> 170 bytes .../Drinks/absinthebottle.rsi/fill-5.png | Bin 168 -> 212 bytes .../Drinks/absinthebottle.rsi/icon.png | Bin 464 -> 614 bytes .../Drinks/absinthebottle.rsi/icon_empty.png | Bin 495 -> 561 bytes .../Drinks/absinthebottle.rsi/icon_open.png | Bin 466 -> 548 bytes .../Drinks/absinthebottle.rsi/meta.json | 11 +++++------ .../absinthebottle_empty.rsi/icon.png | Bin 453 -> 548 bytes .../absinthebottle_empty.rsi/meta.json | 2 +- 15 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 4a9d5c0463..94c332ec06 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -152,7 +152,7 @@ - ReagentId: Absinthe Quantity: 30 - type: Icon - sprite: Objects/Consumable/Drinks/absintheglass.rsi + sprite: _Sidewinder/Objects/Consumables/Drinks/absinthebottle.rsi # Sidewinder state: icon - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 8630912451..f687c1093a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -128,8 +128,8 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkAbsintheBottleFull - name: Jailbreaker Verte - description: One sip of this and you just know you're gonna have a good time. + name: The Green Fairy # Sidewinder + description: One sip of this and you just know you're going to start seeing things. components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index eadeeabd74..7d5526c314 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -159,7 +159,7 @@ # Containers - type: entity - name: Jailbreaker Verte bottle + name: The Green Fairy # Sidewinder parent: DrinkBottleBaseEmpty id: DrinkBottleAbsinthe components: diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 602d6296b3..459991a3d1 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -8,7 +8,7 @@ desc: reagent-desc-absinthe physicalDesc: reagent-physical-desc-strong-smelling flavor: alcohol - color: "#33EE00" + color: "#303b21" # Sidewinder metamorphicSprite: sprite: Objects/Consumable/Drinks/absintheglass.rsi state: icon_empty diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png index e9d7a95189d8cf9850722aacbabe66eea5d0963a..1d759ab7f51dc28a042a180b58744afd10eeb2ca 100644 GIT binary patch delta 111 zcmeBR>|vask`e6b;usRq`u5yL-UbJb)`!bqTd=;~(Z8Kfr|@$^aqG?}TvEx8{)e(K z*>Exd!N0uKdMRm>mvp>1zi(#jdX|FkW~c0W`vjk?xpR9pquBXy+nW2l*RuK6udaNV P4$|Q1>gTe~DWM4foz*aO delta 107 zcmeBS>|mUrlEPRV~i@W9=**KsEmPO{?yqUcJqhcO;d6@vu1wTw%N?t3c|>k{0Oc;usRqnw%iPx;R0krzy~Y%k7{Bl(UfS-k!?hRvF8fhKV7(zrVkq z&z2hJI{8vsLPA18Ny!zFUp_Iu}u@YFFdw2AOO2)F;@$p8eNu6{1- HoD!M delta 107 zcmeBT>|mUrlEPRVGVVt0n!B`yR?!>U}oXkrG1_n1z7srr@*0&c9axy3gFgptVu8*_cc`k`rOQVUy z`n~{%CM!_Y0e_X&w=M?P`Sd3K OS_V&7KbLh*2~7ZLA}0m_ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png index 102c82b37cf759415c0e238975eb58eae30ecf0b..490b27f28f216c5292281e332930240b6ae821a0 100644 GIT binary patch delta 142 zcmV;90CE4E0jdFzB!6*9L_t(og=1hC1*2dTjDk@x3P!;wAQAlk|9=`Tx&8b1TMI{?ih33Bu!14eQ*;Ri~4$;}RPMgC76@R#qVfkQdHw00000Ne4wvM6N<$g50Du=l}o! delta 127 zcmV-_0D%9h0h|GlBzOUHQb$4nuFf3k00011NklexC=HQ#ALclyg`B0000V+NDV*tK1)cimx>S(5fKgBI!gdtRc~hzA!c^|9sq!6^J<8_8sK?Z=he#stiS*z u06hDIU-LKP4U7jkI!o1>Gvf^~09^_L8t+2*z$!BL;0DriiM;wI!#zusdfU8$7 z5rz=}aTKz%vrF@2!v>0i&7re%H=RBr7^~g41ncwnRZfie9SJx_gMP9(r80~c=J0H6k>NlZ130SKd5j3pA_d0sZ( zSbaX?TX?u6CKn4BSenHAIJdlSSKfjkdlVHES^)f+thjZYu* zzl0(I^+!g*6es$(Uu%89uarjbe&@?)og3Gx1pCRAIw&TuiJ#)XNe&i&MD<4Dx3^7_ c{$m691+p&fyE~mDF#rGn07*qoM6N<$f(|zrk^lez delta 439 zcmV;o0Z9Jl1keMJBYy#xNkl><}Q!0sS0H z{(rgk3^C#02!>&b}*hGsAf!w85B9-Ex#)Rr)E4QMv$Kf85kHC4xc;E zaOlig1_mAS&3~XM1Z<5A8LHD#C^3S8k(6dRECDVMF*bhk>=}l<|F(q;A~Ny}q~r#& zqM&HyLk2q&V@U8r!HrwD7#Ji;H;e2jn6+#P?2;dA zAOboJ3|u;_3=GE^NOsMDH%Q2G0IUS01|TU4zQ6m#z%b0rV9d^gS>k@a^PNFNMxJB` hkdzH+0R}t`005jAe^_Et4_^QP002ovPDHLkV1kjJz*ztQ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png index ecdaec3e51e6fdc3a041b691238dec7ade3b3a98..11dd744ea916af1090c186bfa52b5858eebac55c 100644 GIT binary patch delta 537 zcmV+!0_Oei1F-~l zl6>Kzd++q_zV|&i39fO~Vd!3bv$m)@_uC)7X~nvsn|yxO27h4GGzkMAKdbeQBr z5!m^%+tZdpt8e$GQT2MJ+Ig1C9Xmh1%j1a@a9tPIb$j}v$T-t~Ap`(6x9qO!0S*t1 z>RM%1^}2JR1b@(-TNbzGA5bhWhzMvY@PF|23jhj0s~M7Sg#h?LD2^o} zV47xPf7*P1%2$57B2F$Q&_=5n@^9vO>Qp?10pTRPbJtLfhEaXD@ydx>r{(s8knNA3 zt7Buz`SW}5Nhl&voXjYoJ&MaI_t*I8?EgK!v{5_}FKy@&NLSzQ>|BWdVB$9Pg+%^q b0Q?81b`qSP&Wy3o00000NkvXXu0mjfykY}& delta 470 zcmV;{0V)2m1n&coBYyw^b5ch_0Itp)=>Px$sYygZR9J;$U>F6XV1NN5u?i0yI6#uY z4h{}PsbeC^R2qO$2aGy^gpl)XYczle19R&9I`{;dipg_wkGbg zSNw0By&QX^o?LT?4gm)T2bAI%H3ZmELV(y}n1O-J5SS^sYMYcAZ%rISj3xsE1H+l> zQ#Z?wwyr0~ERr37Z22OFCD$1k7#MDI3aQN$+Kse^0QV)iP@=!ovPj)NUWJ;MM2TZhYWTm#tetfAkyEBTerwD ziu@>;wQMd#q3n6 M07*qoM6N<$f{$g-S^xk5 diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png index 55f7440f9795fb727ce4ca7a6937baab504ce528..186905d28178f3e0a8215c9ed7313bc7e7673116 100644 GIT binary patch delta 524 zcmV+n0`vXS1Ed6yBYy$wNklBa^peZlA(s#@Nt@?6+ogWt z<=*#s?s=Z?^E|xI9o*u7hov~bcY?-a44FG1Qr_?P_5dhd)+F)jS3V^fvnbwWI1rzC1?BKBoeE9ll z;9iP2x1ic9v+b7q*KdL6d3c^TP!|N&Z}m4q0ATxdsV{qg^K+~EyfSA7+1x0B2-d^Z zMX6L0IS}7jDqJUhc~)pLd_XR8uMA{x}?c5{d}q z?j;P+8O7y@dM|vs$49MyHi{?1rG}P3H2Yz)KSKNm6SiR}B;~&az%N+zk(TC35<~z1 O002ovP6b4+LSTa7A_8gv delta 441 zcmV;q0Y?6$1kwYLBYyw^b5ch_0Itp)=>Px$j7da6R9J=Wl|M)VQ5?s=g&_^%Ac;9R zsbv&VCpdLnK~RejMPW%x(cmNvE#BbLEVP7?<5EBGaWqc^S-?AkM{rt1qB6#R;P{hN0;a+zLhIo0DsV-dOF{?M;Q`NJ81v_ zyxF0n%nls|fFqU23D6KERlspv_1o+Be@>2$AteaNW$zH&+^D)3hN;`Bk`ka6Td?oA zVtr-%(F={BcH)K1LsUVqI~p@uHS8kXHUQv#NpbCR{peo;)NUR|Bn<%5Cv##ko{f@( zkTrzfgh7}&{C^PSIEZHe03NmD=+pwhR&xSeq^=O>1(*VAVu!2>MuvyrTUnN)kaiEa zL{H3U)v(@#L3k(>ey@l2=Jm8?Ht9Q?s@F+W!Rl@vw4Fkn|CztrOol{7UO{Mk2eh36 zZKp^T00>Wj4J^6Ch@^A41^}2A)G%QH2NO3vQe91dj53GS;@3QneIc%kXfTU5iaL00000NkvXXu0mjfSrflU diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json index 960293f615..9984d536a9 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json @@ -1,18 +1,17 @@ { "version": 1, - "size": { + "size": + { "x": 32, "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", - "states": [ + "copyright": "Sprites by icepicked on Discord for Sidewinder", + "states": + [ { "name": "icon" }, - { - "name": "icon_open" - }, { "name": "icon_empty" }, diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/icon.png index 0267a69709de2ac8bf24f4607e1287c13529cf2c..186905d28178f3e0a8215c9ed7313bc7e7673116 100644 GIT binary patch delta 523 zcmV+m0`&dG1Ed6yB!BBkL_t(oh3%HVOB-Pr$3GV(6hidqc0rM(O9tB^=}_nrL_2g4 zg*aOLflE^gwUlgKy7Yz)rCUKPboGz8e?V#N(nUuzi2)JxlFQp6mk=*Wo98*(rGDY% z-uHR#d7kg{JiN~x+~R+Sr8O)RF}>%5eVs3rQK5*b*AqW`Wq-Ea%4fV29U){VXe6X{g!;IRmN`1)z! zUWz!kpxP_5?Uwu3Z-M7|c%C;<7X;RC^*2HQVEc8cFMELVbF2EiGG_+a+$ezv*2C3B zsZ;k0I#{K@yjO;gV1^O^HChI~R0=u*`?`E%oXc7iNUuF9O zx8E7P3Ze?kH*6}|ygN)^$>!bphAnZa`xY$UnRGLb1HehGM#gbCsns;DWEGfQT_n5m zw0rIio^c%RE<7Svej*~Es=(uyn*d~iX2U1b^Z~fM@_)s?L z_wOtvW{{l*7#J8B-txOLaPl)SFfc407zZ3acb?(UnX?RX{p@6$K~WUg8W}QFr=?J0 z1Op=}&2m@*EPps5arVixXBhI4vsOom*{OzgSyu-VYbIGyP_*(PgPn;n!=W>X^mpUd zEpm(^KMH0oTh3r-V$5J?Voa_P3=9lphCoe!a?B!zCD$J?Tw!2fU|^7oW@nIN&}CTb zaZR06vj)6DLY4zyB_K5bNm20o^P5u-&%W`)CiiIPdnA1^J5`b$KvFiO1sL!&001kf VdDG-nvNHex002ovPDHLkV1iCuv!wt4 diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json index db0ac608ed..ce01f0f29a 100644 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/TrashDrinks/absinthebottle_empty.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Sprites by icepicked on Discord for Sidewinder", "states": [{"name": "icon"}]} From 1f13877301587c5fa072b5da9f724aaa9be24f01 Mon Sep 17 00:00:00 2001 From: icepick Date: Tue, 18 Feb 2025 07:25:40 -0500 Subject: [PATCH 07/12] ale + absinthe fix --- .../Reagents/Consumable/Drink/alcohol.yml | 2 +- .../Drinks/absinthebottle.rsi/meta.json | 3 +++ .../Consumable/Drinks/alebottle.rsi/fill-1.png | Bin 135 -> 114 bytes .../Consumable/Drinks/alebottle.rsi/fill-2.png | Bin 150 -> 114 bytes .../Consumable/Drinks/alebottle.rsi/fill-3.png | Bin 156 -> 116 bytes .../Consumable/Drinks/alebottle.rsi/fill-4.png | Bin 181 -> 165 bytes .../Consumable/Drinks/alebottle.rsi/fill-5.png | Bin 206 -> 180 bytes .../Consumable/Drinks/alebottle.rsi/icon.png | Bin 433 -> 471 bytes .../Drinks/alebottle.rsi/icon_empty.png | Bin 459 -> 433 bytes .../Drinks/alebottle.rsi/icon_open.png | Bin 432 -> 425 bytes .../Consumable/Drinks/alebottle.rsi/meta.json | 2 +- .../TrashDrinks/alebottle_empty.rsi/icon.png | Bin 473 -> 425 bytes .../TrashDrinks/alebottle_empty.rsi/meta.json | 2 +- 13 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 459991a3d1..949b1397fc 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -31,7 +31,7 @@ desc: reagent-desc-ale physicalDesc: reagent-physical-desc-bubbly flavor: ale - color: "#663100" + color: "#8d4b03" # Sidewinder recognizable: true metamorphicSprite: sprite: Objects/Consumable/Drinks/aleglass.rsi diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json index 9984d536a9..01dddbfb4e 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json @@ -15,6 +15,9 @@ { "name": "icon_empty" }, + { + "name": "icon_open" + }, { "name": "fill-1" }, diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png index 1f619fbaa5dd1e9183ff018d1099feca28ecb716..014544e55081c7179d5a463299dbfd97a8fbbc52 100644 GIT binary patch delta 84 zcmZo?ESjL=XX)wU7!uL?_Kcw*gMt9_LH!GDx=R`xDmt3JJN!?5b=$~zx)uWvI4s!x m{*KDrC)uhK->PS->l)M^nZ#4-t?}+KNY>NU&t;ucLK6UpH6a=R delta 105 zcmV-v0G9u9hXIfzV*ztgM?wIu&K&6g002QrL_t(oh3(J54FDhrLs2m9Z5)toxZ?zp z^k(9JSJI}K0RR91!0%iQRMlz=-M7*=)d3NqMp{D+Wajn5?uKU_)GrMwT|9Km00000 LNkvXXu0mjfX1OUT diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png index 88227517204d8f85537dfb4f609a9c1f37da7c29..014544e55081c7179d5a463299dbfd97a8fbbc52 100644 GIT binary patch delta 84 zcmbQnSTsS!&(hPyF(jh(?HNNs1_c4;gZdZRbeA+XRCF|bcle+B>b8;bbS(xTa9FVW m{T-FLPqI}fzE#gu*EOg;GKr_uTjSkfkgTVxpUXO@geCxuAt5OM delta 120 zcmV-;0Eho_mI06?ashKvM?wIu&K&6g002-)L_t(oh3(M634lNhMA1d;d$GTnZgP(W zsE33F75=-1NrsF80002sZ!&XsW>2lhzS%(q)OZG)Q+fmgEzxBvhE07*qoM6N<$f)kb^)c^nh delta 126 zcmV-^0D=E>oB@y|cmZ=#M?wIu&K&6g0034=L_t(oh3(Km3V<*SMA0JNyLi7GC;M?P zR_wG;h5wcbrIRTI0002!B&kZOZ|BoRMDvrUUCTBWXWTyn+*R$=ZwHuZcOSYJUoCH- gJ3wY0&JLe-0%y@9Dr!0Q9smFU07*qoM6N<$f{jHn<^TWy diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png index aa9bafc579556a6f071acb7b3e46f5bf69fbbe0f..6492c7acfbcdb7e49aec5800f5fe2fa6a0b17b06 100644 GIT binary patch delta 137 zcmV;40CxYi0i^+uB!6s4L_t(oh3(X_4TVq$h2h^9=Pkkk@01*)pk*^wK91-CW;byjF>&)4pyZ-@NYfH8Uz^@XnHV2q8p}Up$-uK!# rg#jveAoAFoN0@#@X0~RtB3CCGXCyd+Tlp3M0000K?=Yi3TdS~QSQNQIrND4RuX4FCWDpcq9rnAzbTNOVTd+oJ(QB)a9>05@iSOxk;Qo0-|N z0m^ujW?Cq3V9fxds+YZl>1UXo_^rHwZ~#@Eezo2j{MH5G+7chECYIap00000NkvXX Hu0mjfbmBvS diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png index 6cf2364cfd76ff634e1f366484355c2e4681943d..f6917557dca567a9251bd68178b0020d10f8491a 100644 GIT binary patch delta 152 zcmV;J0B8Ts0ki>-B!7EJL_t(og=1hC1*2dTjDk@x3Mc??-@e^XsToWI?Fbf1G~d5} z{{SWW85pP#0z=*bjO1!ObLLDvGT+3+q>&tR20R2Pb-;5dCL53y1<>F}w^)*#XdpWq znwXf(!s4h=Fbe1cuq8Nh6Cv5T;LMpbZsh761)~5N002N^AraZ=7@Wrd0000dM_;cP;i2wiq07*qoM6N<$g0`JdCjbBd diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png index 08afa947bee63989f47a230912b87e19745ab8d0..2d69f8a12a6164f9215193e1c4b78046bf6f98bd 100644 GIT binary patch delta 446 zcmV;v0YUz;1J?tPBYy#&NklOE^P78zETO+lWT6y&#GaH9w$@ zAc#m1lz?gMG!_9(Yb}CZkPrf*u@EfOVC4@8f*^|Eow@AoT9||jR=W!U;T}wJ3-{jJ znb{d2K!5=M8MVDNUd}CX6%I{Uv{nNE>?|*Kgc;*FI62n^C=l z(1gdxA4oAw4#jw%ZFIhyoWn6)+`oJY^GTP0v_ch1JwS9FVO_0_g#S*&qdaCCAU@$J zAuydVMh8vdfqx*?gx{QFBH7<{c6afH5E0LYRQ_^@y8wWh`3+3Xt;6#ew(?m}Pkbp! zWuQ_jB9+cyGhYIwO%%3QaalcT+W-J~61SH&kVPx$Ye_^wR9J=WmcL5^VHn3h_nu8H4NVae z{Q(t3P>E$Ibb*siAxAhhRYOtG65-OXr2?VJp*;u!uTYd!XbKfv8=N8pmzwOnhE#~A zdySLG4;=Tt!}I0yKD^Iy(4$9>|Bhm}Ad|@eP&o2i0nG#;X@96p?4}d|pU-D2&t+Gj zML;u28ftr8mCTVA5QDLUh0uEm;3oZ`d&V6WcrIM-j|>+9=&z~3ma_r?rOoDINj{?^ zfw8l%chYcJ;PL#_Dqok|_5E z)qaAa&sz6RS$}r(y50flDR2)J@js;jNbk*ad#_66NOxd#c9MG5OFiplZf#XIMoz$^ zHE2}g?R}#X$G>PgC-9s6O@X}evn+Mz@FmP81i~FbxFh5e@{N=p!@MEL8&}PpkUmP+ z?||(NOmA!}^$+vgC-=2hWdK-?o+uYK{|S3^oljgXU=diA+;q$U0000-8?!gvY?3>@r z?#=+ALWSyPRS#CYQg*=$;t^p7tyTd5+l%wxfr&gEpA{njV1HQ_%g^Kj_(k-|pozpD zMi2l1_SgDa+ppsl=stjWEc&bb0AL!1JvP|OZV2L8kW3CK|Grjxu+1KRK}A=vyT7LZU}|;^ z6EmxDUBcE*R)1-iKa@ljC>Qcbr88JRDnM%oxs7F9R!${W!NzfJa}K)o4ghck*^2>E z=?uz+JSw*%(AvTD=pC%dC0tz}vc1@iBOZ%-reWBL#DMZ=-Do`9O-HMn$2XRz_zLRv zr&sA&zu3PZcV3EUBBhD?nvV7_b#hS_wf0aQ)dz7-ff0YDjIBig0000Px$g-Jv~R9J;$U>F6XU=)mWz(}fw0|yQ; zFfcGMT7fq{X6Vb2a`27~gwj0_A63=R$sB$>xTssmua#p5r-o*m3^_8T(I zA=?2=BGVcjgT7v3U|?X_xc^YBwLYC4aPPv*dIgz_3=9km41e73nHd-uis|bB1_lO( zOZiZSC;4Vji5PHuJ^37l(N0ZpoYYnn$F~NVix`Y36bqCiUVlzKFt9L!!8~_7) zDJ7hg=%?5L)Bq%>0kNmo8h(HKdPy&(g!9szp6?6{3=D@RG|AW%)U}r}Fsx@_UC0ifdO^Ee^$4Z=wkEsvCbyPEVAo@f2^*nV2SU~^Cznq z7>-gLPVQAgOJ_ cQ83^D0E?$;HTE|v5dZ)H07*qoM6N<$f>^G?3jhEB diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png index b1875071659af147c3215330a0e26bb27e9a72a9..a161ac3f3b06722df6c330ad504bbe28a2a9162d 100644 GIT binary patch delta 400 zcmV;B0dM}W1E~X$BYy#KNklnra_q%tw z_kfs~nE#F;olvP%0065q)4}^Y<^a0~#|8k{wk?WhNd>|%zkfOqvvv$KiU0ujZT!AK zll&;_Mi&UfLGb-YKPdpnf4)cpx{I|;;45^*S}LG}xDWxraDR7z57&>FRsH%w9Ix#e z_ zuPO57O-U;QrGH`p*<2orJ4FzAaF*t9THe delta 407 zcmV;I0cifI1F!>-BYyw^b5ch_0Itp)=>Px$YDq*vR9J;$U>F6XU=)mWz(}sfi?h3f zSh=|M)^FXe@8f8NilE0Lx5}tygJz!#9?f)mc!U$E#vQ9 z;dFPv+vg91et#dfW%zyAmVrf5CX8Hj$SMaIfA0$a_h>hq|L@U!h9oDJRC3H3x@llQ z9q^ykZ6&(cynU>*$uW!Uy5JwH>nd2{`}6$CDh7rlWSK*@1OBtRt^ECl0TL3dS`6em zV8GJ=S+yb0-SZ8|VmtTl(`R5{U?8V990dao0PJCB8xU7qLJ|M~002ovPDHLkV1jsR Bw#xtj diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json index 960293f615..fad116550b 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "Sprites by icepicked on Discord for Sidewinder", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/icon.png index 05d0e0330f012153bec176ec84de1c35d875b6b0..a161ac3f3b06722df6c330ad504bbe28a2a9162d 100644 GIT binary patch delta 399 zcmV;A0dW4=1E~X$B!6&8L_t(oh3%CwOT$1E$N!00v^c612X`0Y3YBgFQLL!_1TKP$ zNO2HRK^#QXA%k6=MQ|%3rHgctN}&NKzknbrj%saQUK~^iipaZEi27YM^a@clQ0{rW*1uk9K5 zdjhFs;#2woz%osDsJByG5VU(iCex?F&(-RUYjwyIs&xb#Tbl|1#wHgqGBFR|XRNHR zDe~n_Nh<@TVt)bITpo)%MG$##mgaC;-q#5gtsOhdQ=sNE0KnJSy|zF$mq)2sK>2b2 zL>|TmuV9bP;_Q4|97|j{QprSMnWmdg_o(o$>-BrL;gPzyeGa)Z@F+ag-cd=bw8ylS7YuZKNW}zwb^rhX00>D%PDHLkV1nX*wjTfh delta 447 zcmV;w0YLt#1K9(RB!8euL_t(|oMSw2-~huw0;U1AebfP?4j6R+B@VdI>HJ^hqQifY ziw^%UbUObh*BlmdHM)5GW!STW8P0w~ZwD}mOlx!u`g)0hfq`M;{zI|W`gC@{y$dtz z6=W_lFfcGMaKC3}U|=YwuLBqu7#J?)Lm8grn?aES^d>^+J%2mMH-oHPAolcHgRELi z@L#U(;J;km!S#pO%#Y6MT~9X$z<^##2`44`DRuxg0LcyzdwQ+m_qVT?^ioPVFU{%s z&cMLHaA-o4OxMOe?c_wm&8t6+)m z&+{j%7#NO_We(X6_|NLL^7k8tl?)6F3=FJV4CFdsz&HycMsoUwJa^AGAoF+b-KWpM pz`$UgRvbtd2T&6XcoYn{0|4Lcfka;KvaSFC002ovPDHLkV1mN#*ZBYd diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json index db0ac608ed..ce01f0f29a 100644 --- a/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/TrashDrinks/alebottle_empty.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Sprites by icepicked on Discord for Sidewinder", "states": [{"name": "icon"}]} From f0c0fd2a61f101ea8b6b8e530cd5f4a3c3751bfa Mon Sep 17 00:00:00 2001 From: icepick Date: Wed, 26 Feb 2025 12:16:22 -0500 Subject: [PATCH 08/12] revolvers --- .../Guns/Revolvers/inspector.rsi/bolt-open.png | Bin 344 -> 619 bytes .../Guns/Revolvers/inspector.rsi/icon.png | Bin 346 -> 617 bytes .../Revolvers/inspector.rsi/inhand-left.png | Bin 313 -> 503 bytes .../Revolvers/inspector.rsi/inhand-right.png | Bin 306 -> 504 bytes .../Guns/Revolvers/inspector.rsi/meta.json | 2 +- .../Guns/Revolvers/python.rsi/bolt-open.png | Bin 334 -> 582 bytes .../Guns/Revolvers/python.rsi/equipped-BELT.png | Bin 235 -> 211 bytes .../Weapons/Guns/Revolvers/python.rsi/icon.png | Bin 336 -> 567 bytes .../Guns/Revolvers/python.rsi/inhand-left.png | Bin 305 -> 467 bytes .../Guns/Revolvers/python.rsi/inhand-right.png | Bin 298 -> 453 bytes .../Weapons/Guns/Revolvers/python.rsi/meta.json | 2 +- 11 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/bolt-open.png index 8cb0656e6818ca5d1045cb80e4b94c25701e7a33..c98d9150fe5d5ea56b34f9cc63abcfd7087e4e10 100644 GIT binary patch delta 605 zcmV-j0;2uc0_y~j8Gi-<0047(dh`GQ0y0TNK~z|U?Ug@h6LA#BKPN&?Vww^wM$kcx z%4K(`AaruEAPBmOpoGNGA&9YqlVGbuY)fkhmb6uhpyDJHoC+PXX}cs)&Ocx%g~ZUi zMw818=MZw_l1q(kbn(91@A2OIe!su>dw1Z#frI}YLN`g06n``Ta=C0*`8)M!?X$nz z2BC0_R5D@cdTmz%Lg5&yTH)nl(h|275C{Z}D_3vvcq}de=z5KExk4x$Ys;OU8Ygz= zzIm?I^o}C>`VO?kYz4@&EWCaF%$S&(HB!k0k!YN!(~s!nURBE-Nn6p{qvHrfAmmo1q=s7j-@Hl# zplNktQFM_?CU&(YZ3PYTf?A=d{9wTAW@#!?2n^rB@EN$0kPmv8(H{CZx^n$b*mJt-x3Vxr5A#V}C&(mwJodvv;tHN@21K^*L rgUuRVJmE5bo6Xnnz<~n?e+$0=ca!yagT4rX00000NkvXXu0mjf@30?E delta 328 zcmaFOa)W7tWIZzj1B1(wu46!ou{g-xiSg!1oq8aLv%n*=n1O*?7=#%aX3dcR3fctt zgt!7}Zf@@S`g#==mH7C0dwctkkdT&^mihDN7Zw&KCnxjp@N#f)GBPsS$nz=-uy5bK zJ=;bkNLxToPR??1|4*QPk&+<4V21xdP!A%Iz^;eMD}f58db&7jEG2)F&0AA-i9poH&+m0OFI{4IX#6EosHJ08pJRM9^UedMrx)t8 zPIR1}%Dzv`MJ!!!PmTujx&Pk+3V5d<(NXBM$eqA){%>!PcAz*LL!975JD>|0JYD@< J);T3K0RUh?eGmWu diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png index c24cda9b0d7ac7bfd75d031d1b0cccd7bccf9dd4..5175249db3a1b71d710dd90248cec08d2b53088d 100644 GIT binary patch delta 603 zcmV-h0;K)g0_g;h8Gi-<0047(dh`GQ0x(HLK~z|U?Ug@h6LA#BKPRTSl7A&uh~T0| zCD|P+2%TIk2!gJ)rBYH$g&+h6rw&Djv=KD~O9+BE6rF^EQ=vmPZI=Y(P{B|NiJ^Br zO)dxi93&x^CNVbA#ruqp_ulvW-tYIj0~;Hg{~f89q);d<0DtoNTu=GkdbIXA+G~T^ zNR(7EE=;p_CZEIj6D2uBXP6P0KX@(p3 zR#87m4%hI4f+x9XyD@c z6MQHX*-%Fr_mwzz@;K|;1xlW?mRzUPiD4LheIG1^&C_e&tL&Ed3HUv{`&{OWe1?&c zV`Q_Njhav>Ecy`#IMN!Zivtbux1S6NAe-Hk#>Os*L5W)o)Tggc-by~7lR}}e*xUO$ zFmY(}3RHH>`@hbf5<8mNn7(de5Teakj-aSj2>3mW`$`1-oy6b zJ=;bkNLxToPVWEJz;{6XA|*k7!3_U_pdLgZfn5)iR{|AG_jGX#shIP2LZHwg1s)eq zrWFE;kN&>TI&jg++tRVTZT_CQcUhA4dYLSEj&UknP}nlNagLpT#cq3z7J>bT^cp4R zIcTb??C$)<^t>_0x8q~{rH?xEwlZB5D(0{I6ME(1G?qI5%0TzmPo4j6JsYsfg`a)a zC#eanIk9Djq8-Fi-?hAMiz@hYJNCfNC01cr~F00F*9L_t(|obB4NOF}^$2k@T~5z^WcMN2_# z_Xd%cvc)NI6(6TCAL8UV10Bm-5Y#bgXE+IVhLgbA#~Tq5C6XCh_m47W@I*4BV_Cn_ zasu*q=bz&F)iNm*iqo{H7I&OMVA(iPyz7ps*KN<afKh<4ki^C<5Q%j5xM*p?|8 zsQl{smR_Epq&ml1+E#w@05ZH8g74yYV*_l<{IeCliDLOSx^0;>mp9-<{yWLaH(=d7 zfQ(fc0-|a0enS+>H=x<5EQBIb>AaFnV9emDbbg`uW}`AIb|*6gs(b$bHbWpQN_4pG fH2?qr!2bFIc=pDlb|xrb00000NkvXXu0mjfW5nUw delta 298 zcmey)ypw5yL_G^L0|P^Zd(K-R#aJBV?!lq#&r&gXGS0@KCy#pL3jsnYdn4OvBb_N=7xiN+* zw44b%vWUUe$3rN%Q7h;qlMb_t!CDTN4X%yH5~nbBaVSePZ mgBlGd4{`3`SS69j!0`4ZXQ;%aN6UfkWbkzLb6Mw<&;$UC;93X( diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/inhand-right.png index eb631b735647a935b891eb62b8aa2e6f1613df42..d971b60e17292c997e52e45f708981ab3a7f6037 100644 GIT binary patch delta 490 zcmVr~F00F;AL_t(|obB4NO9F8e2k`GzL{nRX5w!FN zyx$-W4eH_)GzH=$QV2DOldEf+1O}pW2u*^Mi|8f}-sW;!gF}rDZoek4Q}3d)yUhB2 zrsGcJz3021!+QV`5fKp)5fKr9n|w)&D81=8f*_)Fp;-3JWq;4@=5WwKG?oGYeKH*b z0NU2f2qnUh#gmulbz7d#cb0F6D4ot+0{~8@W3;WA(Y9v0;e{B!bmkgf9lh|Y&Xb=^ zUeW8eaDMn^Kdbg%wxR*$CHV;xiR~{Pf z2fT>-Gbg_nUpXd#{cywi83~VnIwB$>A|fIpA|fIpBH!FbX<-O!XJKVL{#94$TP>n= zG?v0}&o%QUnpDv$?y4C;$Ke07*qoM6N<$f{JV9yZ`_I delta 291 zcmeytyoqUoL_G^L0|P^Zd(K-R#aJBV?!D2f z;A~G9$B>FSZ>Ko&H97FOdULMxe9BONP2i@GdSZWj;d=E4FOpWbEW9lJCD+P$|IfE+ zb`An5A>#gtx*jJp6?FgZER?ePc`LgwZxN~gDiiMB9N3B1{ zWE3~8;ppX9MGmIc@8X+&*;XenHeV6B;6crm>+jb_F8ES*WJTl$^9{cWhcbA&`njxgN@xNAz2tEr diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json index 1faecd06b3..a2638ad7ee 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi, Modified further by icepicked on Discord", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png index 15c38dcf5b1ba556e1d7db5171a0996c21326a10..807cc30619fb20826547fc5f4958f6aa350f6efd 100644 GIT binary patch delta 568 zcmV-80>}N%0>%W88Gi-<0047(dh`GQ0u4z-K~z|U?UYMz5>Xh2pTS-z!=SKP23n4jV0QUfdWD+muclTgd7)SMlK`01YFItI+=6M z_rBlv&J5Vt*x1~GqNIePq{KREWinZj$zo}OslXokc)dnS_z|R8sC0=gyc)onJmTgGurJo-S)4!320iE-@X1rbWNVD5(fx) z_o%BygeSy}*5NP^M0R`d`uxalFE?5Tr^`*XQZizD5PwS-a&eCc9e9=wUNpKiw!;4` z^cZnih+wgMfLiO8!FWPVdd9oAZzvQB5==k8a{1y>qO&*_AIysPhdP7tgwsl20w@#; zQa+zw%U{vJ>|pN2t93|+{J?bdhJk1_VT!M#`y~Uj+4qM!^={u3-xOv9gYkq~>(<}~)3GH3JuF9r+~#(LA@Ha0dk0Dl0#>gl5caOdCv0000z<=fH@A=yTZ|{cI&;X~kD0FHCa}iz;A@@;A9tg*&o8EmPT*ra7`vKTQ~u_Sg|E%uY-^ZP-1zdE zL+1^4htogU7C1&mI07jHgbGAU zY$Zf`Z-B3}Wx2T@0RR910JHR6JM~>Vtv$!D4!HqM(|iuSyFGK`7MFbiDWxhRVmQ{* zDSw{D?MjB-&-;>b+jG6toBIO*000000D%8is*g}~JG`WK7ck+wpD;&uKVVJ6V~mu> lDko#JFF+ST7Xbhu&kKds8{}Cx3)=ty002ovPDHLkV1gn9N(uk~ delta 207 zcmcc2_?mHoN$Yn1dT91) zE;Uqo^s8oS{FY6%nGWZ6c6Pk*KmIDtKB=;#dpT)3i%C7|Jk~na}J&qn9H0am?Ox*aH@tu{k$xP__|wDKzck~{an^L HB{Ts5M`TnO diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png index 8c8ede0f817f041bcda4a963b64ce599c3584b51..4ac3b55ba1a38070b68040e6cb6b93ec54ef1e78 100644 GIT binary patch delta 553 zcmV+^0@nS|0=EQ^8Gi-<0047(dh`GQ0scuuK~z|U?UXxD+h7!iAE#han-mZ&R1lHK zBoQP`89S6pEM2>_8RzZ0 z_fEw!P*oMnEE0*x$SYB_R0aSs8dAJGXM5|FFUQ*2dZ1vd*|^^TfMI-<2xxn|-KN|A zG1q~5qX|sM@qc3dB>>moYk_%}SE3IyaIznB?BNxPI-Q-1EX!=Y-T^=eLB%r2q|*R= zYSsDj`Aqs#&L9E}ob1P(tQN<%Z7#ljg!D1lT%O|PIYz1IdvDuae)jr*qwC>wJ1g#T zQSG3lk6Bd}pOAZ2u?%-?|88J+Gv<3(s&%O?#l8LQt$!dAk-hz6#C-;Ws;{p-W zr5#RBKcMTn1dvFioN~GJDA8FWzaPws_lJVPc*2?0mjHBKmkNc#LjH;_UIlX>UbRDZ zcLSKV-ZhX&q&)FORPQq|JNy1naNX^D;!lM)g28w~wRPiNC{Z~uVA0G~_hwIVo-aT1 r_OtWv!i9ART%1x8H}a4 z4J*%A0ksL11o;Is{6_}$K#qW@!$P3!Oivfbkcv5PCj{~}D+suh-&i`W>A+wA+l;pp zloyJBII92rtwrFIXY3EoYg=S6x4nPdwm>VOxjyH-^XnTc8^xD#C|3M9wz~Kq3-^sW zlb%Tvk7vZ)-nj9ZRd|w@$%T()qDi+t`yD=^Gkr(;(u2iEpVV(@n&jPL`S@D)Ep9K( zsS9Uwn|_?v0oGEf+Lmnzsvd8Jr@6&GH&@F4yqV=`__yX*peq?XUHx3vIVCg! E0Cot2F#rGn diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png index def85defae4c6ef58b939167e8fca7fca49d9bf2..a4d0580555118f8f4f1c58b54c8bb7f173134f25 100644 GIT binary patch delta 453 zcmV;$0XqJ%0@DMK7=H)`00020X>r~F00EjwL_t(|obB4bPr^VH2k`Hy@yE)Dak-(k zNe2f53=GV$@dxn7@dvQMU*JSKI1q{qT}T;)P7QF!ch`Y? z01*)p5fKp)k!Dg_Nwd{Xio`Tq?LiYz6EA(dy-5Jz^?&LPw&P;rj|#<4{1I%& zMG#C)q_^kH#7n&}KKH^{lvXnUK($uKu`4R2l~ikW6KNe}WCwIA<+si6r}b*Ci%NoE zDzf4>#YfR{Z`X7xM ziHL}Zh=_=Yh=_NV41xADr7{noV&?)iDXnJ8cZWvi1B%Q8s7TKc ztczEwMSBDCZh>`3-z4wM8@vNw*Yn5H-hj;!Fwum(89oBwv-qM%L3;xR{hlzR(0%9sZ)XTpHGu2i&Vh)Ch)&lB=rYR~^k@fh00000NkvXXu0mjf5tG_K delta 290 zcmcc2ypd^wL_G^L0|P^Zd(K-R#aJBV?!s0lf_JYtU6~_CG1_aLuA8JPSz$K z4xt3I1FH`7I0~k;tXRY(UB-Hb$HzfgqPe9(C#FF#qe;OplC6!&rf6}3NDtE*2acJG zJ6svNW=vpN#uU0_5^DsTMM9KdM?yDK?_mvQ5ka>EedZYgZVcRlY{@?E23!f73Yet* dnzY=2KI78lc-WD)e-+S;44$rjF6*2UngFN?QLO*~ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png index 2aa960b9497cffae8b5d8aecadb3ae994a759fa0..db82fb5562666724bdcaf228ad09ea207263dbfe 100644 GIT binary patch delta 439 zcmV;o0Z9I;0>uN67=H)`00020X>r~F00E3iL_t(|obB4Jj>13`1>iGe4RVp-Ms(>0 zv4Q{sfdh}5opnQLQR!2pDp%?GD4&EEDm~`rD(y9Lzwb)y= z8&x&w)K7nT&vg(4dvtq!#BJ+S1N7p*-A^>_7N*Ocm@aoBJaI84-0o}pb2<*UKvEMb z!1*u#W`AHYpMMGcgk`x0MAx~P&qP`i0Q@)MS?>HvGSxUpctVuT;7RHrA|fIpA|fIp zA|j#(ke0ujlGn^aCH*V$+KsA`(o$*pyD8etf>GBtKETE(>+}r zLn`LHonpw>Y{28%D>!%JZRQ7DrEc}TN9M^bGyXn*f!SIQ*58{=+GbZI*X>#TiRX_H^DF(}wTg_jItIpDLfgfpHtw+IK2Z_LB<5e< zs=y&)7kA>-`A5CI_ZFr#HvNphzi)e5qtPwF$!Q0#AL#R_7JI|CH}=zX)}t>yQVv>b ZizK|^tVs7fm Date: Wed, 26 Feb 2025 12:16:57 -0500 Subject: [PATCH 09/12] moon clips --- .../Magnum/magnum_speed_loader.rsi/base.png | Bin 252 -> 160 bytes .../Magnum/magnum_speed_loader.rsi/meta.json | 2 +- .../Pistol/pistol_speed_loader.rsi/base.png | Bin 302 -> 232 bytes .../Pistol/pistol_speed_loader.rsi/meta.json | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png index 3ae7bd7d4af4cfe18cb180459190b5c987da920a..68bbc6724562d173a4933d4cb4b5763746f31055 100644 GIT binary patch delta 92 zcmeyvxPWnj1SbbG0|SH0lCEPDoy|RrJzX3_EP9g@Bv_f5B_tg=_H+IDpb-5a`07euruLTc9xvp00i_>zopr02PECD*ylh delta 185 zcmZ3$_=jsgOTBLonXlXSB^NKa~M2b{an^DJ0&y$0HMA<=l}o! diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json index a94453eb74..aa7ed1f557 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, Base and Icon moon clips by icepicked on Discord.", "states": [ { "name": "base" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png index 4ba33eff44f80b9903a3dbae6e2c1d867945abb1..296e89865250a03a93c863e404c20078de2fdc5e 100644 GIT binary patch delta 204 zcmZ3-^n!7MO8t6I7srr@*5m{U*2M`TJxzfITy9ngDq#ydTi@2JTKcj9L0jnRw1qFM z3mz~q13`0hGxJHl1f{SbP0l+XkK D1XELZ delta 275 zcmV+u0qp+h0j>g&B!BfuL_t(|obA>j4ue1t1<=2}10)y(4g-RdppeL30D(ba5NHx4 zrb!i70Ewt*4Gw`JfkRNWqz$ICOG29L7{WsMFFQkkHBEyv>vC$k0w{n2D1ay+ij(y; zKolpdW!i@!NB|xV0KOlfC~ndSp%%EFvmIp-BtV{}Y#969x_?YN$UBf{DXZ%{0O0v} z0RUuXf;AtEyznGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r Z4L;0iQu7Nmn+yN|002ovPDHLkV1jA-Z?6CV diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json index 89bc20ad9a..bef923ed5b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi, base by icepicked on Discord.", "states": [ { "name": "base" From 7bd8104546ede72f9c3e8c3796c35f814b787dd5 Mon Sep 17 00:00:00 2001 From: icepick Date: Wed, 26 Feb 2025 12:17:38 -0500 Subject: [PATCH 10/12] bow and arrows --- .../Guns/Bow/bow.rsi/equipped-BACKPACK.png | Bin 472 -> 396 bytes .../Weapons/Guns/Bow/bow.rsi/inhand-left.png | Bin 588 -> 377 bytes .../Weapons/Guns/Bow/bow.rsi/inhand-right.png | Bin 584 -> 396 bytes .../Objects/Weapons/Guns/Bow/bow.rsi/meta.json | 2 +- .../Guns/Bow/bow.rsi/unwielded-arrow.png | Bin 354 -> 238 bytes .../Weapons/Guns/Bow/bow.rsi/unwielded.png | Bin 511 -> 464 bytes .../Weapons/Guns/Bow/bow.rsi/wielded-arrow.png | Bin 349 -> 234 bytes .../Guns/Bow/bow.rsi/wielded-inhand-left.png | Bin 415 -> 428 bytes .../Guns/Bow/bow.rsi/wielded-inhand-right.png | Bin 410 -> 451 bytes .../Weapons/Guns/Bow/bow.rsi/wielded.png | Bin 596 -> 534 bytes .../Guns/Projectiles/arrows.rsi/inhand-left.png | Bin 435 -> 270 bytes .../Projectiles/arrows.rsi/inhand-right.png | Bin 440 -> 285 bytes .../Guns/Projectiles/arrows.rsi/meta.json | 2 +- 13 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/equipped-BACKPACK.png index b09e803ed62607caf90f8985b9aa3f1267fcc572..9bedf3d87d63869f8c4cd20bdd3c85e8707bc1c0 100644 GIT binary patch delta 370 zcmV-&0ge9H1B?TZBYy!?Nklb;@5Je}c(pb1!35jz=$_1PoPx$l1W5CRCt{2nz2s9Kn#W*#Lko(*^nwR z+`!PhK(~0P#A6`!1(Jv0Nf^RQFy6-0fiW99k{M8i=z<;f;+*4ecGF*f>^q-x0FL8u zKt$5k@E=n&UU36sjM8V%PK+_%iz1@MXTW{~bl8GOCp!bI;(rEc3(&?5&=#PL8=x)V zQXnFI-68DySJCgTxq%@Bv8Xx8-l)}ez4%7x0f3&s8zB*HfVKc_+yHLiIF31Ws8MkP ziHNGIV#m)-*L4H{&@>ISZOhharUX(-kW$L`2R;xniW{IUKpQuJ8`$@KP918n4amC1 zT!{O}4vqn}Wq;^V!q+RuaU91f9YiE6d#?B_fQVGWZILV-w!Z_15(Xq3#2N7MnL~yi zYy+gDrcw}PfVH;|Frfrq-ua_+Q=D&mt6c=GG1-8nUzo^F2^S_fcnN3=D2n~YUNgkb z04t}zb3`R@dy`9s9^y5?S{bkn7>40b3+$bs5yS>qTQ~XY pmp^d~2ywU4sqhI)-vykt^9_w@W&3mC?H&LC002ovPDHLkV1iSr$OZra diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/inhand-left.png index 2ed02fb5a5fc1184b82509a16e734d9981a8cda1..edf24e341e71dff5efc1775db8f94fe5e9ebfdc7 100644 GIT binary patch delta 351 zcmV-l0igcO1o;AxBYy!vNkl5y^&YU(`# zN7xH+EN`)j6q1R6tQ}(Z|5~D9{E}FsSOfq7004kNE{Ba)Wufoh$J^A!t7^CqW|oVk zl#*8nUhA3$Ao3f6^_r@x9_yO&>H*%bmDv-pT+Gcw2yy3|s(-T3{d#p5!q7Vyv7w5H z$Z5CjZ2Z+?a@Xh9ovhPtJNQXxU$sax(Uekr=MkgP_7()%K5Zrn|ZunuzV;mn&UjUPCjAJ1L`DY>Yoem%M xiI4}Oob&aT+Kus`}kXX5D)#HupUb7lauIFfY>fL*lty?ccu%$;uim4=yyJ=eNN0|kNCl+a3 zNt-6o@LRfshnb`M-1gknVqr=QFD%%jLQ~aea%`Qu{D|`d#g^B~`_c}@&$S455@mK! zKfJ#Gw!yc5Uss;vx$D3C{DG(Hj(n4v_i{fkRP%|H{q?=j&GzkECr7QR3hdRgU5o3r zcb;z6oBF9?v$Npy# z+`%<`@m-FaA4PC~8+-8m{p0J8m$zFH@BI*N(lzA<0000008pPI&LwjNY2P<%yK4x$ zW1PAOQKz~+MQgRjTz1EJjDyD6H)wM`2C46vMb1EHUxeHN`WhUm4B7)k#%Y;9zh0+* z_J7-fXTLmCnC&}w4F5WL-|{Zv(=l?s_Hlm2K(@_M=yJF!m%w&7P?q%E@VB%%A?o;EscZ z7Q>-HMu9%AhJp}=mc>j8GNKF*S2QeTpOSj>QgUc0` z&w?M%vkrwaUgxXYTwlr-e7~7@|F)$Ea)af9h3Yst%9k16SAGBY@|1-Zo`)va{;TS& z^g86=utT`^dFGAlGwXG$JPyt6-Md9|C+qDQEpZI0ulIXioyQfoZie@pDaSwlF&5JB zuNSqJV0~#pr8F)p!{3)xvL4m^}J5lJfTPT5T1x_vBTkKYbhP8H=>*|8UQe5enn{z`V#|=kKMv@@tp%$+ v=grWRWt{W5noH$>@eFBDbP0l+XkK6VLbu diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json index 71e01e8b14..e2eeed1e54 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, equipped-BACKPACK and wielded sprites added by mirrorcult", + "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, equipped-BACKPACK and wielded sprites added by mirrorcult, Modified by icepicked on Discord.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded-arrow.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded-arrow.png index d1417b707fd3764718306168abe70e69f6e4296b..a75fe8a85cbe142964a849b656dd077d5b6239bd 100644 GIT binary patch delta 210 zcmV;@04@LG0`38jB!9I@L_t(oh3(Wo4uUWg$MI)L9UX|yU36f;1n>ym-fF@|T$;dX zdNGf{DZIeXMK(#ql)f1IJwQLNe^R1IQ%U z5M*OtW zk_V7*;S@dulO<3O#K1MOb>INSAhB=`1|(YIJSM6(BBdd0p4ep`P3x_$uwBB~EL zr}qu~CT|Arqd?aqe4Gd`&w!?UJL1rr=!#qt@q9|W7!&`zgXRh$-eD;QlqV92L?Ur4 Zz5#5)m^U#omU;jH002ovPDHLkV1g(3lw1G+ diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/unwielded.png index c5dc00243cff878e49e75148d5ef6515bfb6b431..a55763bd470021f28e578be897e07c794aba4cee 100644 GIT binary patch delta 439 zcmV;o0Z9J;1JDDIBYy#xNklcp2-4tC=pc3IbIAowuIc4+(WU<>B=7Eic{!2* zv;1>NcCuBku&FUdrc?p36i+gckk_WH4`om-CBBEfpSiQ!85>_Ek(Y hwX((HuX`4Mz5$BJ!23xw9Uhq~?;| zuh_-!&^F~=?vvcT_rA9QYt}!26yW?2xa|MiNAP+Fpvm9A<$u9-Fjp{30QJe=zPbkr z7+a7ffS2tElB)zR&tiD~h~robsIde^QNZvZk_HPX z0U{KhhKsRzo^u@tqb#Vu9h__dQENjGR)qyHK1_RE=V`T_R(VdPM{X#UEcwP`FLx?&NyfWC|bOB%h@$tl} z{vngOA<=|rlbs`S0AX**5CT7yvV&SUwePxzaN-G9rC%s@Pio<^ec;TL>edP80HzSm zZMiN)FXsXsh~5q+0s^aGb?v?oDTpQ)jpzs+^WAmau<^YD2#-m>$*?lX8KU>I;T)n> cYd@S$0dFPf_k_KrHvj+t07*qoM6N<$f=0F5LjV8( diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-arrow.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-arrow.png index 69419f9a7b9fa44277aff37a3b07a477f4f59b82..0334fa8624999a2a61370c8e9d1b24b038754b32 100644 GIT binary patch delta 206 zcmV;<05SjF0_p*fB!96vIOdZ724p34gmP$PX2LP1hu@nXru$$O)@h5q+-uLOrGLXq+GDn6| z4Yt;@)*5A5qN=K7o?e`Sxw$UbTFbt>(aW5IX{Mryh~;ZOPf%f~YS5K)&r;5YgA zfRPc>cj0j=+B@PL=#zg1#@IwJYa(9Gh#w}z%q;#oNdf?1E&TGN0X~i%kjaeY6W5KQ UAC()piU0rr07*qoM6N<$f^nvgX8-^I diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-left.png index 75a9329f7044185ddcba35677066c1d2c9c5559f..f39a28492c8b4edb04a48a2654a282c1571ef05f 100644 GIT binary patch delta 403 zcmV;E0c`%C1FQp(BYy#NNkl)iSirslf;FxAwxqD`u*zKMkd$Q|RZrQ4GCagh7qyE{CMs2iRSlh*NYBZ0PY>%VLy>Wks$LF`RPrOMQh4M6iz34lM zh=_=Yh=_=Yh<}KPs7p!U{}{u&(#GSb=%UfdaDX(tMLCB5GY2Ms>Y)jsn|NIpad-7q zSkX1ml*gYU34CqVU*3Q$%eq^T;$O6F@SO5kNg9QXJ=i?YDq7BCC8qrU(ouC9g;JbH x0NS4isB02GZ6+u8Px$SxH1eRCt{2+QDhVFcg5{r_up>(Fg^X z9(2eYPmt0vJc5oHp?mbuNpvf8i4IUuFLAIP*^X2NQusgc!GWju?5FsmCjtNf0001h zI%$QfrjoT(HKmj$G4uOY?n(oWg`8bxf%jgVb459vbK)yPEOV%xYSyfau?L;P5>6gBRowWH*0000000000 z0N_@H5KglOt$x=oo)6eE6dFQkR&0z>UY^Y4blO^bJI7+y+GMRgb!gwUKP$}53k-Q% z<|&pdpw)0gZr$A4<8hppJMYZ!Uo0)Kbq)Q>sqj@#sa19H0eg|_zWs%Ke|_myLj>c5 j&#z%JECB!j@L&7_BkI#Oks{w;00000NkvXXu0mjfaDlX! diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/wielded-inhand-right.png index 87451fed6ca2ff5fd2ff58cd605e3353acca5ead..04969d6d08927bb19bc1a8aa5ef3258120ff6180 100644 GIT binary patch delta 426 zcmV;b0agB*1H%K5BYy#kNkli(0}b-%L<%Kj`E!4}?wSTQh(A(zDJEqA-0R{x1@#?SzutvlLGLSb3Q@tBtqY@WOg>3>o8ec!<+p(}CVXU<_dzfoy9 z30)b_=Gr=a9QdM|r|9?l2Ps#_fiJ6f5{lkODAZ{+%Oj<;E6C^*tkV+_5z&A14ex0M UC1-Z^yZ`_I07*qoM6N<$f(bjz@&Et; delta 384 zcmV-`0e}9(1DXSnBYyw^b5ch_0Itp)=>Px$R7pfZRCt{2+P!VVFc5~}&p`%AqY(lq zNWsE$oB#zG!y~Zt2-zb=CQ%n4OJslmm&OWgf%>6L!w&F1fEwE(?~bIKqXYl|00000 z$;^Dpwd0#IjL+TO%tm9rOMMtZP}4NpjF9BR=T-`Hi0@C+G=B;q33l6{3&yJBzJ%$y?<&m_T89a^`&(y(C@$!=JHsaWLwLZ7G+rVHN{*zM*rT@-)9xz z=g|~G(D#0?x5K+T$sb}=*LAx8`p6D=>D)`l%vq>a%*?ma$&-7=OW7*_e+mEq00000 z0002DEXH`TJ9!GD-Qjb%yT=%d1=)3-UY<55_Z6zDx}COIRaJf*P+OPp7pD6BS1-aa z@!p!t6{VEidC9@2&S6{2FP(gh(RUMF;fr>v&1^KmomBMP&*|qox9F=b5*$zX{2EU# eOaK4?{1?9rvdmI}9)o}Y0000dzKI5#cNmHB^()?P3G(&;fK9*&Edl@#35*uIIy=zR z?5#<{sYul%(tjD_K3~B5>kFchu(IV=s_Fm{**0WmX>KGi`cX?Kv*plT;*+9Q9wul<`dFhLB3qZ($p}zJKG)O zTw!r?hy}7|f%bnoR>ZIE{=QyJtn9j8@9*&mf{@pPw#%*j00000NkvXXu0mjftIF)h delta 572 zcmV-C0>k~51k?nOBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0qIFZK~z{r?Uubu12Gi9Uy8j+6v4qk3MxWJ3xb_>yj%Pm9Hf)0 z;OL;MQ~#0PBsy0R>aJC(4sK$hiPH}N4xXDwQy(ZKKi9 zuAej#0wzciihuXDFWFYBmB;`J*-a5mgMgU^wb=*Yrx>CeW3+bIDRpF(ogK!4bu3pf z4paKoG0_z0xZu2S3lOyD08T72VUz*Jm~n^O*t~=iFA*ZkOVE#v@M#80D%&-C;^Wcbbm$=^?E%lRdN#`Xkk9N`a^9b zv0;IOhaDb zIlu$&n#`quLznw?|U(v$SX%7w~ zdWluvq&25b;V9?`mKRaAT7~mtFYy|ms{la~q6)t6=RV$F1K<;81NP6Fy}-Tz0000< KMNUMnLSTaIxd5gB diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/inhand-left.png index 668bed84d11e03abf3605f09f37d0faca9f17d20..d31183da39afa26bc480c6a2d40af30549cab7c5 100644 GIT binary patch delta 242 zcmV#wmRcp7sWVG`H?+?AbuBl@1 zzO17U000000002D=3K~ndz@@9uv?}k`fimt_fO shsv@9T;$e^)crpKO5jca003Wl0afZrYg^?fc>n+a07*qoM6N<$f?MNeZU6uP delta 409 zcmeBU+RQvbrJl3EBeIx*f$sE|}kBNpsuDJ``l9x=>&OQ8sr+^{2-0j5w_{HyzRI7L}%|EZ;&g9U?(jddh zU@62|yH_C8n6b+Z$?h3@z_u6VZiNSkc4*@Nw(7K!&4xGVgZd32Sr-2tp!ISgFkhjf2-S+E+a41>v|;esbX9BUjfE` zkB+^QGRhhIdyddL_t(|obB2%3WG2d#__Z?w-9m^mu!x4aY)F~3epQWcI@of zJ9H>W*G}o=)`DoXM*qLv$Cvj6Ax|Ly0000000ywuhoUILzjMTJ9P`lQc8Q%M9a_mv zOnwv&kM)Z>sM45_;^eiGp)_Vt?w?@_I_V+C~g*!dF_!;GIiu z`aSPll5Z~n00000008WhwLVzuXTQ}w#VXW?t?Tn4M!l|kiue5*qtr6AlC%6Xki^~o z+#y%pgr&l*vI$FvT4fV7*a9k?JdK+W&@FihxS4IlUK%7 z@#u$MeA$-aHpGZ#CdD;Q7yUv-bVpnd|R`l%v_Jp9^=9pdC|Hn)bG&CeW}ox8eCdb(3_#%N>gTe~DWM4fPl>e? diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json index f5f474b960..ea93e24c5b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult", + "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult, Modified again by icepicked on Discord", "size": { "x": 32, "y": 32 From c1e321ce9dca2a5f1f1a7b9a5ea5662ccfcc5149 Mon Sep 17 00:00:00 2001 From: icepick Date: Wed, 26 Feb 2025 12:18:09 -0500 Subject: [PATCH 11/12] non-fire axe --- .../Melee/fireaxe.rsi/equipped-BACKPACK.png | Bin 494 -> 660 bytes .../Objects/Weapons/Melee/fireaxe.rsi/icon.png | Bin 331 -> 486 bytes .../Weapons/Melee/fireaxe.rsi/inhand-left.png | Bin 540 -> 476 bytes .../Weapons/Melee/fireaxe.rsi/inhand-right.png | Bin 529 -> 496 bytes .../Objects/Weapons/Melee/fireaxe.rsi/meta.json | 2 +- .../Melee/fireaxe.rsi/wielded-inhand-left.png | Bin 906 -> 484 bytes .../Melee/fireaxe.rsi/wielded-inhand-right.png | Bin 913 -> 505 bytes 7 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png index 2d245210084be0d3621bf923bcbd05dce9cce5b2..72e097322da8ed4714d55e342484dd01d1b3ffae 100644 GIT binary patch delta 648 zcmV;30(brH1C#}j7=H)`00020X>r~F00LV{L_t(|ob8&wZqrZ{#y>+75`|bT1IhzL zyg^O#o1HxeEGNwW;<#rRqp6_4J zEZJB_8qjUlVp(=u$34r=Wnkwr=xjS2&?_DQlpYG=w(5L3VfZ=wh59E~J6;%q4d3s4 zQ!XCRTmf#YK7SVySMdPw^z}#N3q|A$MeJ?9(u$?rfMD@2kG{lK{Ml)r13>Y`oB1`J zEvVFhZnMUx6Nc%8!8z!}Uc4ZfTbv29NQ)09igVcme-6A4pHILTn_n9Y2DrTZfoE4I z@cbKW9rvU(t;yWnZdAGF-vEGgA`=Y9{+-3Yd;iuF`hR3&Ds6!ziU)xH^~`dfSFO>= z!)WCFRs4U&?#?0K-8o#@PjZ4F2!bF8f*=TjAP9mWQqC%P0;1B88jH*_4XWOR(Erpc zr7VB)I0yH;m)L*!`!tAYmC9tuC{a5^?xNeQ@ouxmRcC|793rX$bZ}dBo-Y&usLv^l zG(Z#|r+-aGOsE09@x1naNn%9waL&Dtmc(+}zysf`v@gK{)^b00DGTPE!Ct=GbNc003=zR9JLGWpiV4X>fFD zZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDSycTa*U0*I5Sc+(=$pS zoZ^zil2jm5DJ`=oHL)VqK#7YpC9|j)q>qa;ttc@!6~s2=QdV&Fa{-$S0FuZXA}Mde zG5`Po{7FPXR7i>KlsyiDKoEro`B|kRo7GzbcoD566SfGDVXek^3)&v>Sq`YK=fUP`3Zxs*%0iRhEMRjmYKSn1R} zTpCk#xsUcKe6|+A(w{WxD;XyU&xLV6^u>v>02AI8YFPw7N|quZCxQa|-cB0i2+052 z+haeF25=5E@U|@bbfX^%m^lOVM^N<$(B%wpZI1fFEWp4Rz?^Wvwi30Fhv;YpepxTY WRv-26wY1Iv0000YWU}J$tU|`~p1RHO`2vdd*1gWS?yW|x*bcj%9(&pc_a~Y6>9Vq&8dR)1$Cx_!++kI_M3WgLljU>Y%rM2tLp$rDJP(V!~Mj(YZcEZ=~7fq=651-Lx_mx^z3-%!HXiStWt<@ z9YNWXb0MsK)v_Y2epa&}tOBwiQvZfoGVh97??9MZ#ZWUv?`4hCI*}V7M7%YQTmjPv z

`B{EOAh9S}tT6r~eGybB-=VSNi`CAuBayc-~j=nj&<`DOm!JOe{U%;P$_`QiWo N002ovPDHLkV1n2P-Dm&+ delta 315 zcmaFHe41&3WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g>fKP~P zIt$AoHnsp0zD0``9ca}3|NnnfR8(iQoQ0uQT6Cbln=Me`lb2r8ffP?kkY6xR0Sqt* z-9L8@D9%~n5n0T@z;_sg8IRZJuSfxk&hT_`46*QEdM;Avhyn*ofbgan1^<5^Q`<2$ zAuH<__sj6C2mODTnq2r*O9iJ*`FLnk;V-5=cFZr;AH1!d@H;fDmciq9uCWW#7Wqr- zm#eZkEIBChiG_vDJ3;?ZK?_62T!WrRtUfAx6-BN%xXhi%s8Sf)E5Uetwv z#HO$t3k3OA9Ab9ep};NgP}5k=XL0WTf}i3B_OY+kmCSGXZU8!x!PC{xWt~$(695u^ BdKCZw diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png index ce78cfc2760232d975d225628ac66f7eccedde3a..a78c04ed1d8f4b325470d7039ebbb336ce47dce8 100644 GIT binary patch delta 451 zcmV;!0X+Vk1l$9VBYy#-NkldGz$?d4SJJ761`3ARPZeVQ{${gvhQ-0ZA*3c&0Y zDa9|74Z?Y*iY?g!icR*Ea tvj|6Z^lXzwIGPy%9Pq|SL_|af=@)!D|BDb|a?=0+002ovPDHLkV1jz;(b@n2 delta 515 zcmV+e0{s2l1DphqBYyw{b3#c}2nYxWd!AIx;?p@oqWkI5e<&WX+yD`gX{)t(pJW-1uS)3Xa&TV*>kCUnL~9KINYhkZp6yBPWFG)G{h~Urp2|`25CDF4F`D8>;|Y5Gfwy&ff0F6-2Wm8)SdH~v zJP{EQ5fKp)5z!9v_J5nN%s^0CguJr@KC%cK>2K>Og6pDvwc|I|;CI;spIHQN8_>~Z zIld|($+E>~(^hNIQT{34Sp=u<@G53;&%<|gXEQauzI+w{NRs4RM|mBkloAoqU+>d2 zRhPqesh#Yjqs!u&MacaYZ8qw1QGA^jKW~?R%MsY{l|}G!0+x#h+zMYc$JS;MHk}P% z7Ga4^8$SG;+ZWp`!gfDO{*p}=;oqD9z%7eFL_|cp=M#o*$ui}-JD&gm002ovPDHLk FV1lZ==k)*p diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png index 910dda1a14040d5010e589e399b516084f4040f0..29c506c5475773e9403d9454227d52393a431d74 100644 GIT binary patch delta 471 zcmV;|0Vw{F1n>ipBYy$6Nkl8GM%N(PNn-0EXtXgFP^h=CFo6Sj z1P`Ezg|`3;ER2md9KskIlBEMALa`QRHmicNyTiw<&#xrRW}bIvrr3EwL_|bHL?ouC z$5ycDIi$6cbf5`;*L-lg2)QJKO!!`}&v5t-!0|~X(X$pU_J5=gcMAc)`SooW9^mb5 zfbVyx)=r%&M64}f!gmKF%9VpKsH@=tR;T@AG<>T)%)w`Hz}fH+qX6(Ve52kBUS3`S zoDCmKX~%Q=v`@q=dzbx{Vd5cZ2D<#_&D?)0!q~k#?!a?ZX~zq;@@oLxKlguRnYaS7 z5FVh_9_G4((SM?+AtE9oA|fIpA|hF3t7l+dy$6Z=1IDq{GhoKgqX^bMd)w+6Xw;hl zfak5Vxmf^UZ@)CN&+}FuY@=u3>hdNi7Pr~h$cMjq-Z~d&N5J??4I5H#0b4x-)!J#! z_dDU0J3zT|5MFA`>Yg%H0VeefByE_87QqxEdb2Z&B2c7W0pEKDe7}>bVZs!__dDTv zu(a1(^S(J=iks>z^bABLYLZ%tH(|-t`!q{E15vS7K-R*Gh=|Dl_5mTz2;7LX;hg{g N002ovPDHLkV1hjX;B^21 delta 504 zcmVd0l)Raz#w5VP?%) z|G$$f&N%Pw>@Mtk01*)p5z$^!x&u0%C(-AtFw`EO2p!LpyMJ_AmXqPCl*wQ}m4fR@ zFiHU6eiF13(De&aYUL5kW{dBp%_c;|$s~9>KkoVk0f5KRJFde}P1|h&fFKB9w} uJp-$>nxuf_l+7brJ0NMn6A=;7e)|MSgwDI}y-GR&0000b|!>o03sqHA|fIp zBKlv1xp;o+OZ9ww(iY+E`4m-GQ9X2;6$t>}KSHk`Unhah_J2DSV{*l~-bYCj6LprV zX{R7VHRuMsf6N1c_FBC&i+1gC#Uzy`Chl4GS~s9ST8Qa%D$TWhSbww-?K&d&xMGrB zIbF;$vsx3g&&krW^`h5%kbC9*&;jG|7{lQkF0U?f^Pg~YeJdM{LwKGS`t~)Sq1!#z zwFni^Y8?Rpe1AXq6UkfgifV$XR4M}i27?z}lQ08Z2j#JNWgBZEA|fIpA|fIpA|l!p zbIQ6cc?)qjs-ftno3QS@u^V7cRb6B8b+M$RaNh5fKq3^b3eh>aXr@C@%m2002ovPDHLkV1nu# B(V+kU delta 884 zcmV-)1B?9R1BwTbBYyx1a7bBm000ie000ie0hKEb8vpVN2|lDn5%dxny=c}SP*e~?_)f&ZlTycir5-t6vVS&bA}QedW54C%8aI<=85OI` z(Bt{3n~cs;Hmue$pJe=VT09dI7SDvaq>apLlpc>0C(5jtoSs3r*s7a5DWKzW7i&6v z2#(zih}o(skrhqvUgB3@KRegfs=ox{ zJK2%pr+@0_UP;2j;{P||`LpKH`I_$a^+Q`ck@71*2bC8J36h|^mOL*03WIZm0C0{F z0L~Etz&SzyI7bKo=LiAd93cRlBLskRgaB}k5MXuyb&xkkqsVs)Jy&r}37{mlQ~TUz z&ua@kmvK#h1E|fsDGlF!;pa6ef^-Wanx$X z3vEdPG|k3^34OV=jSY^6Og#~@%(zJo)Ri+@kj0KIg&_gdHU2R(trqxs^wy&1{A*=0 zK^xadtKLlE2@Kx@j6N%nNfOzJnA;0000< KMNUMnLSTYIxR)9L diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png index 65a944239455a6ea8e2b15548362fe4421f1efce..873923fc78c60eba91ef6e7bc591433b95a2d265 100644 GIT binary patch delta 480 zcmV<60U!R62l)e#BYy$FNklekkkj9;yHGf4jt)Q2PnlEw>J=taj{-AQ8j z(O+0&j}HceS>5o^1iDWPCm)1go-LN^%qmxOE_Z}XCgVBwIU1r=I`iaKt9N=ob>OL2 zN}X6F=i-5w{{^ga#dFgH zATB6OEfEnB5fKp)5fKp)Z5L;!cbjvQaZW<&CdX-&+{iYdXr{G0II0eB(EL?$#qRJb z!BXhWZ4JF%U!Px;B5!ZG`~J@SFu8#z=J%jMA-ku6-&ra~VeN&%R5b!|~B-f!XS=7zcimOX6HY(CDtkFv8XEqoKXL_|bHf7TCi W=MBzIBRI$a0000gW>y delta 891 zcmey#Jdu5Zay%hl&pBWAUhmH~nK{ZV4aF@C z1$_bx=LDG!SUNFSxN|T(=U{vwbD70vYt+ei8CMQz^@%Ry+>oBOFmlp~iwOn~pUwLG zsiQWEZBgLnX{qxXn5xYTOqc5G*)VQ4aCO*w*s*9+*b5%y}HnO-g$29Ik!x zQ03KcvrF?8wWmA${9#e1^;pZl)+d^2?)PJx9c6agF0q`xtfA3!!IwiP7JchJ@4g{! z)=T!ZU!j_d7Z$9kSDb&ZeM9+IsS}%D`rAlciP6Z_U#2c8HbvuO`P4$41@*r*;%D!O z4?gg;{nj?2EyAH)VgIMbS@((DF!)r=dRl-bRRRBldp7@{hRZxz{U&x26Fpf zxpZImK4)eoRi$t6Ma^P&MbP7Fq3Zhj)oW#=W-mXpZF2KmN49`YctiVcJ1+|I-_Tw$BurHf#FM zhD{$@mfnAl`VBMvQJN$o_P0(O4IsW11_yUz4aom)Zf;MICRgMToiYg>BW4tF7u~J z55v3Fz9}_W$Nt;-ZQlF%z__3$-Q>g&{=Le2)4Ok`E>NB0^!a+!agSA%rQ8etZ&)Fv zrxIGSv{j{U^T+2}`ZjVo1-k`1U6Mo-#V+tCoWE8hv;TR#ip|_Tnz2k#o?8P>KPr5l z`B?hjTA6=KvR{0UbwB;b^pEi2c`T9FzkNN?f3)PK_R-ZH?up1r___YJH`zP-R{nEi O00K`}KbLh*2~7azC7{Is From 5871f2f9ef284a25fca5c7af254d0e1f63615767 Mon Sep 17 00:00:00 2001 From: icepick Date: Wed, 26 Feb 2025 12:27:40 -0500 Subject: [PATCH 12/12] moon clip fix --- .../Textures/Objects/Fun/caps.rsi/base.png | Bin 302 -> 232 bytes .../Textures/Objects/Fun/caps.rsi/icon.png | Bin 554 -> 494 bytes .../Magnum/magnum_speed_loader.rsi/base.png | Bin 160 -> 153 bytes .../Magnum/magnum_speed_loader.rsi/icon.png | Bin 257 -> 190 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Fun/caps.rsi/base.png b/Resources/Textures/Objects/Fun/caps.rsi/base.png index 4ba33eff44f80b9903a3dbae6e2c1d867945abb1..296e89865250a03a93c863e404c20078de2fdc5e 100644 GIT binary patch delta 204 zcmZ3-^n!7MO8t6I7srr@*5m{U*2M`TJxzfITy9ngDq#ydTi@2JTKcj9L0jnRw1qFM z3mz~q13`0hGxJHl1f{SbP0l+XkK D1XELZ delta 275 zcmV+u0qp+h0j>g&B!BfuL_t(|obA>j4ue1t1<=2}10)y(4g-RdppeL30D(ba5NHx4 zrb!i70Ewt*4Gw`JfkRNWqz$ICOG29L7{WsMFFQkkHBEyv>vC$k0w{n2D1ay+ij(y; zKolpdW!i@!NB|xV0KOlfC~ndSp%%EFvmIp-BtV{}Y#969x_?YN$UBf{DXZ%{0O0v} z0RUuXf;AtEyznGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r Z4L;0iQu7Nmn+yN|002ovPDHLkV1jA-Z?6CV diff --git a/Resources/Textures/Objects/Fun/caps.rsi/icon.png b/Resources/Textures/Objects/Fun/caps.rsi/icon.png index 6f711170be92fc281d43d31b6c80e80875a05df2..7f157c4b0d6d703aa6e165341ab69f37328a5ab8 100644 GIT binary patch delta 468 zcmV;_0W1Eh1nvWnB!9I@L_t(oh3%EGOB+!f$3G{TTM;5uA(0G95Cu&kAwynMvCbxmY{7 zSUdgG$HL1D&jR&ufaLuXv9CR{jejn1vy&E^ALp2}Z%N)ikvMbk+Jv&e%}!d3&rboc z^m{;t!)p^N5=sJ%;a7(TRLyIeo2cVfqV+4*u9IwN}l17ZmQ-rjZG|a0)V}C z$;0X(i8H4z(SPzwb1iUmXlj5s&*)&z(A>m?*}=kNRffAo=?F5JtY#Pm&Uj~ zK&1xz=`k5@uU&GwG5GF1qjV81f71aljDm=SqI6y4Ne;b)&&+m9nT5xy41ez;a(x7K ze%Z%FLQ&1KN+KTrLZz1fBfL_B^_-)X%Vk&dl#akK3QckykB@4WRU(+x(Z9cjPvnY9 ztttsbLQyQMB%gzyI<@@I9|W_yr|`c*uB)~TQzjuS&&h*COTa84qAdpj zqDw+hRDh!3;@L}ZF_6P-ejSEe4s%RE-vPL}4h{}@9Y9nROq;e0Z29{2D^bKjX=D9c zb(D}mwwxHij8Dy#8+ZTTx%Hv}7XQD#{bM+J@*snZjDG?=1h{#*8P2}qWZ?Pu7OUk8 z7Azn?1VBE7Sq=+&QAshdBaqVtNDLGbsgMdM61m#^jC_6hcgm-_bwOc!`kS*lW+@+!R$bW q%(O(t9S8|L^{+~N5)J_H8!nSsFMfP=tYH8E002ovPDHLkU;%<>EH-@r delta 143 zcmbQqxPWnjWIZzj1B1(wu46z-G{7gs6-cY9s)mM!W@Tk@b939<+XF?IjTbZkDfW^e zzhH*{V6e1)*>9kbv8Rh;h(&L5f&?owvxKB0$9}FqpBzM4QXJJD1Ts%Mmd@!YtWnPV mupmL@n9!b2iyLwn7y?}w)bB7&e+$&kz~SlY=d#Wzp$Pz}sVqYP diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon.png index 614847a56d258e4a104c7c8d343e6ad9eb2457bd..e80686553ffac81b74e316bb096d2544830b4581 100644 GIT binary patch delta 110 zcmV-!0FnQJ0=@x|7zqdi0000)q>9FoLql3cNklgy$Vk{1FcVfJGQl}os;VkfoEM{Qf76xHPhFNnYCMr5t zr+K)DB|JcSgM&kOJWrl&wV~8 a28OgOnQse4Rx1MC!QkoY=d#Wzp$P!txi#Ye