From dee1db4113e7355dc0d6b113aad68cfe32449c81 Mon Sep 17 00:00:00 2001 From: Entvari <195642967+Entvari@users.noreply.github.com> Date: Sun, 20 Apr 2025 22:38:30 +0100 Subject: [PATCH] Wizard Headset (#35732) * wizardcomms * wizheadset * Addressed requested changes and axed wizard channel due to redundancy. * oops overlooked this, dont tell anyone * another mistake fixed * removed wiz encryption key due to redundancy * accidentally left some punctuation in a now unrelated meta.json --- .../Entities/Clothing/Ears/headsets.yml | 17 +++++++++++- .../Entities/Clothing/Ears/headsets_alt.yml | 17 ++++++++++++ .../Roles/Jobs/Fun/wizard_startinggear.yml | 2 +- .../Headsets/wizard.rsi/alt-equipped-EARS.png | Bin 0 -> 752 bytes .../Headsets/wizard.rsi/equipped-EARS.png | Bin 0 -> 556 bytes .../Ears/Headsets/wizard.rsi/icon.png | Bin 0 -> 742 bytes .../Ears/Headsets/wizard.rsi/icon_alt.png | Bin 0 -> 900 bytes .../Ears/Headsets/wizard.rsi/meta.json | 25 ++++++++++++++++++ 8 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/alt-equipped-EARS.png create mode 100644 Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/equipped-EARS.png create mode 100644 Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon_alt.png create mode 100644 Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 89227387f9..f2c76cce99 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -283,8 +283,23 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyFreelance + - EncryptionKeyFreelance - type: Sprite sprite: Clothing/Ears/Headsets/freelance.rsi - type: Clothing sprite: Clothing/Ears/Headsets/freelance.rsi + +- type: entity + parent: [ClothingHeadset, BaseMagicalContraband] + id: ClothingHeadsetWizard + name: wizard headset + description: A headset used by the dreaded space wizards. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyStationMaster + - type: Sprite + sprite: Clothing/Ears/Headsets/wizard.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/wizard.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 42343d1569..f27f6a6a15 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -155,3 +155,20 @@ sprite: Clothing/Ears/Headsets/freelance.rsi - type: Clothing sprite: Clothing/Ears/Headsets/freelance.rsi + +- type: entity + parent: [ClothingHeadsetAlt, BaseMagicalContraband] + id: ClothingHeadsetAltWizard + name: wizard's over-ear headset + components: + - type: Headset + - type: EncryptionKeyHolder + keySlots: 5 + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyStationMaster + - type: Sprite + sprite: Clothing/Ears/Headsets/wizard.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/wizard.rsi diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml index 0697b698b2..d296a02754 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml @@ -8,7 +8,7 @@ outerClothing: ClothingOuterWizard shoes: ClothingShoesWizard id: WizardPDA - ears: ClothingHeadsetAltCommand + ears: ClothingHeadsetAltWizard belt: ClothingBeltWand # pocket1: TODO: Include wizard teleport scroll pocket2: WizardsGrimoire diff --git a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000000000000000000000000000000000..5edd6b5794b3f7b466a76b5e8d2c2c36a605c07a GIT binary patch literal 752 zcmV4Tx04UFukvU5PQ51#0Bx-^S5wsAoNTFg8K@`MNB4`sWk_bj^X2vW+mSHAA zf~{aQh4^B?`$8*iw9tu9Gi-AsaPrfAgW zQ8#H%26Zx2E9ljFP%fOiMV+m7>f*LtopW*zv32=H*RZz_gYvz9 z`5V3TXX~bQ;Vl3F010qNS#tmY4#WTe4#WYKD-Ig~00AILL_t(|UhUekYJ@Nt!11&o z;v)44d<|c~sYuaX4%`b}+9xS=bMXNjq&Kv~J(1nTA;)*5rRyc;6#V}{;wL2eOf*ZP zfPK3&<<;uC*7H28X_{2u_tx#$D$7!bVW@&2P+iwq_it6PX&T+O?O)xZDD*H4HyZ@$ zFHKVw$FY)07{^il&u0~q)cfhEP3VQRFa5{_m`B_4^zh;}u{_VU{CXx_#JwpO^Ktmp zKd0Bogp0|t?6T&#{O?{#f^wPA3*YTqxy6eE0000000000U~OC25pvDJX>&A55_7j6 z*BqP%Ac_{>1isqi+q1c|V?6*>Rb4*4-*OGo_jmbaq8*Y08FC)M_rZ+Kk_B*=FVC3- i000000001h4W-V*4POHop{JAp00004Tx04UFukvU5PQ51#0Bx-^S5wsAoNTFg8K@`MNB4`sWk_bj^X2vW+mSHAA zf~{aQh4^B?`$8*iw9tu9Gi-AsaPrfAgW zQ8#H%26Zx2E9ljFP%fOiMV+m7>f*LtopW*zv32=H*RZz_gYvz9 z`5V3TXX~bQ;Vl3F010qNS#tmY4#WTe4#WYKD-Ig~003M`L_t(|UhUek5r9Al1VBo# zGrKVUvMk1))Zoocn1T7-h!Bnt0s#IwkL#XgN$LIV+bA7CYJb&-|12Fsmn8uJ00000 u0F6}t6-c-ACDs}GB?JHf0002GiFg2#2pGytLx*bs00004Tx04UFukvU5PQ51#0Bx-^S5wsAoNTFg8K@`MNB4`sWk_bj^X2vW+mSHAA zf~{aQh4^B?`$8*iw9tu9Gi-AsaPrfAgW zQ8#H%26Zx2E9ljFP%fOiMV+m7>f*LtopW*zv32=H*RZz_gYvz9 z`5V3TXX~bQ;Vl3F010qNS#tmY3lRVS3lRZ-WM7d0009MuMPmTJa;X%OJ!;{(%_0HPgm_wr)~WnEbYZZ0k`4dQ?L z^a(0UJ|H?DtEs8|mwRCa-{@ND_=AIEXa^V= Y0DzrT5bmd^tpET307*qoM6N<$f^tel+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..95f4f5a8e7c5d2a8620def2b09a2e0a0ed2844c8 GIT binary patch literal 900 zcmV-~1AF|5P)4Tx04UFuk-JO7P!z_0)%u`SI_MzckfDl06;TjJsi2EGv=ywnH0eu7V@O&= zTm=^g!9jHKHTWOsD!3{Lf+C2xx%*nA#B;6CB06}(&H3@&e1~(tK;5Ki6kPu(6s)2X zn}}+&$vLg*i2y+w@zb9&Tze`$p5V{*euGcd>pskW)8~IdPcwac;$biBZO4lp=s5n>QSH(^uHYRsdJ+)j7>osiToq}+$aJXQWjPH5W zO@HklOb|swr^F&AMf#*#lG*RRfiK@QOX4x)ZL@+SjvRUMMno-1*NoJx z=oxuTR#fgk^K`RAgO%aJk?%tb zpY{f51q&s?K>z>%32;bRa{vGf5dZ)S5dnW>Uy%R+0kug)K~z{rV;BXaU=$2AV1&{{ z12t9E{~(%!ogK^vflF7ekZcYNkfc#hM+a;<4E*@{6YLNeO^!o|)&TN3%(7dzZ-ez= za}Z39SU{9wm_@iO0LdeV1}TmpsL;*H>HoLy-x*%Ld4m$~Ab=d?Fh_s@DGp$Q(m27c zeft=>I5{ya=i}uCI}XYPJMh!z&tMEosKfxGU5XAsJ_b1g1n%6w&k&_r%8;Cx3g$ak zsev6xOh^z60bBqU{4mQwAa;ra!-Ff&7@9-ofIF#YD?XNJeOpF?Hv1Bx7g4&;QD8CaPa z8NUDe0u><)D0aZz%a5Tf@&Hvr0OSZS(Nu=^#gz<39DYzy;s8Ys0A;h294o-=tCwyv zypej!z{$c5<}bV5&G6#I3xe5@paOAmad=98`SK-J^`L@B^R+jW$G~u1bSp`vAwd9g z1hPZ00Z^9n7by5oOx8mNM7t8?0De9`tUiMky&pe)!Wl}q0Lj6Gt(>Q7aF2pfFbe1k a7#IMPxw=?4U~vQh0000