From 6b075a86cf94822f96e4e459235851d1b8ce9d6c Mon Sep 17 00:00:00 2001 From: Spielern Date: Tue, 4 Feb 2025 09:50:05 -0500 Subject: [PATCH 01/12] cryopod fix, enabled flashes, & hides dummy --- Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml | 3 ++- .../Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml index 5215fac5179..880b324c89f 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml @@ -108,9 +108,10 @@ name: Urist McPositronic parent: MobHumanDummy id: MobIPCDummy + categories: [ HideSpawnMenu ] # Goobstation description: A dummy IPC meant to be used in character setup. components: - type: HumanoidAppearance species: IPC - type: Inventory - templateId: ipc \ No newline at end of file + templateId: ipc diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml index 89b3ae2c09b..827c801ebd3 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml @@ -150,6 +150,9 @@ sprite: "Effects/creampie.rsi" state: "creampie_human" visible: false + - type: CanEnterCryostorage # Goobstation + - type: StatusIcon # Goobstation + bounds: -0.5,-0.5,0.5,0.5 #- type: Bloodstream This is left commented out because it's not necessary for a robot, but you may want it. # damageBleedModifiers: BloodlossIPC # bloodReagent: Oil @@ -299,6 +302,7 @@ - Pacified # - PsionicsDisabled # - PsionicallyInsulated + - Flashed # Goobstation - type: Blindable - type: FireVisuals alternateState: Standing From 5982a6235df7924599d02adb11db7d10cc19ea20 Mon Sep 17 00:00:00 2001 From: Spielern Date: Tue, 4 Feb 2025 14:53:35 -0500 Subject: [PATCH 02/12] fixes IPC emotes and admin assistant headset --- .../Mobs/Cyborgs/base_borg_chassis.yml | 1 + Resources/Prototypes/Voice/speech_emotes.yml | 30 ++++--------------- .../Jobs/Command/administrative_assistant.yml | 1 + .../_EE/Entities/Mobs/Player/ipc.yml | 2 ++ .../Prototypes/_EE/Voice/speech_emotes.yml | 18 ++++++----- 5 files changed, 19 insertions(+), 33 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 05165a1b4d2..39505d7fae9 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -153,6 +153,7 @@ - type: Speech speechVerb: Robotic speechSounds: Borg + allowedEmotes: ['Buzz', 'Beep', 'Chime', 'Buzz-Two', 'Ping'] - type: Vocal sounds: Unsexed: UnisexSilicon diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 6f09cbc1bc9..11c8e432d77 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -317,11 +317,7 @@ name: chat-emote-name-buzz category: Vocal icon: Interface/Emotes/buzz.png - whitelist: - requireAll: true - components: - - BorgChassis - - Vocal + available: false chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - buzzing @@ -369,11 +365,7 @@ name: chat-emote-name-beep category: Vocal icon: Interface/Emotes/beep.png - whitelist: - requireAll: true - components: - - BorgChassis - - Vocal + available: false chatMessages: ["chat-emote-msg-beep"] chatTriggers: - beep @@ -386,11 +378,7 @@ name: chat-emote-name-chime category: Vocal icon: Interface/Emotes/chime.png - whitelist: - requireAll: true - components: - - BorgChassis - - Vocal + available: false chatMessages: ["chat-emote-msg-chime"] chatTriggers: - chime @@ -403,11 +391,7 @@ name: chat-emote-name-buzztwo category: Vocal icon: Interface/Emotes/buzztwo.png - whitelist: - requireAll: true - components: - - BorgChassis - - Vocal + available: false chatMessages: ["chat-emote-msg-buzzestwo"] chatTriggers: - buzztwice @@ -426,11 +410,7 @@ name: chat-emote-name-ping category: Vocal icon: Interface/Emotes/ping.png - whitelist: - requireAll: true - components: - - BorgChassis - - Vocal + available: false chatMessages: ["chat-emote-msg-ping"] chatTriggers: - ping diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml index f92e3094bf7..89baf906d93 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: ClothingHeadsetAdminAsssitant 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..ee2a5dd85de 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: Speech + allowedEmotes: ['Boop', 'Whirr', 'Buzz', 'Beep', 'Chime', 'Buzz-Two', 'Ping'] - 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..0ffb5ac2775 100644 --- a/Resources/Prototypes/_EE/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EE/Voice/speech_emotes.yml @@ -1,15 +1,16 @@ -- type: emote - id: SiliconDeathgasp - name: chat-emote-name-deathgasp - icon: Interface/Emotes/deathgasp.png - chatMessages: ["chat-emote-msg-deathgasp-silicon"] - chatTriggers: - - sdeathgasp +# - type: emote +# id: SiliconDeathgasp +# 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 +18,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 From c280858e99abe6bf63483073b2f17692f0ab3b92 Mon Sep 17 00:00:00 2001 From: Spielern Date: Tue, 4 Feb 2025 15:06:34 -0500 Subject: [PATCH 03/12] fix typo Signed-off-by: Spielern --- .../_DV/Roles/Jobs/Command/administrative_assistant.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml index 89baf906d93..84c1ce806ec 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml @@ -28,7 +28,7 @@ id: AdminAssistantPDA pocket1: RubberStampAdminAssistant pocket2: AccessConfigurator # To assist with secure closets access configurations / airlock configs should a head need it. - ears: ClothingHeadsetAdminAsssitant + ears: ClothingHeadsetAdminAssistant storage: back: - Flash From 4c26a92404cc1378173dce1b77a293e56842c725 Mon Sep 17 00:00:00 2001 From: Spielern Date: Tue, 4 Feb 2025 15:18:41 -0500 Subject: [PATCH 04/12] Delta-V comments Signed-off-by: Spielern --- Resources/Prototypes/Voice/speech_emotes.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 11c8e432d77..2c4522a57e2 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -317,7 +317,7 @@ name: chat-emote-name-buzz category: Vocal icon: Interface/Emotes/buzz.png - available: false + available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - buzzing @@ -365,7 +365,7 @@ name: chat-emote-name-beep category: Vocal icon: Interface/Emotes/beep.png - available: false + available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml chatMessages: ["chat-emote-msg-beep"] chatTriggers: - beep @@ -378,7 +378,7 @@ name: chat-emote-name-chime category: Vocal icon: Interface/Emotes/chime.png - available: false + available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml chatMessages: ["chat-emote-msg-chime"] chatTriggers: - chime @@ -391,7 +391,7 @@ name: chat-emote-name-buzztwo category: Vocal icon: Interface/Emotes/buzztwo.png - available: false + available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml chatMessages: ["chat-emote-msg-buzzestwo"] chatTriggers: - buzztwice @@ -410,7 +410,7 @@ name: chat-emote-name-ping category: Vocal icon: Interface/Emotes/ping.png - available: false + available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml chatMessages: ["chat-emote-msg-ping"] chatTriggers: - ping From 0fc0e7f1f7460f8f8d663d744dfccda6436208ad Mon Sep 17 00:00:00 2001 From: Spielern Date: Tue, 4 Feb 2025 15:53:03 -0500 Subject: [PATCH 05/12] Uncomments IPC deathgasp Signed-off-by: Spielern --- Resources/Prototypes/_EE/Voice/speech_emotes.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_EE/Voice/speech_emotes.yml b/Resources/Prototypes/_EE/Voice/speech_emotes.yml index 0ffb5ac2775..c770d5114e2 100644 --- a/Resources/Prototypes/_EE/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EE/Voice/speech_emotes.yml @@ -1,10 +1,8 @@ -# - type: emote -# id: SiliconDeathgasp -# name: chat-emote-name-deathgasp -# icon: Interface/Emotes/deathgasp.png -# chatMessages: ["chat-emote-msg-deathgasp-silicon"] -# chatTriggers: -# - sdeathgasp +- type: emote + id: SiliconDeathgasp + name: chat-emote-name-deathgasp + icon: Interface/Emotes/deathgasp.png + chatMessages: ["chat-emote-msg-deathgasp-silicon"] - type: emote id: Boop From d8aae203af16982c93811523c27c9cb7fca29d6f Mon Sep 17 00:00:00 2001 From: Spielern Date: Tue, 4 Feb 2025 15:54:12 -0500 Subject: [PATCH 06/12] Adds deathgasp to IPCs Signed-off-by: Spielern --- Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml index ee2a5dd85de..dbc6a7f23be 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml @@ -68,6 +68,8 @@ - type: SiliconDownOnDead - type: Speech allowedEmotes: ['Boop', 'Whirr', 'Buzz', 'Beep', 'Chime', 'Buzz-Two', 'Ping'] + - type: Deathgasp + prototype: SiliconDeathgasp - type: Inventory templateId: ipc - type: GuideHelp From 001e29d205555652bc6ced47c0841b10ffb2d54c Mon Sep 17 00:00:00 2001 From: Spielern Date: Tue, 4 Feb 2025 23:53:52 -0500 Subject: [PATCH 07/12] removes AA headset loadout options --- .../Locale/en-US/_DV/preferences/loadout-groups.ftl | 1 - .../Loadouts/Jobs/Command/administrative_assistant.yml | 10 ---------- Resources/Prototypes/_DV/Loadouts/loadout_groups.yml | 7 ------- Resources/Prototypes/_DV/Loadouts/role_loadouts.yml | 1 - .../Roles/Jobs/Command/administrative_assistant.yml | 2 +- 5 files changed, 1 insertion(+), 20 deletions(-) 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/_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 89baf906d93..84c1ce806ec 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml @@ -28,7 +28,7 @@ id: AdminAssistantPDA pocket1: RubberStampAdminAssistant pocket2: AccessConfigurator # To assist with secure closets access configurations / airlock configs should a head need it. - ears: ClothingHeadsetAdminAsssitant + ears: ClothingHeadsetAdminAssistant storage: back: - Flash From f2595c4e72b6d6e01cf7e63b5577f2878690bb4d Mon Sep 17 00:00:00 2001 From: Spielern Date: Wed, 5 Feb 2025 14:03:09 -0500 Subject: [PATCH 08/12] returns to whitelist and adds IPCs Signed-off-by: Spielern --- Resources/Prototypes/Voice/speech_emotes.yml | 25 ++++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 2c4522a57e2..4f8d23507e9 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -317,7 +317,10 @@ name: chat-emote-name-buzz category: Vocal icon: Interface/Emotes/buzz.png - available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml + whitelist: + components: + - BorgChassis + - Silicon # Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - buzzing @@ -365,7 +368,10 @@ name: chat-emote-name-beep category: Vocal icon: Interface/Emotes/beep.png - available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml + whitelist: + components: + - BorgChassis + - Silicon # Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-beep"] chatTriggers: - beep @@ -378,7 +384,10 @@ name: chat-emote-name-chime category: Vocal icon: Interface/Emotes/chime.png - available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml + whitelist: + components: + - BorgChassis + - Silicon # Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-chime"] chatTriggers: - chime @@ -391,7 +400,10 @@ name: chat-emote-name-buzztwo category: Vocal icon: Interface/Emotes/buzztwo.png - available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml + whitelist: + components: + - BorgChassis + - Silicon # Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-buzzestwo"] chatTriggers: - buzztwice @@ -410,7 +422,10 @@ name: chat-emote-name-ping category: Vocal icon: Interface/Emotes/ping.png - available: false # DeltaV - Old whitelist replaced with allowedEmotes in ipc.yml and base_borg_chassis.yml + whitelist: + components: + - BorgChassis + - Silicon # Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-ping"] chatTriggers: - ping From 1a41f17be4f65a9ddcf93741d7b9b62ce63f8d6c Mon Sep 17 00:00:00 2001 From: Spielern Date: Wed, 5 Feb 2025 14:05:03 -0500 Subject: [PATCH 09/12] DeltaV comments Signed-off-by: Spielern --- Resources/Prototypes/Voice/speech_emotes.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 4f8d23507e9..1d9c07708d3 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -320,7 +320,7 @@ whitelist: components: - BorgChassis - - Silicon # Removes 'requireAll' component and adds IPCs to whitelist + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - buzzing @@ -371,7 +371,7 @@ whitelist: components: - BorgChassis - - Silicon # Removes 'requireAll' component and adds IPCs to whitelist + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-beep"] chatTriggers: - beep @@ -387,7 +387,7 @@ whitelist: components: - BorgChassis - - Silicon # Removes 'requireAll' component and adds IPCs to whitelist + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-chime"] chatTriggers: - chime @@ -403,7 +403,7 @@ whitelist: components: - BorgChassis - - Silicon # Removes 'requireAll' component and adds IPCs to whitelist + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-buzzestwo"] chatTriggers: - buzztwice @@ -425,7 +425,7 @@ whitelist: components: - BorgChassis - - Silicon # Removes 'requireAll' component and adds IPCs to whitelist + - Silicon # DeltaV - Removes 'requireAll' component and adds IPCs to whitelist chatMessages: ["chat-emote-msg-ping"] chatTriggers: - ping From b5c6d151c6496530b33623992dfe66732ae8cac4 Mon Sep 17 00:00:00 2001 From: Spielern Date: Wed, 5 Feb 2025 14:05:38 -0500 Subject: [PATCH 10/12] removes allowedEmotes Signed-off-by: Spielern --- Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 39505d7fae9..05165a1b4d2 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -153,7 +153,6 @@ - type: Speech speechVerb: Robotic speechSounds: Borg - allowedEmotes: ['Buzz', 'Beep', 'Chime', 'Buzz-Two', 'Ping'] - type: Vocal sounds: Unsexed: UnisexSilicon From fea70e9ab52d3e67092f5b7a0f39a3d506429f0a Mon Sep 17 00:00:00 2001 From: Spielern Date: Wed, 5 Feb 2025 14:06:17 -0500 Subject: [PATCH 11/12] removes allowedEmotes Signed-off-by: Spielern --- Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml index dbc6a7f23be..11629cc8773 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml @@ -66,8 +66,6 @@ 90: 0.5 120: 0.3 - type: SiliconDownOnDead - - type: Speech - allowedEmotes: ['Boop', 'Whirr', 'Buzz', 'Beep', 'Chime', 'Buzz-Two', 'Ping'] - type: Deathgasp prototype: SiliconDeathgasp - type: Inventory From fd99726858da292b308edfcc85e438407fadb8b7 Mon Sep 17 00:00:00 2001 From: Spielern Date: Thu, 6 Feb 2025 00:47:26 -0500 Subject: [PATCH 12/12] re-adds 'Speech' type for integration test Signed-off-by: Spielern --- Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml index 11629cc8773..a5922336c80 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml @@ -66,6 +66,7 @@ 90: 0.5 120: 0.3 - type: SiliconDownOnDead + - type: Speech - type: Deathgasp prototype: SiliconDeathgasp - type: Inventory