Took Too Long (#4062)

Co-authored-by: starch <starchpersonal@gmail.com>
2026-05-26 10:48:08 -04:00
parent 1bb7795d60
commit 38bd45f966
12 changed files with 8 additions and 91 deletions
@@ -52,11 +52,6 @@ namespace Content.Client.PDA
                SendPredictedMessage(new ItemSlotButtonPressedEvent(PdaComponent.PdaPaiSlotId));
            };

-            _menu.EjectBookButton.OnPressed += _ =>
-            {
-                SendMessage(new ItemSlotButtonPressedEvent(PdaComponent.PdaBookSlotId));
-            };
-
            _menu.ActivateMusicButton.OnPressed += _ =>
            {
                SendMessage(new PdaShowMusicMessage());
@@ -19,7 +19,6 @@

        <pda:PdaNavigationButton Name="FlashLightToggleButton" Access="Public" ToggleMode="True" ActiveFgColor="#EAEFBB" SetWidth="32"/>
        <pda:PdaNavigationButton Name="EjectPenButton" Access="Public" SetWidth="32"/>
-        <pda:PdaNavigationButton Name="EjectBookButton" Access="Public" SetWidth="32"/>
        <pda:PdaNavigationButton Name="EjectIdButton" Access="Public" SetWidth="32"/>
        <pda:PdaNavigationButton Name="EjectPaiButton" Access="Public" SetWidth="32"/>
    </BoxContainer>
@@ -53,7 +53,6 @@ namespace Content.Client.PDA
            HomeButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/home.png"));
            FlashLightToggleButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/light.png"));
            EjectPenButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/pencil.png"));
-            EjectBookButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/gavel.png"));
            EjectIdButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/eject.png"));
            EjectPaiButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/pai.png"));
            ProgramCloseButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/Nano/cross.svg.png"));
@@ -106,7 +106,7 @@ namespace Content.Server.PDA

        protected override void OnItemRemoved(EntityUid uid, PdaComponent pda, EntRemovedFromContainerMessage args)
        {
-            if (args.Container.ID != pda.IdSlot.ID && args.Container.ID != pda.PenSlot.ID && args.Container.ID != pda.PaiSlot.ID && args.Container.ID != pda.BookSlot.ID)
+            if (args.Container.ID != pda.IdSlot.ID && args.Container.ID != pda.PenSlot.ID && args.Container.ID != pda.PaiSlot.ID)
                return;

            // TODO: This is super cursed just use compstates please.
@@ -227,7 +227,6 @@ namespace Content.Server.PDA
                pda.FlashlightOn,
                pda.PenSlot.HasItem,
                pda.PaiSlot.HasItem,
-                pda.BookSlot.HasItem,
                new PdaIdInfoText
                {
                    ActualOwnerName = pda.OwnerName,
@@ -12,7 +12,6 @@ namespace Content.Shared.PDA
        public const string PdaIdSlotId = "PDA-id";
        public const string PdaPenSlotId = "PDA-pen";
        public const string PdaPaiSlotId = "PDA-pai";
-        public const string PdaBookSlotId = "PDA-book";

        [DataField("idSlot")]
        public ItemSlot IdSlot = new();
@@ -23,9 +22,6 @@ namespace Content.Shared.PDA
        [DataField("paiSlot")]
        public ItemSlot PaiSlot = new();

-        [DataField("bookSlot")]
-        public ItemSlot BookSlot = new();
-
        // Really this should just be using ItemSlot.StartingItem. However, seeing as we have so many different starting
        // PDA's and no nice way to inherit the other fields from the ItemSlot data definition, this makes the yaml much
        // nicer to read.
@@ -11,7 +11,6 @@ namespace Content.Shared.PDA
        public bool FlashlightEnabled;
        public bool HasPen;
        public bool HasPai;
-        public bool HasBook;
        public PdaIdInfoText PdaOwnerInfo;
        public string? StationName;
        public bool HasUplink;
@@ -26,7 +25,6 @@ namespace Content.Shared.PDA
            bool flashlightEnabled,
            bool hasPen,
            bool hasPai,
-            bool hasBook,
            PdaIdInfoText pdaOwnerInfo,
            int balance, // Frontier
            string? ownedShipName, // Frontier
@@ -39,7 +37,6 @@ namespace Content.Shared.PDA
            FlashlightEnabled = flashlightEnabled;
            HasPen = hasPen;
            HasPai = hasPai;
-            HasBook = hasBook;
            PdaOwnerInfo = pdaOwnerInfo;
            HasUplink = hasUplink;
            CanPlayMusic = canPlayMusic;
@@ -29,7 +29,6 @@ namespace Content.Shared.PDA
            ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaIdSlotId, pda.IdSlot);
            ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaPenSlotId, pda.PenSlot);
            ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaPaiSlotId, pda.PaiSlot);
-            ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaBookSlotId, pda.BookSlot);

            UpdatePdaAppearance(uid, pda);
        }
@@ -39,7 +38,6 @@ namespace Content.Shared.PDA
            ItemSlotsSystem.RemoveItemSlot(uid, pda.IdSlot);
            ItemSlotsSystem.RemoveItemSlot(uid, pda.PenSlot);
            ItemSlotsSystem.RemoveItemSlot(uid, pda.PaiSlot);
-            ItemSlotsSystem.RemoveItemSlot(uid, pda.BookSlot);
        }

        protected virtual void OnItemInserted(EntityUid uid, PdaComponent pda, EntInsertedIntoContainerMessage args)
@@ -38,15 +38,6 @@
      whitelist:
        tags:
        - Write
-    # Frontier: space law slot
-    bookSlot:
-      startingItem: HyperlinkBookSpaceLaw
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
-    # End Frontier: space law slot
    idSlot:
      name: access-id-card-component-default
      ejectSound: /Audio/Machines/id_swipe.ogg
@@ -62,7 +53,6 @@
      PDA-id: !type:ContainerSlot {}
      PDA-pen: !type:ContainerSlot {}
      PDA-pai: !type:ContainerSlot {}
-      PDA-book: !type:ContainerSlot {} # Frontier
      Cartridge-Slot: !type:ContainerSlot {}
      program-container: !type:Container
  - type: ItemSlots
@@ -17,6 +17,7 @@
  id: HyperlinkBookSpaceLaw
  name: space law
  description: A big book of laws for space courts.
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Nyanotrasen/Objects/Misc/books.rsi
@@ -34,6 +35,7 @@
  id: HyperlinkBookNfsdSop
  name: TSFMC SOP manual
  description: A book defining TSFMC standard operating procedures.
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Nyanotrasen/Objects/Misc/books.rsi
@@ -159,13 +159,6 @@
  components:
  - type: Pda
    id: TsfEngiIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -123,13 +123,6 @@
  components:
  - type: Pda
    id: ShriffIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
    penSlot:
      startingItem: PenCentcom
      priority: -1
@@ -163,13 +156,6 @@
  components:
  - type: Pda
    id: CadetIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -188,13 +174,6 @@
  components:
  - type: Pda
    id: DeputyIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -213,13 +192,6 @@
  components:
  - type: Pda
    id: BrigmedicNFIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -238,13 +210,6 @@
  components:
  - type: Pda
    id: SergeantIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -263,13 +228,6 @@
  components:
  - type: Pda
    id: BailiffIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -288,13 +246,6 @@
  components:
  - type: Pda
    id: NFDetectiveIDCard
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -319,13 +270,6 @@
      whitelist:
        tags:
        - Write
-    bookSlot: # Frontier
-      startingItem: HyperlinkBookNfsdSop
-      priority: -2
-      whitelist:
-        tags:
-        - BookSpaceLaw
-        - BookNfsdSop
  - type: Appearance
    appearanceDataInit:
      enum.PdaVisuals.PdaType:
@@ -32,3 +32,8 @@ Magazine90mm: 90mmMagazineHE
 ShipCyrexaProjectile: 220mmBulletAPHE
 ShipBoforsProjectile: 255mmBulletAPHE

+# Hyperlink books
+
+HyperlinkBookSpaceLaw: null
+HyperlinkBookNfsdSop: null
+