Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Airlocks #236

Merged
merged 2 commits into from
Feb 9, 2025
Merged

Airlocks #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07b95a9
Robotics Airlock (#2121)
Unkn0wnGh0st333 Nov 4, 2024
bc9a677
Justice patch 06/09/2024 (#1340)
Timemaster99 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Content.Shared/Access/Components/IdCardConsoleComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions Resources/Prototypes/Access/misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Access/justice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

1 change: 1 addition & 0 deletions Resources/Prototypes/DeltaV/Access/misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@
- Zookeeper
- Justice
- Prosecutor
- Clerk

2 changes: 0 additions & 2 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
containers:
key_slots:
- EncryptionKeyJustice
- EncryptionKeyPrison
- EncryptionKeySecurity
- EncryptionKeyCommon
- type: Sprite
Expand All @@ -73,7 +72,6 @@
containers:
key_slots:
- EncryptionKeyJustice
- EncryptionKeyPrison
- EncryptionKeySecurity
- EncryptionKeyCommon
- EncryptionKeyCommand
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
27 changes: 27 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
18 changes: 18 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 9 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
stateDoorOpen: clerk_open
stateDoorClosed: clerk_door
- type: AccessReader
access: [["Justice"]]
access: [["Clerk"]]
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
- Command
- ChiefJustice
- Justice
- Lawyer
- Prosecutor
- Clerk
- Security
- Maintenance
- External
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
canBeAntag: false
access:
- Justice
- Clerk
- Security
- Maintenance

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/StatusEffects/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
id: JobIconAdminAssitant
icon:
sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
state: AdminAssistant
state: AdminAssistant
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/radio_channels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: chat-radio-justice
keycode: "j"
frequency: 1420
color: "#701442"
color: "#c70667"

- type: radioChannel
id: Prison
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,7 +1730,7 @@
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: AccessReader
access: [["Lawyer"]]
access: [["Justice"]]

- type: entity
parent: VendingMachine
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file added ...ces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/assembly.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/bolted_unlit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...urces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed_unlit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rces/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...extures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing_unlit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/deny_unlit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...tures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/emergency_unlit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading