From 87a868459fa0ce24c1241fb5ac420b3f5bbfc627 Mon Sep 17 00:00:00 2001 From: GaussiArson <193122004+GaussiArson@users.noreply.github.com> Date: Sat, 8 Feb 2025 03:15:00 -0500 Subject: [PATCH] Drozd Colors for Kammerer (#34930) * wooden grip on antique laser, changes description to match. * darker grip * update meta.json * redesigned shape similar to ps3moira, edited mag to match, changed lights colors to match each other * fixing an only SLIGHTLY catastrophic fuckup with an experimental inhand sprite that I didn't mean to save and sleepily added to the previous commit * I DID IT AGAIN * red kammerer bottom text * killed the cap laser things (hopefully) --------- Co-authored-by: gaussiarson-admin --- .../Guns/Shotguns/pump.rsi/bolt-open.png | Bin 301 -> 323 bytes .../Shotguns/pump.rsi/equipped-BACKPACK.png | Bin 492 -> 454 bytes .../Shotguns/pump.rsi/equipped-SUITSTORAGE.png | Bin 492 -> 454 bytes .../Weapons/Guns/Shotguns/pump.rsi/icon.png | Bin 317 -> 301 bytes .../Weapons/Guns/Shotguns/pump.rsi/meta.json | 2 +- .../pump_inhands_64x.rsi/inhand-left.png | Bin 584 -> 538 bytes .../pump_inhands_64x.rsi/inhand-right.png | Bin 595 -> 551 bytes .../Shotguns/pump_inhands_64x.rsi/meta.json | 2 +- .../wielded-inhand-left.png | Bin 902 -> 849 bytes .../wielded-inhand-right.png | Bin 929 -> 875 bytes 10 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png index 233850622eb3237b506eb3a8a2bff0b64910ba92..b1f87641c12ccb84b148ed7bac2c9db1cbd64ece 100644 GIT binary patch delta 246 zcmZ3>beL&^A!Fb~Cyn|B28KBd3^5EKV5BVWYp#;!ZCD-a02Tldi3|+Z3=B15VoT-a z1!u7y0t!i&1o;L3M*s!{6U<_Fznc$KR_W>D7-G@;cEU!!!wNjC=LJg^T5tRR-#L5o z1sAVXe6dzfdRnp`%xy7z%YEliJl6@$ry3hrl$v}VZMk5Qxp8XLYmV2+%NNXBvCET_ z;h=7}=++~5pRvyP8n}3=z`V-D*!zDM+}=DpVQ;q1x_Y0qTg&QA+t1(34A}mm`va4K WzOKxryAF*Y4|uxzxvXmdKI;Vst0P9{~Hvj+t diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png index 302e6d14b5d37c97e510a1fe1d56e249ab33df90..7ae924a3bab3a858e22727b327b546f5615c3e35 100644 GIT binary patch delta 366 zcmaFEe2jU5A*1C)CzJZ6^77UU3^ih6A&hrB85kIZOM?7@|Dys1AlI?Vw1k0yQO487 zF(jh(?bWw@hZJ~N1B6?;oHy3~Zx@ZZ(iCE4E}Z;e`s}^xvJaER!~5;v0BKk78Os_&rjXQpu>1GB_| z&+4nzhsPzIWDMeReYl>{aWcPA0oOwBC6gwz+|fJRSMdAx7RJTwH~z*jKl~$S!7j=0 z!rVZdVYiAIdx$eb#}Eaj?;r{mO#XKfO0oH&Prl7!o|MO)N%vh}+Z+K^x z$@AT{0Rt0$$ht7yppNw&L|hKZZBeAL0aSnG(_xeu)I!JN&jyn#b0@g=vzn zR*%Di-zE%_zZ4!km*AUmj!CRy!sdqJ#w?4H(&Y`$>f{=KtdQ30*D+`~U;p)L6J{&l^(7=4h%~MPgg&ebxsLQ05njtq5uE@ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png index 302e6d14b5d37c97e510a1fe1d56e249ab33df90..4a54d0cd899cdeecacf1a8a6684d2ffacf69001c 100644 GIT binary patch delta 366 zcmaFEe2jU5A*1C)CzE<>28J3jv8D3z2PR!hVqjnpE(!7r{*MY6fLzBa(-H;-Mj1~R z$B>BDw^!ft9a7+74G?bWa?Y&%-!2++r76V9TsZl`^x1pWWgjMshxgrOFk>#L6tZlX ze)N!S5&JZ*iiJ!HQEE$Scwev@Kj&6ZTK0Tzyj&#sE&a2P{Y3Nk|6DHBQ(7(Kp2eF_zT?~# zESvwEaj?;r{mO#XKfO0oH&Prl7!o|MO)N%vh}+Z+K^x z$@AT{0Rt0$$ht7yppNw&L|hKZZBeAL0aSnG(_xeu)I!JN&jyn#b0@g=vzn zR*%Di-zE%_zZ4!km*AUmj!CRy!sdqJ#w?4H(&Y`$>f{=KtdQ30*D+`~U;p)L6J{&l^(7=4h%~MPgg&ebxsLQ05njtq5uE@ 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 161c387047d794373475771c83cd25dd5be81459..018e3523163d14f310e4e42d42783e85e82850ba 100644 GIT binary patch delta 215 zcmdnXw3catA*207C&T(g1_o;eh8i)krSkG;)YTczFnHaYG>L(ML9`^uFZe$SV1V$Z zyuA?)R8Z~d;uvDl`*wmO-(dp|mgy(*E_28I_@B(ZB{XPhApg!M6Bti#li-woAz#3` zTts2E)-|SO4lWAvkIWorX5_5>-gmop+CT4zj0NgTW^Z9=IMNjDHZP-d_tmu>*U}a{ zeNpZ4sN38A{+w#hL61NG3^%#yR;Kg)-gw3lgup&(1Tqpu?a!^VE@KZ&di3=FyxjSTCX1OLbZ+59Cze!>4y0K=6#GZq4+ zI14-?iy0WWg+Z8+Vb&Z8pkSS+i(`m||Jw`Re1{cySS}Ru{AKv|xBvFWVAGW?QmNNn z=Q&77urSp<;9B!fm!VQz{(xOWs|(8;?Q>!~*q#Sut=(}~K4|`IChy!Up}!|MF|^2T zycHE<<@7rFh|b5Xv#Ftl5n(yszRGz=x?Z?ZQN*?}ecnUOKR3LW*A>0uV)-tfsAKd) UqG{zbpi>w;UHx3vIVCg!01^UV6951J 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 3e793381d0..87bbbc52f0 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 https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy, colors edited by GaussiArson", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png index 9276fc552153534f83c438037eb125de3c367571..156ed5ceddeda28e8eb05ab0a662760871a469f8 100644 GIT binary patch delta 449 zcmX@XGK*z`A*1d@C)Iju28Kiih8i)krSkHovv|}Q7#R3Vg8YL2!vO<`WxQ*{0tN=g z22U5qkcv5PZyn4#tRTP=@Zgb2+Ry*zdsj~J4!se1$fV1vn)jT|aTcA8FaJIBV&YI} zV1N=I3LB=V%Rl?^*JZs%CD(~oo*B>Ab0jg;>(@I9Fip9$%6Q4P1qw_rel9nD*2Bfr zpnZSOAMXT1Mm~*p#-FhX?hXvhm(I>@IDhKrf%n|9Gxt6ClYcPJ!HVf;>;~xv`V96g zvl-9c<1zUDe}BvaJUII2=AT67JMY!s zx1D^O_K>OJp19TmhP~!K43o~YOvyR$<|*T^Z;U*P885u;W^LG>FZ7_QmMLCd+oGZ6 my`0Q}e|c7MobYh7VbEJs^J%3=i2^WU7(8A5T-G@yGywqB5XTt+ delta 512 zcmbQma)M=op&(1Tqpu?a!^VE@KZ&di3=E1Bja2K?663{yZ0?dEzu^CHz~JT2_z5V? zS>O>_%)r2R5QG_bOw4}Ez`!`u)5S5QBJS<2+j%VpJS-RP80h~0e^7Pm?|@DfkOo_v}5)kn#DD#^k+<3>Wu&kdfwA zV7R>JgM{?{zikZm`xtKjkX2&)@HQ{)vwDiuhCj6&8|H6$lh(<~uvdR!1Jjp#E=&`C zO>CINJ7aHQ!@imy1=9=|cGb8tK6q-)QDAS^*w1g+(6V06kRj{83(2@WE diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png index 56c4aff8745ce62428b7f1663804ede483f14d8f..a12b37663215a07c5570939cbe9afe13cdd49f56 100644 GIT binary patch delta 461 zcmcc2vYcgtA*1d@C)Iju28Kiih8i)krSkIn5qx(T7#R3Vg8YL2!vO<`WxQ*{0tN=g zUQZXtkcv5PZygkBGT>pkaDY{{<^TVf#636FmRw$Eaqio?%4t$olc#=trphAVz`zJ4 zK14Ije89TAfBqlF36e4O(*zjAMZR_$H;7KD|H^$}8#C+XH@8I{8k;uni(?Eko$_Es zzUyBv`GC!=iZjGlUs-RaG%>Zteumsr#xD#42RFyv&pgV|7<|84yeFUip7(Lq8+F5v%A)X~;2V*?L znpNh^k66AYZ%>+B%P3yoz`*p6`NFg&2ZmX0bsg>(R2t?qiZQZWnB>^N5EUfAxFEUg z_JpPaMk!xu;iep}Lvv-@AD=rTt}e`Q@WZa+l4_1!47Y4|eO2PNJdpWfZrpdKd#jaC z8L}~OTrpvEnHO>JDPM=p0><61pO^fZJE7@_qoA|fA0u^9vHa6a1&q5@EEuGW&fH}$ zX?C@}EH1?8TKCy}(Vg9_91OZl911|U0f`3joWC{Og12(I10#vS)78&qol`;+0C73I A_W%F@ delta 523 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 QYXATM07*qoM6N<$g6p`Y$N&HU delta 827 zcmV-B1H}C62B8O#Fw#`0lMw8-w zt=($e>v*cD^KnK|`_+uK{XX06R1ul4Z5F!ZC*e<(g^LbhXn$PDN=H_$oc3e;Bu@WJx>b(&&$u*@_fEt0aTL_0v(ee0u6t7e~dBysqNQOVHo-_ z3|F?lH_zoOZ7=6n--^^2ZHbk%BAx3{NW;#1NQ=`#PrBZn`)?_j%Iojgo^Y6wAPTM;=>8+pd)zww0 z@s<8I9X90;K7N15&X2mog?sMr@B6#EJ6W6T3~r3cwwOO{??{qPdf&6}m-#l7A)o(I zcNlzX$zQ0ocD_=%IhVcy44l*)3|F@2AHJk)GTJq#;UGPhzT8Lea`|7*Kb}f<{E%-x zr{TbPX}kHBUI3|hntZlu^656{#u#s{eX_!PGCumh7$hsnj^E$I&x@zYYA|rC-{^~P z569cecPlq()gFEaFUJbf^Ry6tb<6p`W-OCI0}~fT{0EE}Ul11;rNaOK002ovPDHLk FV1fcAwATOt -- 2.51.2