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.

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

Bailiff headset #487

Merged
merged 4 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 5 additions & 8 deletions Resources/Locale/en-US/_Nyano/nyano-jobs.ftl
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
job-description-guard = Keep track of prisoners and make sure they have their basic needs.
job-name-mail-carrier = Mail Carrier
job-name-cyborg = Cyborg
job-name-gladiator = Gladiator
job-name-fugitive = Fugitive
job-name-prisoner = Prisoner
job-name-valet = Valet
job-name-paramedic = Paramedic
job-name-guard = Prison Guard
job-name-martialartist = Martial Artist

job-description-mail-carrier = Deliver mail. Avoid dogs.
job-description-cyborg = Read your laws. Read your laws. Read your laws.
job-description-valet = Take care of the station and its many guests.
job-description-fugitive = Escape the station alive.
job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs.
job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor.
job-description-paramedic = Head out into the field to save lives. Get shot at by hostile operatives. Take up chain-smoking.
job-description-fugitive = Escape the station alive.
job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the bailiff. Write your memoirs.
job-description-valet = Take care of the station and its many guests.
job-description-guard = Keep track of prisoners and make sure they have their basic needs.
job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC.
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetAltSecurity
- id: ClothingHeadsetAltSecurityWarden # Frontier
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
Expand All @@ -37,7 +37,7 @@
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetAltSecurity
- id: ClothingHeadsetAltSecurityWarden # Frontier
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Roles/Jobs/Security/warden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
playTimeTracker: JobWarden
requirements:
- !type:OverallPlaytimeRequirement
time: 21600
time: 21600 # Frontier - 6 hours
- !type:RoleTimeRequirement
role: JobSecurityOfficer
time: 21600
time: 21600 # Frontier - 6 hours
startingGear: WardenGear
icon: "JobIconWarden"
supervisors: job-supervisors-hos
Expand All @@ -23,7 +23,7 @@
- Detective
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant, TrackingImplant ]
implants: [ MindShieldImplant, TrackingImplant ] # Frontier

- type: startingGear
id: WardenGear
Expand All @@ -35,7 +35,7 @@
eyes: ClothingEyesGlassesSecurity
outerClothing: ClothingOuterCoatWarden
id: WardenPDA
ears: ClothingHeadsetSecurity
ears: ClothingHeadsetAltSecurityWarden # Frontier
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerClothingSkirt: ClothingUniformJumpskirtWarden
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltSecurityWarden
name: bailiff's over-ear headset
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeySecurity
- EncryptionKeyCommand
- EncryptionKeyCommon
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/security.rsi
Loading