From 8668c78f43cd18d2c675f51febca2a2a52f3d0d2 Mon Sep 17 00:00:00 2001 From: zumorica Date: Thu, 14 May 2020 15:38:17 +0200 Subject: [PATCH] Stun baton sprites --- .../Entities/Items/Weapons/security.yml | 16 +- .../Objects/Melee/stunbaton.rsi/meta.json | 143 ++++++++++++++++++ .../Melee/stunbaton.rsi/off-inhand-left.png | Bin 0 -> 259 bytes .../Melee/stunbaton.rsi/off-inhand-right.png | Bin 0 -> 261 bytes .../Melee/stunbaton.rsi/on-inhand-left.png | Bin 0 -> 807 bytes .../Melee/stunbaton.rsi/on-inhand-right.png | Bin 0 -> 789 bytes .../Melee/stunbaton.rsi/stunbaton_nocell.png | Bin 0 -> 431 bytes .../Melee/stunbaton.rsi/stunbaton_off.png | Bin 0 -> 362 bytes .../Melee/stunbaton.rsi/stunbaton_on.png | Bin 0 -> 1091 bytes 9 files changed, 151 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-left.png create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-right.png create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_nocell.png create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png create mode 100644 Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_on.png diff --git a/Resources/Prototypes/Entities/Items/Weapons/security.yml b/Resources/Prototypes/Entities/Items/Weapons/security.yml index cb0ccd7b73..4183ba8f4e 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/security.yml @@ -4,21 +4,21 @@ id: Stunbaton components: - type: Sprite - sprite: Objects/Melee/spear.rsi - state: spear + sprite: Objects/Melee/stunbaton.rsi + state: stunbaton_off - type: Icon - sprite: Objects/Melee/spear.rsi - state: spear + sprite: Objects/Melee/stunbaton.rsi + state: stunbaton_off - type: Stunbaton - range: 1.5 + range: 0.75 arcwidth: 0 arc: default - type: Item - Size: 24 - sprite: Objects/Melee/spear.rsi - prefix: inhand + Size: 10 + sprite: Objects/Melee/stunbaton.rsi + HeldPrefix: off - type: ItemCooldown diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json b/Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json new file mode 100644 index 0000000000..a49523ff93 --- /dev/null +++ b/Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json @@ -0,0 +1,143 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC BY-SA 3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at b8758256b31013946fdbd320ca043a663c399656", + "states": + [ + { + "name": "off-inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "off-inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + ], + ] + }, + { + "name": "stunbaton_off", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "stunbaton_nocell", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "stunbaton_on", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + ] + ] + } + + ] +} + diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-left.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0560130a67ffe4dd8dc11270e2eb98c71f18e6 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=r#xL8Ln`LHy|q!W*?^}tG5*^J zANJ$Qb>`yt zyr=hlckn%2^Dwskg6eAF;zHpy?InUtV3Qdb7L@O=V%)ms7xS~f4Qt~Zbf^Dq-2DIh z?$`VgJg=A8U-+88DeUlFqn2yVca2zL8fFV{FfuSCOy|#TuR6Gy?_UVW6i-(_mvv4F FO#t3!auxsp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-right.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0c01f273cb8c28c52b6e0e1885a974102c7ace27 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn`LHy=5rWtRT>uc&xgh zQ{>u}J4)scgT8&#h&y*cOi-*@4(zk9ff zbNZ9*QB7CxR7GZP$?$utnsJ^TXeJ0`oLepVC(^WBwC%k6r_{3#jAz^l-BGpuz@2qY zog321M7{c#g!J#pY7LHbdK;kS{UYeP{>86Pfi8;L#9V7wbucd_{SwF=Pgg&ebxsLQ E04#NHSO5S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-left.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..540811b676155bbe1fdbd6a6cc07ee5dae12e655 GIT binary patch literal 807 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV0!22;uumf=j~nVpvMj(tq-I5 z)YTdsx;jM#tgq>%spqt$PT=Qmunpi_Go!)9(SK3d*B({JMb&z*{(CQ&GpBCnUyb{D z#z5nMAYuJE_19VF)=x`%F!PP49LIacL?$MS`D?rv|DE-3+t2#-ImVm+f41G^9r`@} zkbM8j_rIsOWh+0a);+Z1ueq^xj^v#AKMyB--|m0>`tUzWzx{d5#Mf)_ z)=34Qw*K_JykzI`z4vN#pH^>8)V<$qQm=RCv++-Vi9fo>o$vmi@FVC%W7SjF^Y^O+ z+irh5xn5l!;uR?A^FP_Q)J|=pno>}7%!*gvr@LexfA@6K!c8?Nia$L6^!agI?u^sl zmz>*f5_S9g-YpFiYkdD5Jd-2w=Go7Om*ei)zxnp^hZRrR`<=orXTP85oACcUr%g%`mezzCd_lMJGuh30SrZ+6F+$P8;2%@;vf#;R{+*O}fFO{fJt6pSP-oVMRz$Rbe ze)M}&!*J97;C=38D_{NDTK#(J&$w=btpDEax=o*r<4g1ZhW{+@-J5%tE%m?hlhg0l zhCiMDzB230|D%`oetkZ<)URFd%(Lp1w(-^Zwm)zESt@0=-aJ0rv_vj9;QEKw-43@< z!;_;(#|gz<3}5yy4}P93l&Pe&^=Rv=bM>B6%HG83>1v(sv0<;*v$ubDwQXmO|Erpp zf4@D+pZ$OBXU1vowtue@a{~w2`n~t3Fl`}y{Y@l)d0ncM`b&i*`o zn{>b1n%vS?K`&l?dajoIzWKn~M~xqz`X{`adcsd2K|R2{=?_CU)Io-SSuK)3$nuNt Q+71%&boFyt=akR{0NX^4LjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-right.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d983fde6fc8840a41a194cc1b6b811ede6d763fc GIT binary patch literal 789 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7lY!;uumf=j|QCqDKw_tq<4n znyVdX6cH8{5PmIIEgavHJYhET1M2`5AD;&<2Xi(|@|NfR7H96V{*Iue)gLu2rji>J)zlAMbS+?C-NW z>Z@T@|0eCsU!^~9Bdx!GZ9jB+{(&pj6DKPi@LZtR^oLuUOS8X$A-M0HR5nkIW(%zMSj@PQLFXKJ+)&0cwjr+>aD|<|}|8p+*(JyEvhqt=0eh|JldC!Z64Xnp>s<$8OWxPK09XW1ccO^B;wmVNg@wzl}P5lF<-)z4*}Q$iB} DkW6?> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_nocell.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_nocell.png new file mode 100644 index 0000000000000000000000000000000000000000..8c4fbac7fdb19358dfe2c67931a69999e091f0e7 GIT binary patch literal 431 zcmV;g0Z{&lP)2UMv`7&_pgS&+Jzp%-wa4k#mMVCM>)p@Nx-0qAewMQY83WWXbRO+ldwU&tHg?(j`gaHjN!M0e`-XFvhS+qE>+%K1v~%XiQ)o z{-9u#!erQPMqm^CCVoTRKeZYWh@yyVE5C&UeC@TXt#E*?16AQl zDYVvDYtdSNJAbe(r~-#T4XnenEMqpC?LDt|13qwX0be+HY{5EwKA&TZsWexm213E1 zLIZ=rz{PRQa=G+|!>WPRikwnvT6>mc5 Zd;o5C;m$m^u^RvY002ovPDHLkV1oNo!x;bo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png b/Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png new file mode 100644 index 0000000000000000000000000000000000000000..59940f44ca4373ace1a3068261c7b823721077c6 GIT binary patch literal 362 zcmV-w0hRuVP)`xB_SB1vm;l0TNy!A&>5m0S_IbN(^SQ6p2*% zu^k3@S4-dX__Y%y@SndB5%E=3`M$NwCE)Lm1=d>nB(e$w_;wFLVlja({I!Jb9(J46 zG6H?@=er~2%iF~w0!2~q;vwAMU0$8NJa3kNv6Fc)5yC0c8ob7-vx z=O;UYIdDkSKo{OL4Ru|Qo*Ugj3_MyO77h_d(1jagu-49+HLHPCaG246h$2-S)} zF>BjE7=~Y$7)nOh5JQcjOY7+h@oK2DIN%J0{)5t?WB)?vPsrH+(IHuyKafB@nc}H& zi36^O45pyrx=7|MTbAV9-KYC>F9eG~{M@VWPSU~mMt~QoYBnG;L?=3&*Xmf>V7kIT zFbF-24x6(XngGyh0W!365=z4F0~jax-C7-2#^KRV=l%}ILI^n=4(0tFj%A3Ba&k=b z2P$8N7+B_K`hR8u9vwDkGc-@n#LdqS4NRv~eEK}RiDpAnH#dbpSNUh}hnEq*Z-Wn@ zo8@170b;m%@=vaTco3G9#UC4F_hbIsp14fmcjE&S1=ukEBLGgWfs3B8Th1CE%FH9+ zk8}86O#tl$NQ0lhdc>Qrx4l*ia{zPQT$QiRJPLjh|5^(WKW;S|4SZRMRJf_9kX`(D z-)>JS`H}x-lCOOqAcT-X5MVSKVX;`?qIa-Sd6SQUuJN^A6qE4F@1q_7n4Wn#_)P#~ zLVl`$Z7U!NAB{#e8KP6G#?M`V7(SUy zp32-yT=}^Qpu#C;A7_4M0XUm41Ak`$xSKBnKXV08nXd{z^9$SUwgiCiP~zd&AL}Qe z>ijhwy?!Y@U#|-71CE}*fDnT0BvhIogQ*6ggKGQ=SI?AYi^&cly?XL%f{{*CSIQu_1P`eSyrYuMl$;tpzcT;# zdHVBBt%kIGf|Yzk3|7s{^FSsCVTir;e?3=L0tS<1O=7 zPeHox1JRRD;e3S82N3hM79gWP-uUxxR)0Q#zR5A{z4| zU~=PC)PHgX`g{N}-{%8}`IXBD=(rpe&k)UA0O`92@u3ZH9#J~iLx1Bm7G0WR@5-UMCZdwKDbm5l}U|L-re z*uFoY(xQHUfJ9y?+vB3Dz(LOD1Gvb^d;ljomk;13r}66cUafJ%$HKcB07K7d%x