diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index 8d5bd45182e..9dcd16e6245 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -12,7 +12,6 @@ loadout-group-hop-shoes = Head of Personnel shoes loadout-group-admin-assistant-head = Administrative Assistant head loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit loadout-group-admin-assistant-outerclothing = Administrative Assistant outer clothing -loadout-group-admin-assistant-headset = Administrative Assistant headset loadout-group-admin-assistant-shoes = Administrative Assistant shoes loadout-group-admin-assistant-gloves = Administrative Assistant gloves diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 6f09cbc1bc9..1d9c07708d3 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -318,10 +318,9 @@ category: Vocal icon: Interface/Emotes/buzz.png whitelist: - requireAll: true components: - BorgChassis - - Vocal + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - buzzing @@ -370,10 +369,9 @@ category: Vocal icon: Interface/Emotes/beep.png whitelist: - requireAll: true components: - BorgChassis - - Vocal + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-beep"] chatTriggers: - beep @@ -387,10 +385,9 @@ category: Vocal icon: Interface/Emotes/chime.png whitelist: - requireAll: true components: - BorgChassis - - Vocal + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-chime"] chatTriggers: - chime @@ -404,10 +401,9 @@ category: Vocal icon: Interface/Emotes/buzztwo.png whitelist: - requireAll: true components: - BorgChassis - - Vocal + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-buzzestwo"] chatTriggers: - buzztwice @@ -427,10 +423,9 @@ category: Vocal icon: Interface/Emotes/ping.png whitelist: - requireAll: true components: - BorgChassis - - Vocal + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-ping"] chatTriggers: - ping diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml index d99c1e3c026..b89f8ae999f 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml @@ -8,13 +8,3 @@ id: AdminAssistantJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtAdminAssistant - -- type: loadout - id: AdminAssistantHeadset - equipment: - ears: ClothingHeadsetAdminAssistant - -- type: loadout - id: AdminAssistantAltHeadset - equipment: - ears: ClothingHeadsetAltAdminAssistant diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index d873d4df00c..ed969f5ae33 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -708,13 +708,6 @@ - WinterCoatBrown - CorporateJacket -- type: loadoutGroup - id: AdminAssistantEar - name: loadout-group-admin-assistant-headset - loadouts: - - AdminAssistantHeadset - - AdminAssistantAltHeadset - - type: loadoutGroup id: AdminAssistantGloves name: loadout-group-admin-assistant-gloves diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 3f96b614927..41fdec5d07a 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -132,7 +132,6 @@ - AdminAssistantJumpsuit - AdminAssistantOuter - AdminAssistantShoes - - AdminAssistantEar - AdminAssistantGloves - CommonBackpack - Glasses diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml index f92e3094bf7..84c1ce806ec 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml @@ -28,6 +28,7 @@ id: AdminAssistantPDA pocket1: RubberStampAdminAssistant pocket2: AccessConfigurator # To assist with secure closets access configurations / airlock configs should a head need it. + ears: ClothingHeadsetAdminAssistant storage: back: - Flash diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml index 880b324c89f..11629cc8773 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml @@ -66,6 +66,8 @@ 90: 0.5 120: 0.3 - type: SiliconDownOnDead + - type: Deathgasp + prototype: SiliconDeathgasp - type: Inventory templateId: ipc - type: GuideHelp diff --git a/Resources/Prototypes/_EE/Voice/speech_emotes.yml b/Resources/Prototypes/_EE/Voice/speech_emotes.yml index a499cc071a9..c770d5114e2 100644 --- a/Resources/Prototypes/_EE/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EE/Voice/speech_emotes.yml @@ -3,13 +3,12 @@ name: chat-emote-name-deathgasp icon: Interface/Emotes/deathgasp.png chatMessages: ["chat-emote-msg-deathgasp-silicon"] - chatTriggers: - - sdeathgasp - type: emote id: Boop name: chat-emote-name-boop category: Vocal + available: false chatMessages: [ boops ] chatTriggers: - boops @@ -17,6 +16,7 @@ - type: emote id: Whirr # uncategorized as it is generic name: chat-emote-name-whirr + available: false chatMessages: [ whirrs ] chatTriggers: - - whirrs \ No newline at end of file + - whirrs