Extra mapping stuff for justice rework (#6397)

* Banner

* Beacons

* Warp

* Gun safe stuff

Resources/Locale/en-US/_DV/navmap-beacons/station-beacons.ftl

@@ -55,3 +55,6 @@ station-beacon-clerk = Clerk
 station-beacon-attorney = Attorney
 station-beacon-marshal = Marshal
 station-beacon-justice-armory = Justice Armory
+station-beacon-evidence-room = Evidence Room
+station-beacon-holding-cells = Holding Cells
+station-beacon-genpop = GenPop

Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml

@@ -158,3 +158,54 @@
     containers:
       entity_storage: !type:NestedSelector
         tableId: FillLockerDetective
+
+# Non-lethal armory
+
+- type: entity
+  parent: SecurityGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeNonlethalHandgunSecureFilledDV
+  suffix: Armory, Marshal, JusticeWarden, Locked, Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: NonLethalMK58
+        rolls: !type:ConstantNumberSelector
+          value: 4
+
+- type: entityTable
+  id: NonLethalMK58
+  table: !type:AllSelector
+    children:
+    - id: WeaponPistolMk58Nonlethal
+    - id: MagazinePistolRubber
+      amount: 2
+
+- type: entity
+  parent: JusticeGunSafeNonLethalShotgunSecureDV
+  id: JusticeGunSafeNonLethalShotgunSecureFilledDV
+  suffix: Armory, Marshal, JusticeWarden, Locked, Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: NonLethalKammerer
+        rolls: !type:ConstantNumberSelector
+          value: 2
+
+- type: entityTable
+  id: NonLethalKammerer
+  table: !type:AllSelector
+    children:
+    - id: WeaponShotgunKammererNonLethal
+    - id: BoxBeanbag
+
+- type: entity
+  parent: JusticeGunSafeDisablerSecureDV
+  id: JusticeGunSafeDisablerSecureFilledDV
+  suffix: Armory, Marshal, JusticeWarden, Locked, Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeDisabler

Resources/Prototypes/_DV/Catalog/Fills/Lockers/security.yml

@@ -177,14 +177,10 @@
     access: [["Security"]]
   - type: EntityTableContainerFill
     containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: WeaponShotgunKammererNonLethal
-          amount: 2
-        - id: BoxBeanbag
-          amount: 2
-        - id: BoxShotgunPractice
-          amount: 2
+      entity_storage: !type:NestedSelector
+        tableId: NonLethalKammerer
+        rolls: !type:ConstantNumberSelector
+          value: 2
 
 - type: entity
   parent: SecurityGunSafeBaseSecureDV

Resources/Prototypes/_DV/Entities/Markers/warp_point.yml

@@ -114,6 +114,14 @@
   - type: WarpPoint
     location: Armorer
 
+- type: entity
+  parent: WarpPoint
+  id: WarpPointArmory
+  suffix: Armory
+  components:
+  - type: WarpPoint
+    location: Armory
+
 # Justice
 - type: entity
   id: WarpPointCourt
@@ -155,6 +163,22 @@
   - type: WarpPoint
     location: Marshal
 
+- type: entity
+  parent: WarpPoint
+  id: WarpPointNonLethalArmory
+  suffix: Non-lethal Armory
+  components:
+  - type: WarpPoint
+    location: Non-lethal armory
+
+- type: entity
+  parent: WarpPoint
+  id: WarpPointGenPop
+  suffix: GenPop
+  components:
+  - type: WarpPoint
+    location: GenPop
+
 #Medical
 - type: entity
   parent: WarpPointNoBomb

Resources/Prototypes/_DV/Entities/Objects/Devices/station_beacon.yml

@@ -337,3 +337,27 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-justice-armory
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconEvidenceRoom
+  suffix: Evidence Room
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-evidence-room
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconHoldingCells
+  suffix: Holding Cells
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-holding-cells
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconGenPop
+  suffix: GenPop
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-genpop

Resources/Prototypes/_DV/Entities/Structures/Decoration/banners.yml

@@ -0,0 +1,9 @@
+- type: entity
+  parent: BannerBase
+  id: BannerJustice
+  name: justice banner
+  description: A banner displaying the color of the justice department. Where court hearings happen... probably.
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/banner.rsi # TODO: Resprite. Upstream security banner as placeholder.
+    state: banner_security

Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -410,6 +410,77 @@
   - type: AccessReader
     access: [["Armory"]]
 
+- type: entity
+  parent: SecurityGunSafeNonlethalDV
+  id: JusticeGunSafeNonlethalDV
+  suffix: Justice variant
+  #components:
+  #- type: Sprite # TODO: Resprite to justice colors.
+  #  sprite: _DV/Structures/Storage/Closets/nonlethalsafe.rsi
+  #  noRot: true
+
+- type: entity
+  parent: JusticeGunSafeNonlethalDV
+  id: JusticeGunSafeNonlethalSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
+
+- type: entity
+  parent: SecurityGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeNonlethalHandgunDV
+  suffix: Justice variant
+  #components:
+  #- type: Sprite # TODO: Resprite to justice colors.
+  #  sprite: _DV/Structures/Storage/Closets/disablersafe.rsi
+  #  noRot: true
+
+- type: entity
+  parent: SecurityGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeNonlethalHandgunSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
+
+- type: entity
+  parent: SecurityGunSafeNonlethalDV
+  id: JusticeGunSafeNonLethalShotgunDV
+  name: non-lethal shotgun safe
+  suffix: Justice variant
+  components:
+  #- type: Sprite # TODO: Resprite to justice colors.
+  #  sprite: _DV/Structures/Storage/Closets/nonlethalsafe.rsi
+  #  noRot: true
+  - type: EntityStorageVisuals
+    stateDoorClosed: shotgun
+
+- type: entity
+  parent: JusticeGunSafeNonLethalShotgunDV
+  id: JusticeGunSafeNonLethalShotgunSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
+
+- type: entity
+  parent: JusticeGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeDisablerDV
+  name: disabler safe
+  suffix: Justice variant
+  components:
+  - type: EntityStorageVisuals
+    stateDoorClosed: disabler
+
+- type: entity
+  parent: JusticeGunSafeDisablerDV
+  id: JusticeGunSafeDisablerSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
+
 # Evac pod
 - type: entity
   parent: LockerBase