diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs index 424d94a1ef..522929a3c5 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs @@ -198,5 +198,11 @@ namespace Content.Shared.Containers.ItemSlots // Convenience properties public bool HasItem => ContainerSlot?.ContainedEntity != null; public EntityUid? Item => ContainerSlot?.ContainedEntity; + + /// + /// Priority for use with the eject & insert verbs for this slot. + /// + [DataField("priority")] + public int Priority = 0; } } diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index 47a0474e36..e4583eb1e1 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -431,6 +431,7 @@ namespace Content.Shared.Containers.ItemSlots verb.Text = Loc.GetString(slot.EjectVerbText); } + verb.Priority = slot.Priority; args.Verbs.Add(verb); } } @@ -462,6 +463,7 @@ namespace Content.Shared.Containers.ItemSlots else takeVerb.Text = Loc.GetString(slot.EjectVerbText); + takeVerb.Priority = slot.Priority; args.Verbs.Add(takeVerb); } @@ -500,6 +502,7 @@ namespace Content.Shared.Containers.ItemSlots insertVerb.Text = verbSubject; } + insertVerb.Priority = slot.Priority; args.Verbs.Add(insertVerb); } } diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 4186dd90d4..81b4f41fde 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -53,6 +53,7 @@ - type: PDA penSlot: startingItem: Pen + priority: -1 whitelist: tags: - Write @@ -177,11 +178,10 @@ - type: PDA id: ClownIDCard penSlot: - startingItem: CrayonOrange # no pink crayon?!? - # Maybe this is a bad idea. - # At least they can't just spam alt-click it. - # You need to remove the ID & alternate between inserting and ejecting + startingItem: CrayonOrange # no pink crayon?!? + # ^ Still unacceptable. ejectSound: /Audio/Items/bikehorn.ogg + priority: -1 whitelist: tags: - Write @@ -365,6 +365,7 @@ id: CaptainIDCard penSlot: startingItem: PenCap + priority: -1 whitelist: tags: - Write @@ -385,6 +386,7 @@ id: HoPIDCard penSlot: startingItem: PenHop + priority: -1 whitelist: tags: - Write @@ -410,7 +412,6 @@ - type: Icon state: pda-ce - - type: entity parent: BasePDA id: EngineerPDA