From 1b9ad3b5694ab87ccd0904482f2a0b7af7656808 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Tue, 14 Jan 2025 01:07:53 -0800 Subject: [PATCH 1/2] make insert and eject datafields in ItemSlotsComponent.cs nullable, make mime PDA silent --- .../Containers/ItemSlot/ItemSlotsComponent.cs | 4 ++-- .../Entities/Objects/Devices/pda.yml | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs index 42e7f721b3e6..29443e284a06 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs @@ -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"); /// /// The name of this item slot. This will be shown to the user in the verb menu. diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index dbd589bbe00c..4bb210f111ae 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -362,11 +362,21 @@ components: - type: Pda id: MimeIDCard - idSlot: # rewrite without sound because mime - name: ID Card + idSlot: + ejectSound: null # mime is silent + insertSound: null + penSlot: + startingItem: Pen # startingitem, priority, whitelist need to be kept or else they're overwritten + priority: -1 whitelist: - components: - - IdCard + tags: + - Write + ejectSound: null + insertSound: null + - type: CartridgeLoader + cartridgeSlot: + ejectSound: null + insertSound: null - type: Appearance appearanceDataInit: enum.PdaVisuals.PdaType: From 74f81af1449fc229b0d5264e5cf441d47201ba64 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Tue, 14 Jan 2025 01:42:52 -0800 Subject: [PATCH 2/2] make it so that you can't fit wirecutters into the slots, among other various things --- .../Prototypes/Entities/Objects/Devices/pda.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 4bb210f111ae..0e8b51cc6a36 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -362,11 +362,22 @@ components: - type: Pda id: MimeIDCard + 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 # startingitem, priority, whitelist need to be kept or else they're overwritten + startingItem: Pen priority: -1 whitelist: tags: @@ -377,6 +388,9 @@ cartridgeSlot: ejectSound: null insertSound: null + whitelist: + components: + - Cartridge - type: Appearance appearanceDataInit: enum.PdaVisuals.PdaType: