From 064e34e9c591615dd819c3a48a7ba5b60fcaf936 Mon Sep 17 00:00:00 2001
From: Aerocrux <69610864+Aerocrux@users.noreply.github.com>
Date: Tue, 5 Jul 2022 10:09:54 -0700
Subject: [PATCH] Fix invisible held sprites for capgun (#9390)

* Fix capgun YAML for held sprites and touch up in-hand sprites

* Remove capgun size to inherit BaseItem size 5
---
 .../Prototypes/Entities/Objects/Fun/toys.yml    |   3 +--
 .../Objects/Fun/toys.rsi/capgun-inhand-left.png | Bin 329 -> 626 bytes
 .../Fun/toys.rsi/capgun-inhand-right.png        | Bin 334 -> 573 bytes
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 76b342dd8c..bcb0bebe6c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -502,9 +502,8 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
   - type: Item
-    size: 24
     sprite: Objects/Fun/toys.rsi
-    state: base
+    HeldPrefix: capgun
   - type: Gun
     selectedMode: SemiAuto
     availableModes:
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-left.png
index cfcd235b604153d24b553536d93f7f94c74b783a..8971b545c64cbc9769411189b3082ed7ccbbacb0 100644
GIT binary patch
literal 626
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qt-3{32vE{-7;ac^h&`yFx+Io8g`!){O*ox<9(
zbd##y9;WC{HvR{TbgG%YOX)k@c*uH3XfM;d7^(6_lMKG`=FhsQaN*OjmObCA74MfU
z`@B5fn)juTqxM=0;RTyqc^p!^B^pkN88S@OO=8fBKEe>Pt%Gqzjv#Zu%|}NYoP<IG
zwr%BE@9$t#ao6_svtN&xzAmtnliD+bF}`I5^TkAoS@9ySw{+vh3+%4+KfYm-_W7<!
zXvI$zw(?hhR;>8$zwSzcL4c#cij$vH9^VePUGwT^%{o8+IJ^Agn>WcSZ}GN``=nWL
z^Omvlp6WTG_vF@v?!FsVU|10Nti^PPc)jsItz@$;zZ*TH#Q2$fBdXR0S>32w`;9Br
zKy=pGXQx&&JS~u0GP%mFvHNk*thhOz;(kTHH>j|QOpgC`V)@g(PpsyB2@+P2KXuop
zL;mYrpu?)!cLaRhDEyvbe#Op6JE^;>Pu3ftdRmDMf2eq7UU~I@(+!7<{5u(^Zdi1G
zdGOW#Uva(--xkWh;NM*2n8%=#-OShST>OUncHQ#JhO@-=gB4!SYglu`mgU0vzZoq%
zEgQEwzS@xed-fa76H@!X3mk}J@rXVv<#)+{%`M>xrvGj^Z}2_w3e8!E?l3If$7pN3
Wr@Z5RkPa}NFnGH9xvX<aXaWGjA_yJ;

delta 314
zcmV-A0mc6E1jz!B7=Hu<00013M{Ml?000|MOjJex0RJi}DIg#qcXxLpA|k-Rz%4B;
zNl8gyU|{=E4T%5%00DGTPE!Ct=GbNc003xuR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`
z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGk;1ToZ^zil2jm5DZMmL
ziHkEOv#1!Pg^M$-C^0t`#5UwoR&e!m0UHVc`HdM^5R$FS0001JNkl<ZNXKJf7zLw%
zOu$G;fsz4)X2zw!$N@sLDBw^assf>%aJqph0YtGW2ngU(QUM~`N26;LjDi6x9vJZy
z50Ih&OA)~2fHTB#GQd>8s)As%s0!dL9>5@p5qI$b0vrXSaYiZt00Y(rg1Yd}B>(^b
M07*qoM6N<$f=JePCjbBd

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/capgun-inhand-right.png
index d272d40c9f97c18a721c6fabe4aa14b081b3af71..a92eb4f35d432dd6b4ed8284c047ed0b9cc18264 100644
GIT binary patch
literal 573
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc4VOG!978JN-p(@gVs?~hO>ga3Fm-AKE3=c*
z%OhK6yX|qj#p_Yj5;2SWMs=Iap;JyDB*e_FsfkH`m%lf|vFxVG?na&W|K%R~rnSHM
zryu<G&qUK}2E`1^U6~s$FJe59d6D74mJEi1C=&(?T`7h+V!RA~-E0i!Q)ckwrYyR(
z&v2%lU-$gjdmO2mMl)}uZGLI@uqIaI_(qZZrF{ke_7{~O$T2Inli-<iz4!F{>#o0^
z|GhfVJ&j>)_q15O>1v)rpTB-;iA+AW_poJKb$9)-=iBEmE)kbl>HMltd^5-P<`uW!
z?#k7_ZuNE>x5qR0y~k>{X6-Mnzg%$JuD0%ZQ2&*u>)W~7UQYjBa`wcoR>jq#U#DJC
z{n}crRIAHJzy}!8UaS}Tf0wN_{=u~)t9;EJ{`l3&rC!^1*8F$4C|MKvc2oGmD||a_
zf0x9Su*Hl0|9xFu{@m)6#|($$8b9x5zsY(u{e$X<y<A1t>Z@dQ4Ps><mPLdou0LRv
z{^9ni?^-8r++Uu>dic{R>*o7ziR%yPZQcHtF>sa5s+zRi2`B*_)bo>dTa1zMi#ZN@
Qz$j<%boFyt=akR{06L)i@Bjb+

delta 319
zcmV-F0l@yf1kM7G7=Hu<00013M{Ml?000|MOjJex0RJi}DR*~wARr(jA|k-Rz%4B;
zU|?WLNl7QTFdYB@00DGTPE!Ct=GbNc003xuR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`
z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGk;1ToZ^zil2jm5DZMmL
ziHkEOv#1!Pg^M$-C^0t`#5UwoR&e!m0UHVc`HdM^5R$FS0001ONkl<ZNXKJf7zLw%
zM8HT$fwBP(2?Z$atbkpf*#Sbcm<r%9!307j<8T8bBXa_XW^cgly7ti+90j9*#y|ik
z2b$H5kT^`nm^ccUOprJ%SV|PeU<U-pIRKj*%-~Em1FR(qM*)mgF&brL003D%2L{s0
R@%R7$002ovPDHLkV1iwbcDw)p