From: Entvari <195642967+Entvari@users.noreply.github.com> Date: Sun, 20 Apr 2025 21:38:30 +0000 (+0100) Subject: Wizard Headset (#35732) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=dee1db4113e7355dc0d6b113aad68cfe32449c81;p=space-station-14.git 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 --- 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 0000000000..5edd6b5794 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/equipped-EARS.png new file mode 100644 index 0000000000..48bf52378c Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon.png new file mode 100644 index 0000000000..519219cfa6 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon.png differ 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 0000000000..95f4f5a8e7 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json new file mode 100644 index 0000000000..4478127785 --- /dev/null +++ b/Resources/Textures/Clothing/Ears/Headsets/wizard.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite recoloured from Freelance Headsets by Entvari (Github). Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_alt" + }, + { + "name": "equipped-EARS", + "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 + } + ] +}