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

Rename station/security guard into civil guard #2790

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/_NF/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ job-name-pilot = Pilot
job-name-pirate = Pirate
job-name-pirate-captain = Pirate Captain
job-name-pirate-first-mate = Pirate First Mate
job-name-security-guard = Security Guard
job-name-security-guard = Civil Guard
job-name-sheriff = Sheriff
job-name-stc = Station Traffic Controller
job-name-sr = Station Representative
Expand All @@ -28,7 +28,7 @@ JobPilot = Pilot
JobPirate = Pirate
JobPirateCaptain = Pirate Captain
JobPirateFirstMate = Pirate First Mate
JobSecurityGuard = Security Guard
JobCivilGuard = Civil Guard
JobSTC = Station Traffic Controller

# Upstream Removed
Expand Down
6 changes: 3 additions & 3 deletions Resources/Maps/_NF/Outpost/frontier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16841,7 +16841,7 @@ entities:
parent: 2173
- type: DisposalRouter
tags:
- stationguard
- civilguard
- proto: DisposalTrunk
entities:
- uid: 430
Expand Down Expand Up @@ -27688,7 +27688,7 @@ entities:
pos: 39.5,15.5
parent: 2173
- type: MailingUnit
tag: stationguard
tag: civilguard
- proto: MailTeleporter
entities:
- uid: 5000
Expand Down Expand Up @@ -32041,7 +32041,7 @@ entities:
- type: Transform
pos: -39.5,1.5
parent: 2173
- proto: SpawnPointSecurityGuard
- proto: SpawnPointCivilGuard
entities:
- uid: 4817
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/trademall.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36555,7 +36555,7 @@ entities:
rot: 3.141592653589793 rad
pos: 46.5,5.5
parent: 1
- proto: SpawnPointSecurityGuard
- proto: SpawnPointCivilGuard
entities:
- uid: 5534
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/Test/dev_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7020,7 +7020,7 @@ entities:
- type: Transform
pos: -3.5,2.5
parent: 179
- proto: SpawnPointSecurityGuard
- proto: SpawnPointCivilGuard
entities:
- uid: 1457
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
# - Warden # Frontier
- PrisonGuard ##nyano
- Brigmedic # Frontier
# - SecurityGuard # Frontier
# - CivilGuard # Frontier
- NFDetective # Frontier
- Cadet # Frontier
- Deputy # Frontier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtSecGuard
name: security guard's uniform
description: A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business.
name: civil guard's uniform
description: A specialized uniform for Frontier Outpost's civil guard. Crisp and official to let dock loiterers know you mean business.
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi
Expand Down Expand Up @@ -91,13 +91,13 @@
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtPrivateSec
name: private security jumpskirt
description: A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look.
description: A specialized uniform for a private civil guard. For the discerning private contractor in need of a professional look.
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi

- type: entity
parent: ClothingUniformJumpskirtHoP
id: ClothingUniformJumpskirtSr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSecGuard
name: security guard's uniform
description: A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business.
name: civil guard's uniform
description: A specialized uniform for Frontier Outpost's civil guard. Crisp and official to let dock loiterers know you mean business.
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi
Expand Down Expand Up @@ -208,7 +208,7 @@
parent: ClothingUniformBase
id: ClothingUniformJumpsuitPrivateSec
name: private security jumpsuit
description: A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look.
description: A specialized uniform for a private civil guard. For the discerning private contractor in need of a professional look.
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/private_security.rsi
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@
- state: stc

- type: entity
id: SpawnPointSecurityGuard
id: SpawnPointCivilGuard
parent: SpawnPointJobBase
name: security guard
name: civil guard
components:
- type: SpawnPoint
job_id: SecurityGuard
job_id: CivilGuard
- type: Sprite
sprite: _NF/Markers/jobs.rsi
layers:
- state: green
- state: securityguard
- state: civilguard

- type: entity
id: SpawnPointERTMailCarrier
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- NFDetective
- SeniorOfficer
- Sheriff
- SecurityGuard
- CivilGuard
- StationRepresentative
- StationTrafficController

Expand Down Expand Up @@ -96,4 +96,4 @@
suffix: Panic Bunker, 100
components:
- type: PacifiedZoneGenerator
radius: 100
radius: 100
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@

- type: entity
parent: SecurityIDCard
id: SecurityGuardIDCard
name: security guard ID card
id: CivilGuardIDCard
name: civil guard ID card
components:
- type: PresetIdCard
job: SecurityGuard
job: CivilGuard

- type: entity
parent: ERTChaplainIDCard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@
- type: entity
parent: ShipVoucherFrontierJanitor
id: ShipVoucherFrontierGuard
name: station guard ship voucher
name: civil guard ship voucher
description: Allows for one free guard ship purchase from the Frontier Staff Shipyard. Destroyed on sale.
components:
- type: Sprite
layers:
- state: blue
- state: voucherstationguard
- state: vouchercivilguard
- type: ShipyardVoucher
access:
- Brig # odd, but potentially restricts cadets in lieu of a security guard-only access level
- Brig # odd, but potentially restricts cadets in lieu of a civil guard-only access level
8 changes: 4 additions & 4 deletions Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@

- type: entity
parent: BaseSecurityPDA
id: SecurityGuardPDA
name: security guard PDA
id: CivilGuardPDA
name: civil guard PDA
description: Red to hide the stains of passenger blood.
components:
- type: Pda
id: SecurityGuardIDCard
id: CivilGuardIDCard
- type: Appearance
appearanceDataInit:
enum.PdaVisuals.PdaType:
Expand Down Expand Up @@ -478,6 +478,6 @@
- NotekeeperCartridge
- NewsReaderCartridge
- BountyContractsCartridge
- AstroNavCartridge
- AstroNavCartridge
- LedgerCartridge
- MedTekCartridge #medtek preloaded. Should be ok.
10 changes: 5 additions & 5 deletions Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
- type: loadout
id: SecurityGuardBackpack
id: CivilGuardBackpack
equipment:
back: ClothingBackpackSecurity

- type: loadout
id: SecurityGuardSatchel
id: CivilGuardSatchel
equipment:
back: ClothingBackpackSatchelSecurity

- type: loadout
id: SecurityGuardDuffel
id: CivilGuardDuffel
equipment:
back: ClothingBackpackDuffelSecurity

- type: loadout
id: SecurityGuardMessenger
id: CivilGuardMessenger
equipment:
back: ClothingBackpackMessengerSecurity
back: ClothingBackpackMessengerSecurity
6 changes: 3 additions & 3 deletions Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/ears.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
- type: loadout
id: SecurityGuardClothingHeadsetSecurityCommon
id: CivilGuardClothingHeadsetSecurityCommon
equipment:
ears: ClothingHeadsetSecurityCommon

- type: loadout
id: SecurityGuardClothingHeadsetAltSecurityCommon
id: CivilGuardClothingHeadsetAltSecurityCommon
equipment:
ears: ClothingHeadsetAltSecurityCommon
ears: ClothingHeadsetAltSecurityCommon
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- type: loadout
id: SecurityGuardJumpsuit
id: CivilGuardJumpsuit
hideEffects:
- !type:GroupLoadoutEffect
proto: PantsCapableNF
equipment:
jumpsuit: ClothingUniformJumpsuitSecGuard

- type: loadout
id: SecurityGuardJumpskirt
id: CivilGuardJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtSecGuard
jumpsuit: ClothingUniformJumpskirtSecGuard
5 changes: 2 additions & 3 deletions Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/pda.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
- type: loadout
id: SecurityGuardSecurityGuardPDA
id: CivilGuardCivilGuardPDA
equipment:
id: SecurityGuardPDA

id: CivilGuardPDA
22 changes: 11 additions & 11 deletions Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,19 @@
- NFSpeciesSpecific

- type: roleLoadout
id: JobSecurityGuard
id: JobCivilGuard
groups:
- SecurityGuardHead
- SecurityGuardJumpsuit
- SecurityGuardGloves
- SecurityGuardBackpack
- SecurityGuardOuterClothing
- SecurityGuardShoes
- SecurityGuardFace
- SecurityGuardBelt
- SecurityGuardEars
- CivilGuardHead
- CivilGuardJumpsuit
- CivilGuardGloves
- CivilGuardBackpack
- CivilGuardOuterClothing
- CivilGuardShoes
- CivilGuardFace
- CivilGuardBelt
- CivilGuardEars
- NfsdBoxSurvival
- SecurityGuardPDA
- CivilGuardPDA
- ContractorCartridge
- ContractorImplanter
- ContractorEncryptionKey
Expand Down
Loading
Loading