From e44717f2622673463f1a9572e18f810c47234cd3 Mon Sep 17 00:00:00 2001
From: Radezolid <snappednexus@gmail.com>
Date: Tue, 4 Aug 2026 14:45:19 -0300
Subject: [PATCH] Fix Justice Warden's suffixes for mapping (#6393)

* SUFFIXES

* I missed the PDA one.

* Justice warden's shit

* Holopad
---
 Resources/Prototypes/Catalog/Fills/Lockers/security.yml     | 6 +++---
 Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml | 2 +-
 .../Prototypes/Entities/Markers/Spawners/Mobs/pets.yml      | 2 +-
 Resources/Prototypes/Entities/Markers/Spawners/jobs.yml     | 1 +
 Resources/Prototypes/Entities/Objects/Devices/pda.yml       | 1 +
 .../Prototypes/Entities/Objects/Devices/station_beacon.yml  | 2 +-
 .../Entities/Objects/Misc/identification_cards.yml          | 1 +
 Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml | 1 +
 .../Prototypes/Entities/Structures/Machines/holopad.yml     | 2 +-
 .../Entities/Structures/Storage/Closets/Lockers/lockers.yml | 1 +
 Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml  | 2 +-
 Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml   | 1 +
 .../Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml      | 1 +
 .../_DV/Entities/Objects/Misc/identification_cards.yml      | 1 +
 .../Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml   | 2 +-
 .../_DV/Entities/Structures/Machines/faxmachines.yml        | 2 +-
 .../Prototypes/_DV/Entities/Structures/Machines/holopad.yml | 1 +
 .../Entities/Structures/Storage/Closets/Lockers/lockers.yml | 1 +
 .../Structures/Storage/SecureCabinet/secure_cabinets.yml    | 2 +-
 19 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 0d6ebc86a93..1b56896a119 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: LockerWardenFilledHardsuit
-  suffix: Filled, Hardsuit
+  suffix: Filled, Hardsuit, Security # DeltaV - Added security.
   parent: LockerWarden
   components:
   - type: EntityTableContainerFill
@@ -14,7 +14,7 @@
 
 - type: entity
   id: LockerWardenFilled
-  suffix: Filled
+  suffix: Filled, Security # DeltaV - Added security.
   parent: LockerWarden
   components:
   - type: EntityTableContainerFill
@@ -357,7 +357,7 @@
     - id: MagazinePistolSubMachineGunTopMounted
       amount: 4
 
-- type: entity 
+- type: entity
   parent: [SecurityGunSafeBaseSecureDV, BaseSecurityContraband]  # DeltaV - Changed GunSafeBaseSecure with SecurityGunSafeBaseSecureDV
   id: GunSafeLaserCarbine
   name: laser safe
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index b6fc3333674..7d7426680af 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -244,7 +244,7 @@
 - type: entity
   id: SuitStorageWarden
   parent: SuitStorageBase
-  suffix: Warden
+  suffix: Warden, Security # DeltaV - Added security.
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
index f309f70f7b9..f22f79ad5c3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
@@ -162,7 +162,7 @@
   parent: MarkerBase
   id: SpawnMobMcGriff
   name:  McGriff Spawner
-  suffix: Warden or Detective Pet # DeltaV - Change from Warden pet to Warden or Detective pet
+  suffix: Armorer or Detective Pet # DeltaV - Change from Warden pet to Armorer or Detective pet
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 222697de539..8d2ce9906b4 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -456,6 +456,7 @@
   id: SpawnPointWarden
   parent: SpawnPointJobBase
   name: warden
+  suffix: Security # DeltaV
   components:
   - type: SpawnPoint
     job_id: Warden
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 8a967c374c1..797b7ba3422 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -972,6 +972,7 @@
   id: WardenPDA
   name: warden PDA
   description: The OS appears to have been jailbroken.
+  suffix: Security # DeltaV
   components:
   - type: Pda
     id: WardenIDCard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 377ed8df231..f32cbd7efce 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -183,7 +183,7 @@
 - type: entity
   parent: DefaultStationBeaconSecurity
   id: DefaultStationBeaconWardensOffice
-  suffix: Warden's Office
+  suffix: Warden's Office, Security # DeltaV - Added security.
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-warden
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index fa8a51e7fd3..72456a9d728 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -480,6 +480,7 @@
   parent: IDCardStandard
   id: WardenIDCard
   name: warden ID card
+  suffix: Security # DeltaV
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
index a01ce6a3fcc..7e935c6ea33 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -232,6 +232,7 @@
   parent: [RubberStampBase, BaseSecurityContraband]
   id: RubberStampWarden
   categories: [ DoNotMap ]
+  suffix: Security # DeltaV
   components:
   - type: Stamp
     stampedName: stamp-component-stamped-name-warden
diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
index ba6518ee83c..60af9b11ce4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
@@ -703,7 +703,7 @@
 - type: entity
   parent: HolopadSecurity # DeltaV
   id: HolopadSecurityWarden
-  suffix: Warden
+  suffix: Warden, Security # DeltaV - Added security.
   components:
   - type: Label
     currentLabel: holopad-security-warden
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 99ce35286f5..ea9f3ce694c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -339,6 +339,7 @@
   id: LockerWarden
   parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers
   name: warden's locker
+  suffix: Security # DeltaV
   components:
   - type: Appearance
   - type: EntityStorageVisuals
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml
index a5a9ec10811..b3d81393697 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml
@@ -112,7 +112,7 @@
 - type: entity
   parent: LockerJusticeWarden
   id: LockerJusticeWardenFilled
-  suffix: Filled
+  suffix: Filled, Justice
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
index 6779a265187..9a8bd204c3b 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
@@ -221,6 +221,7 @@
   parent: BaseJusticePDA
   id: JusticeWardenPDA
   name: warden PDA
+  suffix: Justice Warden
   description: Covered in cracks and dents. Has seen more than its fair share of abuse.
   components:
   - type: Pda
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml
index 0c12ba3b107..b9d920397e5 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml
@@ -41,6 +41,7 @@
   parent: BedsheetBase
   id: BedsheetJusticeWarden
   name: warden's bedsheet
+  suffix: Justice
   components:
   - type: Sprite # TODO: Resprite
     state: random_bedsheet
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
index 60079efca19..6dadc648823 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
@@ -260,6 +260,7 @@
   parent: IDCardStandard
   id: JusticeWardenIDCard
   name: warden ID card
+  suffix: Justice
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml
index fc9264e4f30..288ac8bb41b 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml
@@ -64,7 +64,7 @@
   id: RubberStampJusticeWarden
   name: warden's rubber stamp
   categories: [ DoNotMap ]
-  suffix: DO NOT MAP
+  suffix: DO NOT MAP, Justice
   description: With a simple press of ink to paper, a life is sealed behind bars. Maybe not forever.
   components:
   - type: Stamp
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml
index c1c5c3b8e73..5ea37f96a1e 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml
@@ -492,7 +492,7 @@
 - type: entity
   parent: FaxMachineBase
   id: FaxMachineWarden
-  suffix: Warden
+  suffix: Warden, Security
   components:
   - type: PageSender
     autoLinkJobs: [Warden]
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml
index 157db7b131b..8baad841df4 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml
@@ -144,6 +144,7 @@
 - type: entity
   parent: Holopad
   id: HolopadJusticeJusticeWarden
+  suffix: Justice Warden
   components:
   - type: Label
     currentLabel: holopad-justice-warden
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index b0e87d2ff1d..fbe446b5f04 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -92,6 +92,7 @@
   parent: LockerJustice
   id: LockerJusticeWarden # TODO - Resprite
   name: warden's locker
+  suffix: Justice
   components:
   - type: AccessReader
     access: [["JusticeWarden"]]
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml
index f5ce95c1a27..beff2adacda 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml
@@ -189,7 +189,7 @@
 - type: entity
   parent: FilledSecureCabinet
   id: SecureCabinetWarden
-  suffix: Warden
+  suffix: Warden, Security
   components:
   - type: AccessReader
     access: [["Armory"]]