Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More IPC Fixes #2886

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
+11 −32
Open

More IPC Fixes #2886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6b075a8
cryopod fix, enabled flashes, & hides dummy
Spielern Feb 4, 2025
42321ff
Merge branch 'more-ipc-fixes' of https://github.com/Spielern/ipc-ops …
Spielern Feb 4, 2025
5982a62
fixes IPC emotes and admin assistant headset
Spielern Feb 4, 2025
c280858
fix typo
Spielern Feb 4, 2025
4c26a92
Delta-V comments
Spielern Feb 4, 2025
0fc0e7f
Uncomments IPC deathgasp
Spielern Feb 4, 2025
d8aae20
Adds deathgasp to IPCs
Spielern Feb 4, 2025
001e29d
removes AA headset loadout options
Spielern Feb 5, 2025
ab42deb
Merge branch 'more-ipc-fixes' of https://github.com/Spielern/ipc-ops …
Spielern Feb 5, 2025
f2595c4
returns to whitelist and adds IPCs
Spielern Feb 5, 2025
1a41f17
DeltaV comments
Spielern Feb 5, 2025
b5c6d15
removes allowedEmotes
Spielern Feb 5, 2025
fea70e9
removes allowedEmotes
Spielern Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 5 additions & 10 deletions Resources/Prototypes/Voice/speech_emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/_DV/Loadouts/Jobs/Command/administrative_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,3 @@
id: AdminAssistantJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtAdminAssistant

- type: loadout
id: AdminAssistantHeadset
equipment:
ears: ClothingHeadsetAdminAssistant

- type: loadout
id: AdminAssistantAltHeadset
equipment:
ears: ClothingHeadsetAltAdminAssistant
7 changes: 0 additions & 7 deletions Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
- AdminAssistantJumpsuit
- AdminAssistantOuter
- AdminAssistantShoes
- AdminAssistantEar
- AdminAssistantGloves
- CommonBackpack
- Glasses
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Spielern marked this conversation as resolved.
Show resolved Hide resolved
storage:
back:
- Flash
2 changes: 2 additions & 0 deletions Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
90: 0.5
120: 0.3
- type: SiliconDownOnDead
- type: Deathgasp
prototype: SiliconDeathgasp
- type: Inventory
templateId: ipc
- type: GuideHelp
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/_EE/Voice/speech_emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
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

- type: emote
id: Whirr # uncategorized as it is generic
name: chat-emote-name-whirr
available: false
chatMessages: [ whirrs ]
chatTriggers:
- whirrs
- whirrs
Loading