Airlocks (#236)

🆑 - add: Ported the Robotics Airlock and some justice stuff
Simple-Station · Feb 12, 2025 · a97ef9a · a97ef9a
1 parent 04a706f
commit a97ef9a
Show file tree

Hide file tree

Showing 63 changed files with 499 additions and 8 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -90,6 +90,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "ChiefJustice",  // DeltaV - Add Chief Justice access
         "Justice",  // DeltaV - Add Justice access
         "Prosecutor", // Delta V - Add Prosecutor access
+        "Clerk", // Delta V - Add Clerk access
     };
 
     [Serializable, NetSerializable]

diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -34,3 +34,4 @@ station-beacon-corpsman = Corpsman
 station-beacon-justice = Justice
 station-beacon-chiefjustice = Chief Justice
 station-beacon-prosecutor = Prosecutor
+station-beacon-clerk = Clerk
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -2,5 +2,6 @@ id-card-access-level-orders = Orders
 id-card-access-level-mantis = Mantis
 id-card-access-level-cj = Chief Justice
 id-card-access-level-prosecutor = Prosecutor
+id-card-access-level-clerk = Clerk
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -47,6 +47,7 @@
   - Justice # DeltaV - Add Justice dept access
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
+  - Clerk # DeltaV - Add Clerk access
   - Corpsman # DeltaV - Add Corpsman access
   - BlueshieldOfficer # Goobstation - Add BSO Access
   - NanotrasenRepresentative # Goobstation - Add NTR Access

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -12,7 +12,7 @@
     ClothingUniformJumpsuitLawyerGood: 1
     ClothingUniformJumpskirtLawyerGood: 1
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetService: 2
+    ClothingHeadsetJustice: 2 # DeltaV - Justice dept
     ClothingNeckLawyerbadge: 2
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
     RubberStampLawyer: 1 # DeltaV

diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml
@@ -9,12 +9,17 @@
 - type: accessLevel
   id: Prosecutor
   name: id-card-access-level-prosecutor
+
+- type: accessLevel
+  id: Clerk
+  name: id-card-access-level-clerk
 
 - type: accessGroup
   id: Justice
   tags:
   - Justice
   - Prosecutor
+  - Clerk
   - ChiefJustice
   - Lawyer
 
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -49,4 +49,5 @@
     - Zookeeper
     - Justice
     - Prosecutor
+    - Clerk
 
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -54,7 +54,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
   - type: Sprite
@@ -73,7 +72,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
       - EncryptionKeyCommand

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
@@ -159,3 +159,11 @@
   components:
   - type: NavMapBeacon
     text: station-beacon-prosecutor
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconClerk
+  suffix: Clerk
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-clerk
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -81,6 +81,24 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockJustice
+  id: AirlockClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockClerkGlassLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 # Maintenance
 - type: entity
   parent: AirlockMaint
@@ -109,6 +127,15 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 - type: entity
   parent: AirlockSecurity
   id: AirlockCorpsmanLocked

diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -8,6 +8,14 @@
   - type: PaintableAirlock
     department: Justice
 
+- type: entity
+  parent: AirlockScience
+  id: AirlockRobotics
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi
+
 # Glass
 
 - type: entity
@@ -20,3 +28,10 @@
   - type: PaintableAirlock
     department: Justice
 
+- type: entity
+  parent: AirlockScienceGlass
+  id: AirlockRoboticsGlass
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -0,0 +1,18 @@
+#Roboticist - Delta-V Creation
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyRoboticist
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi 
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyRoboticistGlass
+  suffix: Robotics, Glass
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi 
+    state: "assembly"
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -49,6 +49,15 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureLawyerLocked

diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -22,4 +22,4 @@
     stateDoorOpen: clerk_open
     stateDoorClosed: clerk_door
   - type: AccessReader
-    access: [["Justice"]]
+    access: [["Clerk"]]
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
@@ -13,6 +13,9 @@
   - Command
   - ChiefJustice
   - Justice
+  - Lawyer
+  - Prosecutor
+  - Clerk
   - Security
   - Maintenance
   - External

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
@@ -23,6 +23,7 @@
   canBeAntag: false
   access:
   - Justice
+  - Clerk
   - Security
   - Maintenance
 

diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
@@ -31,4 +31,4 @@
   id: JobIconAdminAssitant
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
-    state: AdminAssistant
+    state: AdminAssistant
diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml
@@ -3,7 +3,7 @@
   name: chat-radio-justice
   keycode: "j"
   frequency: 1420
-  color: "#701442"
+  color: "#c70667"
 
 - type: radioChannel
   id: Prison

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -319,6 +319,14 @@
   - type: AccessReader
     access: [["ChiefJustice"]]
 
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsClerk
+  suffix: Clerk, Locked
+  components:
+  - type: AccessReader
+    access: [["Clerk"]]
+
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsJustice

diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -61,6 +61,7 @@
       - ChiefJustice  #Delta V: Add Chief Justice Access
       - Prosecutor  #Delta V: Add Prosecutor Access
       - Justice  #Delta V: Add Justice Access
+      - Clerk  #Delta V: Add Clerk Access
       privilegedIdSlot:
         name: id-card-console-privileged-id
         ejectSound: /Audio/Machines/id_swipe.ogg

diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -14,6 +14,7 @@
     security:    Structures/Doors/Airlocks/Standard/security.rsi
     virology:    Structures/Doors/Airlocks/Standard/virology.rsi
     justice:     DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi # Delta V - Add Justice Dept
+    roboticist:  DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi #Added Roboticist Role
 
 - type: AirlockGroup
   id: Glass
@@ -30,6 +31,7 @@
     security:    Structures/Doors/Airlocks/Glass/security.rsi
     virology:    Structures/Doors/Airlocks/Glass/virology.rsi
     justice:     DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Delta V - Add Justice Dept
+    roboticist:  DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi #Added Roboticist Role
 
 - type: AirlockGroup
   id: Windoor

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1723,7 +1723,7 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
-    access: [["Lawyer"]]
+    access: [["Justice"]]
 
 - type: entity
   parent: VendingMachine

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -8,7 +8,8 @@
   icon: "JobIconLawyer"
   supervisors: job-supervisors-cj  # Delta V - Change supervisor to chief justice
   access:
-  - Service
+  # - Service - DeltaV, removed from service department
+  - Justice # DeltaV - Justice dept
   - Lawyer
   - Maintenance
 

diff --git a/...ces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/assembly.png b/...ces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/assembly.png
diff --git a/...Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/bolted_unlit.png b/...Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/bolted_unlit.png
diff --git a/...urces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed.png b/...urces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed.png
diff --git a/...Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed_unlit.png b/...Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed_unlit.png
diff --git a/...rces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing.png b/...rces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing.png
diff --git a/...extures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing_unlit.png b/...extures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing_unlit.png
diff --git a/...s/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/deny_unlit.png b/...s/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/deny_unlit.png
diff --git a/...tures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/emergency_unlit.png b/...tures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/emergency_unlit.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,4 +49,5 @@ @@
         - Zookeeper
         - Justice
         - Prosecutor
+        - Clerk