From 1708cfc9d98ad336261bd855b8fd3d12e786e283 Mon Sep 17 00:00:00 2001 From: RiceMar1244 Date: Mon, 4 Nov 2024 14:55:36 -0500 Subject: [PATCH 1/4] Adds storage sprite for gorilla gauntlet --- .../Objects/Specific/Research/anomaly.yml | 3 +++ .../Objects/Weapons/Melee/gorilla.rsi/meta.json | 7 +++++-- .../Objects/Weapons/Melee/gorilla.rsi/storage.png | Bin 0 -> 625 bytes 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml index 516bd0f6bdaf..5de9016dd72a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml @@ -126,6 +126,9 @@ state: icon - type: Item size: Large + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/gorilla.rsi - type: MeleeWeapon attackRate: 0.5 angle: 0 diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json index 97a5fdbd2e24..f7909a52947a 100644 --- a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json @@ -1,14 +1,17 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Design and inhands by ricemar (discord) and icon by EmoGarbage404 (github)", + "copyright": "Design, inhands, and storage sprite by RiceMar1244 (github) and icon by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon" + }, + { + "name": "storage" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..c36e4ff75adc4b869ae7fedb6aa0c8510648006e GIT binary patch literal 625 zcmV-%0*?KOP)GD9EP7YW6)S9VU2`#F0!B*m@5W#@UqY!JUB*lskCDd)+xGo6WhR+puo%Kt&()3 zOCWgapb!P6hP2AM8!{~6&Nlvu&FQetxZjRL3n~Q7bD8gb=VQKiUig0C;o;%&zvFXz zaijm9S*l0lL#})GLbbJsMx!P`B9Q<d-$;{2TkCMPFNfJh|b0~i~h5*iqP z{g(4u8vyT)eFAW3i><9+WV2aY2Lb^C4Kl-z9ynU8E;lSTHZ}yU_I7i5^EUvs(g^^E zwn$8j(Rt>y;LXo{oB?s#4CS*9(PQz_cR?Shv{Pjmb82cDb?1G??o0g}mNWxrPeK}BJ4aY^tb zN#bI*lQ&c1Ue^W;W6j~|nH2zXHHUW97R#v=K}8X~Oj_gm%|= z1wn^9+T5}_C={xgnf_>Nzu!++x|P`QECY8>0_)BI7OJY60QsC4z%W9r|1`GO#dgZ| z-0T+u4Kg*ghY2c;j68ej16Uo5n{+@yH;4_-QZLur->qo6sj6!F Date: Mon, 4 Nov 2024 15:34:23 -0500 Subject: [PATCH 2/4] Specifies a heavier hitsound for gorilla gauntlet --- .../Prototypes/Entities/Objects/Specific/Research/anomaly.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml index 5de9016dd72a..efbd7c2db4f1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml @@ -137,6 +137,8 @@ damage: types: Blunt: 20 + soundHit: + path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg" - type: CorePoweredThrower - type: MeleeThrowOnHit unanchorOnHit: true From 7a6a967def3068808c67b5c909cacb41e1f112b4 Mon Sep 17 00:00:00 2001 From: RiceMar1244 Date: Sat, 9 Nov 2024 04:28:40 -0500 Subject: [PATCH 3/4] Modifies gauntlet icon and storage sprite --- .../Objects/Weapons/Melee/gorilla.rsi/icon.png | Bin 753 -> 775 bytes .../Weapons/Melee/gorilla.rsi/storage.png | Bin 625 -> 624 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png index a57ce53cc4633590e7be46bbe293c5bd7cace1f4..9ce8603d2a68d0c78a8f09a9f95844ea5ca986b7 100644 GIT binary patch delta 752 zcmV3vclDCr!X4)Ld}VS9q4K56`pgeC<}|o zk!ZGGSy%+f_Nh5humg_`ZwQsupwsDyeGM^7h=vQbT%QSp4Ll1Dz^WRj=p1-AKE>=z zh=#^m%;qYrHh&8MFFspote#U{U$6rf%OULcx7Un*EB$-U5k0Tbt;jpvubDa-FxIKDn$0W?#0iWA1mh01P zgW&)GwRKLW-oFLF;jj}9M_7n15sSrCVFlEEq-U|#9_2rJ>}*5DJc;c zjTR!|d6LOgmi$TJu4*yLxf1%^ezELMx38>i0Pygj9<5dnKs>G>%LzsU0f3yya~9z3 z=oB|gD*<@rs!NNgNE7!b6|`DC@wmeCXRq-MbmvvxRVQywxXjL<9<>2*aXwva`YTJB zoS4p=Tz^$ShCGvOuyyCDJ73asb9{XM#9x!p<#LHfBlk2GOHG%_WTK*?9IaN*_^QH@ z=r>NrQ@mVDFs4k?_25Rquj;l7Jsyu39v;q)ZFVAa-uvz+(qjegJcBKzSdt{+bUN{P zJlRLYH_)w_oR~(I6U5^R0LyOh6DWpzdjT1=wrRF*5iuGFAj^sDb<6dtrw1{9Z_?w8`z>XG5k|dg&n*kUc9AtB1{wwVG81?n_ iX#fH23i%%P0PqW$ha}q5Nokw_0000Px%t4TybR9J=WmETKKVI0Ok{$M6f-a>Sz4B_v)*sMC9P2_D6q%tZMA~d@7dvPo ztg|0EmGyS9&ajy7mvqyft8-r7@AEwG^ZoL^P)8mAI~q=tY=3%SM%W}906ulJEbhiy zMFZZT2zZ0S_#b`PQ7}_ZeRD11(*rZ&-t8Qc%LxQULQkN_;w1DWj~-veCIv;QB&tqe zdSFJ3-26dO+eVMY3+qX38=$aODv7EScquIsX}*ZXVj=Y{!Uhrg?sW5HJqk`3(cD01 zNuHW#;KR}?8-ME&`ue+(Wjmct2LPeXPWn5-CF`qBz~MNL%XOLkgF|HdS!CHxG#bNV zvC!#+7x6bFHm;TAX{tutH#RA5^j-%*wmS%a`AjyupKnJhh1=~S_w$fX#CSIU^u!^o zIDvpSD0X}E-;&e@KzGkARzJQ6!0mPsjmFU8JET&nl7D;^CEy#I6w+Wj!>eI-u3W%u zwqi21(AX%j*&M{8U&&_o3*xWT=Or(rvJC{hK_Lyc1F+d{=l=IBYbG$6TK+Jx_-=`V zgM+ffq0AQe#wNvXFAT4SdF$x`z)yyWGgkcRBxbV}fR*L7vV{$l+C<3o?+r#2mWmS diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png index c36e4ff75adc4b869ae7fedb6aa0c8510648006e..e21fc82b971ece07b67423bb0e0603cb217392c6 100644 GIT binary patch delta 599 zcmV-d0;v7*1n>lqB!4$aL_t(oh3%BTYZGA@$3JOnE)|j(ID;K>ODU#SkhXMi$r8|Z zDu}qKty=`CPU4>siY_4t3SD9;7!|>|h=bI{p#@RUv{Fn%nn-g5n@fCCDzWDfbL5&t zBUW^{&+@+C=l$_~@45GV!NS7A!r~ueYd3Il`nukz=VLe9&VT(Adg`5UIIP?4b`psM z0OJ!u91ch0Tpi$)dIEsw-nX>U0K2^W)TE1QNdQs3ZlbM$y=a=KwVS0{d&JdRYl4kThT)N6)B0R?i7W43 zbNl!RP%`3%fmAAGS|CIPRW<*|PVp%U>+5M#Op+wV3u8Q8G|%n00zy;(DCIT*(0aRD zY9T6YWHL=>AeU9SaH)@-&qW?4S{O*D&5l2;u5r{q(0{2v6V+-L%S&$z?Q}W`WQT}G zlFVE?25dJQ=ma4uY=03(A28{a8@2{Y^_$><$+9-R@G1V2m2ACVkECqoQ>%K_nwqY*Kl87x6>2n zb^l;LxlpXi+~`RT-I#7N@mCE1oIQ704`hd!nsgbly+#`8+HV7o9^A13KOUT4^IM0o lQ)(rS>WvSMg@wg`%XjkP-vscx0CoTX002ovPDHLkV1g#;8$SR5 delta 600 zcmV-e0;m1(1n~rrB!4(bL_t(oh3%A2NEBflhMzTK&{!v7jf8eCvY;85D+YD&vd|wq zI7W1-v||v~DY|zP+rXBfz{}>Xl60d>Ab9Ga5Cx@%w92|0GA!ZFHvWmt>9EeY-;P5I zDg@1QneTn)W4?D@_8Pu6y@FwSTpUMx!P`B9Q<d-$;{2TkCMPFNfJh|b0~i~h5*iqP{g(4u8vyT)eFAW3i><9+WV2aY2Lb^C4Kl-z z9ynU8E;lSTHZ}yU_I7i5^EUvs(g^^Ewn$8j(Rt>y;LXo{5@mZ!VmQyL(!|j5XNl$b8 z^9P=s3In?B+X0fvWM#is0YOD!adAoTBuV08wv#tg;$GJV3}emV>6sM(ay5r`)fUUC z6hTE1yi8i-`prf*f2{H{u}grZB{A{W`2|6TJKEf`I)5k>s+gJnXluXUPglB?*zha^ zcTWQA&Hxsws+s`#oEX3`LahHZw%5gW%Jtmr7Xl43HMNHcDvgXhd*}mL9gLfFKtVT% z4bM_9*W2H%Xu7GYYWn36oeRZUXF@3eht{<3G`BQi7;E<77OR7C6X5xTE?mQX9j_NI zT{D|ono-E4HAXtla`b+`BgBCQ0Jw7Xmf4kVrLSk_YL*8nrE0$eyn6A}2W$_VzvFrh m_d>Dam{~e-JUl%9S^fani`99Qz0!C90000 Date: Sat, 9 Nov 2024 16:42:45 -0500 Subject: [PATCH 4/4] Updates credit to my new username --- Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json index f7909a52947a..55417c2e716f 100644 --- a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Design, inhands, and storage sprite by RiceMar1244 (github) and icon by EmoGarbage404 (github)", + "copyright": "Design, inhands, and storage sprite by SpaceRox1244 (github) and icon by EmoGarbage404 (github)", "size": { "x": 32, "y": 32