From ead78b72d2e507fadf4f5424377aff8a5f94d271 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 5 May 2024 16:42:35 +0200 Subject: [PATCH] Add default whistle + whistles reorganize (#27676) * Add default whistle + whistle reorganize * aaa * fux? * fiiiiix??? * Revert "fiiiiix???" This reverts commit 15353465d58db615185afa8c549e1819099c1a5b. * Apply suggestions from code review Co-authored-by: Tayrtahn --------- Co-authored-by: Tayrtahn --- .../Entities/Objects/Fun/whistles.yml | 30 ++++++++++------ .../Structures/Machines/Computers/arcades.yml | 1 + .../Clothing/Neck/Misc/whistles.rsi/meta.json | 19 ---------- .../Objects/Fun/whistle.rsi/meta.json | 14 -------- .../Fun/whistles.rsi/equipped-NECK.png | Bin 0 -> 288 bytes .../Objects/Fun/whistles.rsi/meta.json | 33 ++++++++++++++++++ .../Fun/whistles.rsi/sec-equipped-NECK.png | Bin 0 -> 6755 bytes .../sec.png} | Bin .../whistles.rsi/trench-equipped-NECK.png} | Bin .../Fun/whistles.rsi/trench.png} | Bin .../Objects/Fun/whistles.rsi/whistle.png | Bin 0 -> 593 bytes 11 files changed, 53 insertions(+), 44 deletions(-) delete mode 100644 Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Fun/whistle.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Objects/Fun/whistles.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png rename Resources/Textures/Objects/Fun/{whistle.rsi/securityWhistle.png => whistles.rsi/sec.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png => Objects/Fun/whistles.rsi/trench-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/whistles.rsi/icon.png => Objects/Fun/whistles.rsi/trench.png} (100%) create mode 100644 Resources/Textures/Objects/Fun/whistles.rsi/whistle.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml index 10c41efc54a..667d5da11ca 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml @@ -6,8 +6,12 @@ description: Someone forgot to turn off kettle? components: - type: Item + sprite: Objects/Fun/whistles.rsi size: Tiny + - type: Sprite + sprite: Objects/Fun/whistles.rsi - type: Clothing + sprite: Objects/Fun/whistles.rsi quickEquip: false slots: neck - type: UseDelay @@ -16,7 +20,14 @@ sound: collection: BaseWhistle - type: Whistle - distance: 5 + distance: 3 + +- type: entity + parent: BaseWhistle + id: Whistle + components: + - type: Sprite + state: whistle - type: entity parent: BaseWhistle @@ -24,10 +35,11 @@ description: Sound of it make you feel fear. components: - type: Sprite - sprite: Objects/Fun/whistle.rsi - state: securityWhistle - - type: Item - sprite: Objects/Fun/whistle.rsi + state: sec + - type: Clothing + equippedPrefix: sec + - type: Whistle + distance: 5 - type: entity parent: BaseWhistle @@ -36,13 +48,9 @@ description: A whistle used by Syndicate commanders to draw attention. Avanti! components: - type: Sprite - sprite: Clothing/Neck/Misc/whistles.rsi - state: icon + state: trench - type: Clothing - sprite: Clothing/Neck/Misc/whistles.rsi - quickEquip: False - slots: - - neck + equippedPrefix: trench - type: EmitSoundOnUse sound: collection: TrenchWhistle diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 6a351d47f0b..8b2cb5d5c7b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -129,6 +129,7 @@ - PlushiePenguin - PlushieHuman - ClothingHeadHatCowboyRed + - Whistle - type: WiresPanel - type: Wires layoutId: Arcade diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json deleted file mode 100644 index 31cda14261e..00000000000 --- a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Firewatchin on Discord.", - "size": { - "x": 32, - "y": 32 - }, - - "states": [ - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/Objects/Fun/whistle.rsi/meta.json b/Resources/Textures/Objects/Fun/whistle.rsi/meta.json deleted file mode 100644 index 59159ff6170..00000000000 --- a/Resources/Textures/Objects/Fun/whistle.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Foleps (discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "securityWhistle" - } - ] -} diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..89fdd599b2b55234330f8f800f952de194f64d11 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkQ1Ftc zi(^Pd+}m3lc@G%~FgO@ z#Q%Pl70R3m*MpTYmrKW%+n`nR^6f0IMn$tUCbQSMl{W9^`+teS6!`|Gde sy(&C6v(d8HJl0PD<^+UsjsIBhg*6&)&($`03-ld>r>mdKI;Vst09EQV39Gy3FDcx@TmJABk}ZrVmqkMq{4e#hy# zIKKPg@%_P5wXq{l#G{WzwehFNqFOXD8as@7R-?x2oJnOo?Q89#NniRrz`&y~G#a~Z z-IcbtA2hVBUY=(y0f#_f2|Z|@H4Q7-d_9@RD%iKRPZA>j|6<7 z7eWdyFoSm>T!ujak;bCBP#AM8fj|&P1P5f4pk)vtqQ-tdHhl+jeyD4DN5{sS4x>Iv zZ;flFTD{W9%kqE&@+-Njn&N1(6Ni)g_B}3uL5GfE?iy~ywGl7Ak5+;z5 zk{WLq6aq?|i&#W%AezP#0csYCIwWTrl||pWsUrhAjmO9Xq5*1(Lj;MSwcJLMn}Laj zjmb+AhFaVaIzT8bl)Q79fW5f-t}>nB&?vE};1! zAwpznq@abvr9wo687TpfI?CB)fB?dD2wS#4>3q}MYS)fC>63urxC~Yj)_N#3yRqNT~5z}*UU%= zC7TfAqt?lovd~)REVBphBIj&wFiSbbMRC}eM0$!@lZ;ZC?J&E?T7@8KcS)RKF3fNx zKmwgdpgUim?@FW}3gD?I%*8mLn%WnU@I(`vDBGxZF5f=1o|T2mD=fC2(V>-i%{>&o zx5sN`UEs6D@Ry8rJ(ChLvUN71`oIWU!iwmLBD8=4zb zs*cKJwtuxJrqa;b!IZ&P4BFCQDh6#eVAegfwS!rI(8^dUwnfTx;u5cQThT75;6Jvd zz?9)tAZsfJQvqme1+yNZ6|q#Hj>;6ae-*)$Wy?ULD}^rC)O5#XFG7vMT@P-UnYs0g zJ-A}OI5c?ALlciK{BXAKYj>+N@adM9Zr1O`y_5HUGqQ2l?9BHs+)`)1zIOY@yXHUG zFnqU}K7IMxl?%__xxJ@%!{)8EffLTu;i(_5{;^}zZ4b>ffvdGiwv_!7 zR*S9S;36~_M1MfwAcWx3qEz7aaMQ&_ZhjZf?RL3W-+S5AJ8*eVeV*TUzI)D9#-fNE zh#dIu4#fV#fLguHk#{uuV5!uOKvXM-n_+RznZDBLG^bUm-Uv9ZbdT30N-uc(w+>`7 z8J^8%Sw5c^sTz&C5V(k#dwj~BqZ9u8aF6O2tIc&M0^71oE?@+wBECg5*zVpwTY}m3 z-6Ov|I}oh%t6N^LT}bX$SO)-yn89EmQ*=5V=6N1-9EZKWJQ-6{Ptb><1OQ$tl_Y>f z^m;w{-fT9L_oyB&P-Cjf0t+BGDs^2~<^sG}EVAKnD3%_W2vYdWt11T^FhsN2l=^fy8jwaZ@YE#|331Am%Vn_&g#u3|lj0hW$Hgex77ihthV;35 zGWr$*7(@_s6`X){)gdMUYqwxL9>)Nk&*!4y$ad9c9JzqO=0*4}F3^Lv%2kWiW7<#k zc*gfR04Ge{Z5uCLfIk0$s#hO2HJs{#DRHRgvnjN7Jbv#@Alv@{%D?fB(SaNLClq?m fqAx}cta0EA6gPzg#fYiV00000NkvXXu0mjfD^&(9 literal 0 HcmV?d00001