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

New Frontier Sheriff's Department + Station Representative #246

Merged
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
22 changes: 12 additions & 10 deletions Resources/Locale/en-US/_Nyano/nyano-jobs.ftl
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
job-description-guard = Keep track of prisoners and make sure they have their basic needs.
job-name-mail-carrier = mail carrier
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-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-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC.
job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC.
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/headset/headset-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ examine-headset-default-channel = Use {$prefix} for the default channel ([color=

chat-radio-common = Common
chat-radio-centcom = CentCom
chat-radio-command = Traffic Control
chat-radio-command = Traffic
chat-radio-engineering = Engineering
chat-radio-medical = Medical
chat-radio-science = Science
chat-radio-security = Security
chat-radio-security = NFSD
chat-radio-service = Service
chat-radio-supply = Supply
chat-radio-syndicate = Syndicate
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/job/department-desc.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ department-Civilian-description = Perform small helpful tasks to keep the statio
department-Command-description = Manage the crew and keep them working efficiently.
department-Engineering-description = Keep the station operational.
department-Medical-description = Keep the crew healthy.
department-Security-description = Keep the peace around the station.
department-Security-description = Keep the peace around the sector.
department-Science-description = Research new technologies and dangerous artifacts.
department-Specific-description = Jobs that not all stations have.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/job/department.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ department-Civilian = Civilian
department-Command = Command
department-Engineering = Engineering
department-Medical = Medical
department-Security = Security
department-Security = New Frontier Sheriff's Department
department-Science = Science
department-Specific = Station specific
10 changes: 5 additions & 5 deletions Resources/Locale/en-US/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ job-description-bartender = Manage the bar and keep it lively, give out drinks,
job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained.
job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the science team for upgrades.
job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Origin Station.
job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you.
job-description-brigmedic = Fight in the rear of the sheriff's service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you.
job-description-cadet = Learn the basics of arresting criminals and managing the brig.
job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will.
job-description-cargotech = Deal with requisitions and deliveries for emergencies, pilot the cargo shuttle, and work with others to make ludicrous amounts of cash.
Expand All @@ -25,7 +25,7 @@ job-description-ertleader = Lead the Emergency Response Team in dealing with thr
job-description-ertmedic = Ensure that the crew of the station is kept alive and healthy.
job-description-ertsecurity = Ensure that any active threats to the station are put to rest.
job-description-hop = Handle access reassignment fairly using your ID console, manage the service department, and keep Ian safe.
job-description-hos = Manage your security force and keep them efficient, quell dissent, and keep the other heads of staff safe.
job-description-hos = Manage your department and keep them efficient, quell dissent, and keep the sector safe.
job-description-intern = Learn the basics of administering medicine, cloning the dead, and creating chemicals.
job-description-janitor = Keep the station clean of any trash or slipping hazards, and help deal with rat infestations.
job-description-lawyer = Ensure that every prisoner or criminal receives a fair judgment and trial if necessary.
Expand All @@ -40,11 +40,11 @@ job-description-research-assistant = Learn the basics of how to research various
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras and the radio. Currently available on Bagel Station and Core.
job-description-salvagespec = Use the salvage magnet to draw in derelicts & asteroids to loot and enrich the station, and fight off any space fauna along the way.
job-description-scientist = Research alien artifacts, unlock new technologies, upgrade machines around the station, and make everything run more efficiently.
job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
job-description-security = Catch criminals and enemies of the corporation, enforce the law, and ensure that the sector does not fall into disarray.
job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants.
job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
job-description-warden = Patrol your assigned vessel, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Kettle Station.
job-description-senior-engineer = Teach new engineers the basics of the station's engine, repairing, atmospherics and power.
job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects.
job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead.
job-description-senior-officer = Teach new officers the basics of searches, preforming arrests, prison times and how to properly shoot a firearm.
job-description-senior-officer = Teach new deputies the basics of searches, preforming arrests, prison times and how to properly shoot a firearm.
24 changes: 12 additions & 12 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
job-name-warden = Warden
job-name-security = Security Officer
job-name-cadet = Security Cadet
job-name-hos = Head of Security
job-name-warden = Bailiff
job-name-security = Deputy
job-name-cadet = Cadet
job-name-hos = Sheriff
job-name-detective = Detective
job-name-brigmedic = Brigmedic
job-name-borg = Cyborg
Expand All @@ -17,7 +17,7 @@ job-name-chemist = Chemist
job-name-technical-assistant = Technical Assistant
job-name-engineer = Station Engineer
job-name-atmostech = Atmospheric Technician
job-name-hop = Head of Personnel
job-name-hop = Station Representative
job-name-captain = Captain
job-name-serviceworker = Service Worker
job-name-centcomoff = CentCom Official
Expand Down Expand Up @@ -47,7 +47,7 @@ job-name-zookeeper = Zookeeper
job-name-senior-engineer = Senior Engineer
job-name-senior-researcher = Senior Researcher
job-name-senior-physician = Senior Physician
job-name-senior-officer = Senior Officer
job-name-senior-officer = Sergeant

# Role timers - Make these alphabetical or I cut you
JobAtmosphericTechnician = Atmospheric Technician
Expand All @@ -71,8 +71,8 @@ JobERTJanitor = ERT Janitor
JobERTLeader = ERT Leader
JobERTMedical = ERT Medical
JobERTSecurity = ERT Security
JobHeadOfPersonnel = Head of Personnel
JobHeadOfSecurity = Head of Security
JobHeadOfPersonnel = Station Representative
JobHeadOfSecurity = Sheriff
JobJanitor = Janitor
JobLawyer = Lawyer
JobLibrarian = Librarian
Expand All @@ -89,14 +89,14 @@ JobResearchAssistant = Research Assistant
JobResearchDirector = Research Director
JobSalvageSpecialist = Salvage Specialist
JobScientist = Scientist
JobSecurityCadet = Security Cadet
JobSecurityOfficer = Security Officer
JobSecurityCadet = Cadet
JobSecurityOfficer = Deputy
JobSeniorEngineer = Senior Engineer
JobSeniorOfficer = Senior Officer
JobSeniorOfficer = Sergeant
JobSeniorPhysician = Senior Physician
JobSeniorResearcher = Senior Researcher
JobServiceWorker = Service Worker
JobStationEngineer = Station Engineer
JobTechnicalAssistant = Technical Assistant
JobWarden = Warden
JobWarden = Bailiff
JobZookeeper = Zookeeper
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
job-supervisors-centcom = CentCom official
job-supervisors-captain = the captain
job-supervisors-hop = the head of personnel
job-supervisors-hos = the head of security
job-supervisors-hop = the station representative
job-supervisors-hos = the sheriff
job-supervisors-ce = the chief engineer
job-supervisors-cmo = the chief medical officer
job-supervisors-rd = the research director
job-supervisors-qm = the quartermaster
job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer
job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer
job-supervisors-security = security officers, the senior officer, the warden, and the head of security
job-supervisors-security = deputies, the bailiff, and the sheriff
job-supervisors-science = scientists, the senior researcher, and the research director
job-supervisors-hire = whoever hires you
job-supervisors-everyone = absolutely everyone
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ objective-condition-steal-title = Steal the {$owner}'s {$itemName}.
objective-condition-steal-description = We need you to steal {$itemName}. Don't get caught.

objective-condition-steal-station = station
objective-condition-steal-Ian = head of personnel's corgi
objective-condition-steal-Ian = station representative's corgi
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ stamp-component-stamped-name-clown = Clown
stamp-component-stamped-name-cmo = Chief Medical Officer
stamp-component-stamped-name-denied = DENIED
stamp-component-stamped-name-approved = APPROVED
stamp-component-stamped-name-hop = Head of Personnel
stamp-component-stamped-name-hos = Head of Security
stamp-component-stamped-name-hop = Station Representative
stamp-component-stamped-name-hos = Sheriff
stamp-component-stamped-name-qm = Quartermaster
stamp-component-stamped-name-rd = Research Director
stamp-component-stamped-name-warden = Warden
stamp-component-stamped-name-warden = Bailiff
stamp-component-stamped-name-trader = Trader
stamp-component-stamped-name-syndicate = Syndicate
stamp-component-stamped-name-ce = Chief Engineer
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
id-card-access-level-command = Command
id-card-access-level-captain = Captain
id-card-access-level-head-of-personnel = Head of Personnel
id-card-access-level-head-of-personnel = Station Representative

id-card-access-level-head-of-security = Head of Security
id-card-access-level-head-of-security = Sheriff
id-card-access-level-security = Security
id-card-access-level-armory = Armory
id-card-access-level-brig = Brig
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
amount: 6

- type: entity
name: security encryption key box
name: nfsd encryption key box
parent: BoxEncryptionKeyPassenger
id: BoxEncryptionKeySecurity
components:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetSecurity
name: security headset
description: This is used by your elite security force.
name: deputy headset
description: This is used by your elite sheriff's department force.
components:
- type: ContainerFill
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltSecurity
name: head of security's over-ear headset
name: sheriff's over-ear headset
components:
- type: ContainerFill
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitWarden
noSpawn: true
name: warden's hardsuit helmet
name: bailiff's hardsuit helmet
description: A modified riot helmet. Oddly comfortable.
components:
- type: Sprite
Expand Down Expand Up @@ -305,8 +305,8 @@
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSecurityRed
noSpawn: true
name: head of security's hardsuit helmet
description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
name: sheriff's hardsuit helmet
description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the Sheriff.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-red.rsi
Expand Down
18 changes: 9 additions & 9 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretHoS
name: head of security's beret
description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
name: sheriff's beret
description: A black beret with a sheriff's rank emblem. For officers that are more inclined towards style than safety.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_hos.rsi
Expand All @@ -87,8 +87,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretWarden
name: warden's beret
description: A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
name: bailiff's beret
description: A corporate blue beret with a bailiff's rank emblem. For officers that are more inclined towards style than safety.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_warden.rsi
Expand Down Expand Up @@ -236,8 +236,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHopcap
name: head of personnel's cap
description: A grand, stylish head of personnel's cap.
name: station representative's cap
description: A grand, stylish station representative's cap.
components:
- type: Sprite
sprite: Clothing/Head/Hats/hopcap.rsi
Expand All @@ -252,7 +252,7 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHoshat
name: head of security's hat
name: sheriff's hat
description: "There's a new sheriff in station."
components:
- type: Sprite
Expand Down Expand Up @@ -434,8 +434,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatWarden
name: warden's cap
description: A police officer's Hat. This hat emphasizes that you are THE LAW
name: bailiff's cap
description: A bailiff's Hat. This hat emphasizes that you are THE LAW.
components:
- type: Sprite
sprite: Clothing/Head/Hats/warden.rsi
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakHos
name: head of security's cloak
name: sheriff's cloak
description: An exquisite dark and red cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution!
components:
- type: Sprite
Expand Down Expand Up @@ -55,7 +55,7 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakHop
name: head of personnel's cloak
name: station representative's cloak
description: A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station.
components:
- type: Sprite
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleHOP
name: head of personnel's mantle
description: A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half.
name: station representative's mantle
description: A good SR knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half.
components:
- type: Sprite
sprite: Clothing/Neck/mantles/hopmantle.rsi
Expand All @@ -45,7 +45,7 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleHOS
name: head of security's mantle
name: sheriff's mantle
description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
components:
- type: Sprite
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Neck/medals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckSecuritymedal
name: security medal
description: Given for the best work in the security department.
name: sheriff's medal of valor
description: Given for the best work in the new frontier sheriff's department.
components:
- type: Sprite
sprite: Clothing/Neck/Medals/securitymedal.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatHoSTrench
name: head of security's armored trenchcoat
name: sheriff's armored trenchcoat
description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
components:
- type: Sprite
Expand Down Expand Up @@ -205,8 +205,8 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatWarden
name: warden's armored jacket
description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats.
name: bailiff's armored jacket
description: A sturdy, utilitarian jacket designed to protect a bailiff from any brig-bound threats.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/warden.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitWarden
name: warden's hardsuit
name: bailiff's hardsuit
description: A specialized riot suit geared to combat low pressure environments.
components:
- type: Sprite
Expand Down Expand Up @@ -398,7 +398,7 @@
- type: entity
parent: ClothingOuterHardsuitSecurity
id: ClothingOuterHardsuitSecurityRed
name: head of security's hardsuit
name: sheriff's hardsuit
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
components:
- type: Sprite
Expand Down
Loading
Loading