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

Make Mime PDA interactions silent #34426

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Make Mime PDA interactions silent #34426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b9ad3b
make insert and eject datafields in ItemSlotsComponent.cs nullable, m…
ArtisticRoomba Jan 14, 2025
74f81af
make it so that you can't fit wirecutters into the slots, among other…
ArtisticRoomba Jan 14, 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
4 changes: 2 additions & 2 deletions Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ public ItemSlot(ItemSlot other)
public EntityWhitelist? Blacklist;

[DataField]
public SoundSpecifier InsertSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/revolver_magin.ogg");
public SoundSpecifier? InsertSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/revolver_magin.ogg");

[DataField]
public SoundSpecifier EjectSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagOut/revolver_magout.ogg");
public SoundSpecifier? EjectSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagOut/revolver_magout.ogg");

/// <summary>
/// The name of this item slot. This will be shown to the user in the verb menu.
Expand Down
28 changes: 26 additions & 2 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,35 @@
components:
- type: Pda
id: MimeIDCard
idSlot: # rewrite without sound because mime
name: ID Card
paiSlot:
priority: -2
ejectSound: null
insertSound: null
whitelist:
components:
- PAI
idSlot:
name: access-id-card-component-default
ejectSound: null # mime is silent
insertSound: null
whitelist:
components:
- IdCard
penSlot:
startingItem: Pen
priority: -1
whitelist:
tags:
- Write
ejectSound: null
insertSound: null
- type: CartridgeLoader
cartridgeSlot:
ejectSound: null
insertSound: null
whitelist:
components:
- Cartridge
- type: Appearance
appearanceDataInit:
enum.PdaVisuals.PdaType:
Expand Down
Loading