From 03bab30fc692f8b00bc44622105af4bd5091a12b Mon Sep 17 00:00:00 2001 From: GaussiArson <193122004+GaussiArson@users.noreply.github.com> Date: Sun, 9 Feb 2025 21:33:55 -0500 Subject: [PATCH] Wooden Grip for Antique Laser Pistol (#34886) * 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 --------- Co-authored-by: gaussiarson-admin --- .../Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Guns/Battery/antiquelasergun.rsi/base.png | Bin 1035 -> 1020 bytes .../Guns/Battery/antiquelasergun.rsi/icon.png | Bin 1040 -> 1043 bytes .../antiquelasergun.rsi/inhand-left.png | Bin 655 -> 480 bytes .../antiquelasergun.rsi/mag-unshaded-1.png | Bin 168 -> 173 bytes .../antiquelasergun.rsi/mag-unshaded-2.png | Bin 179 -> 185 bytes .../antiquelasergun.rsi/mag-unshaded-3.png | Bin 177 -> 187 bytes .../antiquelasergun.rsi/mag-unshaded-4.png | Bin 196 -> 205 bytes .../Battery/antiquelasergun.rsi/meta.json | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 28cfe6b1a9..c51aef5fe8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -550,7 +550,7 @@ name: antique laser pistol parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband] id: WeaponAntiqueLaser - description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. + description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with a mahogany grip and chrome filigree. The object menaces with spikes of energy. On the item is an image of a captain and a clown. The clown is dead. The captain is striking a heroic pose. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png index 003858cf9d9011a7a0c5c407ff724bc8135b9424..d3b86df95e71752351c7a55e5a6ff73528f66c3f 100644 GIT binary patch delta 999 zcmVb_-BYyw^b5ch_0Itp)=>Px&wn;=mR9J=Wmd{TkWf;dlV>|p9ft4S% ztze?!tb@ckp~fY>5DspH8sotOky{TNHJYB}ApQg1+(eU2JQ)urD{dghUnk0j>?S6r z##nYzDG8(%idi}qW|-F3Lz$t4Y18$x7rvKy^SsZz-|u{%_kVfcfeT#V0uLEdvk6sI zg*!G3qiLQW#>U4)<+#!iYqmzP8F4fk^!-McQyz3$wjgrsjQB_sci;xx;7O-twEH5tu(ACxTKxFNrqoV_W zQmNG7LeREt5q}DW*t<0TzZTA{eBM@GEEe(nTHB;Azmf39PfxziouwOI z{La!1?^z!Muq=y0p}_F)Fp8o8@QAyRt{+6!e`==Nl>LohV3qZbTvQsqKx?hn71_ng1t4C6`=NWru1jlhiC=^1|G|vea zu1oXt^M6Dl5icIJZ5x`Lh~;vbAfR6!A$@P#69K1fRk8lzk6-Wd?2}=N#i9fVP1AhK zx42j&yl^e{>-$_T2OycI3DmWrABJRGT)i^ZV0}Fbg#w0QuyxeMVKu^G4CAkLn4t707pPi2-N3l@sp|xfc^b_;_*12-MUR@f0S@I%=Gkh1EGsR zARtMSgyT5Kvg|t0TmV2k9&a@bKsX$xvtYmW@9@go3sg^t1A%~4tyaCfYPE{H@#@iP z4+!AgfpQk^-M@8It9Qr0mL!=40AIqk1=NdZ2d}<4C*At_HUP)lzqR|?1upRL@gIaY Vl|A9(&N~1A002ovPDHLkV1nV$SMTn0nX+K`LTO42i5uW}DVvVrnvJ z{CP-!vy<&4TilCazcA$Yd-=WhzVm(W{RYl)j{iFp`z98P0e_%r8m4IqX}|Q^t4ew$ zeWrl9Pjh^@aaGuDnx-kHXuNQm005&!@9+-rtX^wVRr_&LEK!DnXi~lNc zVf+0vol7Q@c)eZ#+U@pT0sx6bf^R=~{>(|ANoTBeWZ?yF)s>mv!sfTQeok^uR9-crEl^M46Ibi3WVQ?R?Mq3hqDtakw@ zl}bZNeDv;Hy!`swsdLe2)FNXivA@4>Nq=;71c2M^?h_~!3IODC069vf5`{v6_4RcC z;_*1uY88M^r$fD72fzb#E<8#;p9dfi2%J(xlIWM>6BZU0I6gjBd_Eu0p8};;tBG2z zcIqu7k$;F%E|&)`AvqzMrYY0Y)57I-DZkvh!xN7^Os!TEQXM-9X_HF%{eCN^tJCSg zJ-3s@sQW;U)p7eze*WPmk3SOR;NU<3L?V%JEZ^E%zhtrmLlaAcLLmSlOCaSR8yi!6 zJ|7bk6958Gip3(ju2U|TMJN=a^-z%)zXA7~Z-3BeG}zhM0l+W}+-|orK0ZF0z~tm4 zQ&Urzrr8hJYSC;qr7B9Z*|bIpV0n3&?d@%<)v7olZgssKl}g3(2iq7rpgsy{WHK2?1uB(_EGq!rZdY;q8r~0yM1o{8$;`|QPhUh_ z{`eZI$7lU7o6O#9jYi{?&Fyv%FF_;{8E~{CnM?{m93CEuR4Rq)@!^>Y6AT7fU0t>O z?2oFdip%9vy4|iqzxR}Zo6rfFOomh{HE&XlU@(Yhs{g%z_R`z*P6(^2s`Pq2>s+tb zLpGirLwi7uR5Ti;)oQW1xjB-^Q_sBwfcAG=QJMyTW5P2NkWDD}vayEY*6&BkXVMF0Q*07*qoM6N<$f(|C=hyVZp diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png index 88be89b378008138417f791c22e480d438159c55..099c45a0af01e4b111d880caa9ce84b462981f7a 100644 GIT binary patch delta 1022 zcmVPx&%}GQ-R9J=WmCsKjWf;dlV>`4|=*o}U zj*E$kT?RMI2{kV1g>Y~cYK#XDWJx^qXf!>^LHq~2xrrv5crqSL4B5a*Jy|wnH!+$T zW7*kCNtSekBGR$YVHjTzWrpd}7Ch~R&t={`@B6&Zcb?~Y-+vb_xZr}vjMQ!-nM?|I ztm}H)b!YjWwMXy~M*sn!D2iu)4Glz#Q&CzI-YPH&A3tE;XVzC(8m#+T5AjcGzzc|;rR4PR{90s6X zub&72P*s&5zkKuDL0^44w>JEt5bfp| znx>&?T1NryhMnwwkpQ_|&dWd~5)pu~ZTsXDKaXWuEzkMt>Z)XI{UI(7_M!~-0#L4)Y*tJ* z{yviW`+xgIFx(?0)t4B3VF=r{MJyIWRaGw&E^e0Q=H^Hw5}rM1Sr)Xp5o@&?K|s4Q zME?FmPXs_$R~GQW>Up{J(@8aJGz>pGgIvA(`85`T#VPtEGQ{0Yb(en7QaWo2ar0K+hl zWm)R(?(Qt0x3`zRzCH$J%PWDKetm0SGELJvN&qu6Gb}GJQ!bZ zz;_H=F(_N&`nA!f)cY|E16|kII0&=v1el(lK6${Bv&bLknVg(te0-dGz3!a?_Z~3pg+1xk4Z}aYfR%9|60dN5H#2`7+ zupd`l0PO7SkWQ!h{PrC}eG2h-oT;g)rgwlYfj~f#BnjKLk!9J2$i&Gyw5< zoKRom{eSJoJkD`o_uY4K90#}Y{B-I80i3!}9>sn8Hx3&0?)tYbNu~kNGT^xd_(hzD s*Wa0yZvSuxfWwEsp4aVy3m!lJ0Z9p+l7Mkv%>V!Z07*qoM6N<$f{TLbF8}}l delta 1019 zcmV<7mg`!Bw zrr^pp>PEpb3l~|6l9ev(U*M)V3t_;OxDce+cBL-F)Wr-4QW;E%AsNP!H%&Xiq>0H( z<8_hV*Vi`5bZ{fs4?^xex#yhkednC}0@t|4{~f})iN#_7xPRSlEX$J0K6`vDrcLuo z0q=)G+#4H{PMh297M5k%`+PocuU&m&NXxPahr_mEI-8Y!&h^E#Y4RwUJZCGH%TE7u z58aOd;c%Enqhasgm1q8k;>>^F;p1F8eO0_uB50aMEEcm>aAh(X_V)Iu*Xx+3iInnE zfPV`W&+qqBtAEub4i#J;kB6C=8M(E!1%TJ<#aSjU0vU#dacd64Ffa^bC;=64nB7SdAb*?9+6wr5J_*Q9r*k$1ySr`- zVIYYwKlzZi-&?zME*g#6WSk@p4i0STo6RNwx~}&KzLnuxy$p<1UWoB6o5=55`D|Jw$>||D#5_S3ZYO4K&lcb z`A0@ZgwN+=Y-|ib0wSN!V;Ba-Vo`=dAsSERd4J;v&_8&eTCK*;&JF;kX`<`87#$rQ zPGEd|oQa7EEX(QzY&59X>q-?-uh;ES0$5pDVS9U;Oj|I16WtFgSiY}Ym)dk6jFU6z)XSXfw~)oR&OpzeWKEH+#LK+ez4 z+kX>qQGrY*!`*uY_7DGL|KXAR_KQyeNT<_%6)2TTs;mHXIvvsXZTL7O5($#YBvVsU zyfllv_0@N19-sZYYBFcD)oQg%HeJ^Tmmm^}oO5&{nM_JR9vvOYR4Rq$@!^>W6AT7f zU0t>PoF7fogv;d;olZy4>pgMqChUiFI&@7cl^Uu>Fc`!$(R<&&a`Pj)r-U_46Wwmt zKG*GbQH|%sz#dQ|6^%w|G#YGfZVn~#;;U}~;QqTMM7{U-tzW_`6Hra4_NuW4;lZP( p_~!ec0I>e}^|6VsagF~B{sGB?!L^Lk>A?U1002ovPDHLkV1jIE^vwVO diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left.png index c05ed4833f97ba5703b5165f5c1ba9cacfb3069f..329ae1044e9693b4748a2bbcbe06ca31461f22b0 100644 GIT binary patch delta 454 zcmV;%0XhDU1>ggaB!2;OQb$4nuFf3k0004+NklM{CWAa+%qos?H4hTYD z=JB>T_xCTKUvoOW+xY_dGx-<*n8#Zy2z?_*;#haV({|SiLSHT}Z)JRSj?w5EcEbh$ zY~D9J$3M(wuz&rh;`t!-#d~}%YU^IF(O+k$=@ehhZrE5X7E1H=dOay`*7|LIxc?$f z(~x$&L_|bHL_|bHL`3_OW!c_x0UjV(merce$lYKkO^jb}dw_J(#N-s!)XfE` z@Bk^#Q>T{p4ycn0P*KhfxWftD{@{Pz8`jAMsQ4~BP(PK{4ycn0P+=lFpgkW@H5Z`b wr|dvgM$S*wT!4y$$qtyj-)DA!h=@pw4|;I;Z39SR>Hq)$07*qoM6N<$g3y@Jb^rhX delta 630 zcmaFB+|N2erJl3EBeIx*f$sU^!&cVY0GdNdUtl&VUah96c6NatFMUb(B&%FP-@Fx}l3t_3Tql4Y6k@ zqC(PYcPA^JtvP%0+q*mGwikc$GFKMp<7y}fVQ5**q##o-%J6Un1BW}SgM}8up+Lr% zM*a2rXF@l&s45(?ZgXW&^}pWvnp@@Qq{{O`5iCAp-WM+xUOwX&{_*>c&Xlyg1Wrx^ zk;0sQhtf2?S+Nmj-reyZHr{p&T4$l|a`Ljw6zvCUI~cU;S2f5#4J^K}!adr4|IDf9 zMc?pE5K#3mKDSG@-Z*sKo+Gd9+|0^OeBBhnFx5V^;qRX6dneafTi;GAEnS<>Wb*8* zOw*+0Gi0)P^%i{p^I!je)LUz=6?<(iF~%&wVlejn9qbv&q&-)YN-kNl5kw$zvHe!HjIzOERh;Rn07=zQ=dIC#`Hq{K6XW zsYE`$iQB^Z{ek8B2Uxx8-dO%SvfOh^oqXj{EyIz2J1(p*fAF=IU9p1o$y@G%h4Jql;+nWVyyPxuTwLDp zG~XaUzJYsTHTw;}raAAwJ0H8Y*Z>@@Kv&u@7PhNRVu@JC!TGZx^prw85kJSJzX3_B3hFZBv=^F&2cF1Ldk3hWnDs$Ewb7_fYFx^eLN$JMEeTA3w) x;970k5BVd<9rh{}i}W-F8h{ip5M^LUxPozlN`1bki(^PcYjT1F>*53v9)koGw?I4P$Mq7kXE!!(eEYw?=9DLs&JhhE z_oV*|W?dCH;IfL1Ps_Stg+PLW(JHrt8WOBe7-prc&k$v6Q;6fR{$W$MRYlz8NK@&2 s$$#u04FlGnkpr3B(-dgHmBGqT%*(CTHfQ%b1|aZs^<#Be=akR{0E+B07ytkO diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png index df4767bff9f12031025afa4e86f88b1353c07f6a..6b302b7c312a3c30aa0a9aaa68c5706e00b204d0 100644 GIT binary patch delta 157 zcmV;O0Al~M0l5K?B!2;OQb$4nuFf3k0001UNklF%Cdb5CqU!oy+KGUFAE0 z-YpzJ!g-v-8I-G_5cy$5Xw0iNKeNd+e*qEsJ7Yq%naAE+cWVD}fnir*I_x(d?M6$; zoB^;IuymV2mKTvLuY9F4146#eRd=3c@4#*S2oD9GT`3U}krpp37+DYvjcf=$00000 LNkvXXu0mjfNa8;t delta 151 zcmdnVxS4T+N_~~5i(^PcYjT1F>*53v9)koGw?I4P$Mrdn?(p#RHB4-5Z2V}=%&e?F<*Y->m)@p811=86St+X3wrp)I!5r3w zdUabxL|uLyXu8bvU-*oKhW2vzgBoCadYGyh7_3=%H3fQ%IRqGhz|+;wWt~$(69DJD BH30ws diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png index fcbbc48af1ac28a75265f6eeae6a54825f4ee72a..34470086a1f57480cde471dbbc275a18f6f4357f 100644 GIT binary patch delta 159 zcmV;Q0AT;I0lNW^B!2;OQb$4nuFf3k0001WNklu?>JA6a>&aJ6ED{1!pk! z#?~#|$6c(L!SY+!U?kydqK)^eA98`C06;|kj-Jp!S}8M|x%PTgU`YzZWIdi^oUGXM zqH^X4fE&O%GsAfi5y^Sw`Gf}O+GFm=H%@RA2o20u-2a(GL>NTAwgZ!U65Xt7QFH(R N002ovPDHLkV1fskM&tkh delta 149 zcmV;G0BZlc0kHv)B!75GL_t(oh3(X_34kyV1<-$Dp}0|+OdvRe*o#ZJrj;{jcNS@c zM3M;6=D+F}Kiok`03!OCq?Be6jdeOeR*lv?bxNtf<^3U_*`uB6rO1;Jv(E00000NkvXXu0mjf2~b7R delta 168 zcmV;Z09XIb0mK22B!7!ZL_t(oh3(X_4Z<)Gh2j4pgg|V-1lfXBk_oZ}b7T_cU;#RM zpgM|x;tHJ$E6w|=ll6Q)$+E%BR;Em7l%l5T5p;>%mTe|96wMx5X1*7hvVNtGo^2|! zY5N8P2+$j}ix8kE=