diff --git a/Content.Shared/Access/AccessLevelPrototype.cs b/Content.Shared/Access/AccessLevelPrototype.cs index 4444dd84af..be5d00098c 100644 --- a/Content.Shared/Access/AccessLevelPrototype.cs +++ b/Content.Shared/Access/AccessLevelPrototype.cs @@ -18,7 +18,7 @@ namespace Content.Shared.Access [DataField("name")] public string Name { - get => _name ?? ID; + get => (_name is not null) ? _name : ID; private set => _name = Loc.GetString(value); } diff --git a/Resources/Locale/en-US/access/components/id-card-console-component.ftl b/Resources/Locale/en-US/access/components/id-card-console-component.ftl index 1ac8e65047..1ee6fc791c 100644 --- a/Resources/Locale/en-US/access/components/id-card-console-component.ftl +++ b/Resources/Locale/en-US/access/components/id-card-console-component.ftl @@ -8,4 +8,4 @@ id-card-console-window-insert-button = Insert access-id-card-console-component-no-hands-error = You have no hands. id-card-console-privileged-id = Privileged ID -id-card-console-target-id = Target ID \ No newline at end of file +id-card-console-target-id = Target ID diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl new file mode 100644 index 0000000000..366eb50373 --- /dev/null +++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl @@ -0,0 +1,37 @@ +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-security = Head of Security +id-card-access-level-security = Security +id-card-access-level-armory = Armory +id-card-access-level-brig = Brig + +id-card-access-level-chief-engineer = Chief Engineer +id-card-access-level-engineering = Engineering +id-card-access-level-atmospherics = Atmospherics + +id-card-access-level-research-director = Research Director +id-card-access-level-research = Research + +id-card-access-level-chief-medical-officer = Chief Medical Officer +id-card-access-level-medical = Medical +id-card-access-level-chemistry = Chemistry + +id-card-access-level-quartermaster = Quartermaster +id-card-access-level-cargo = Cargo +id-card-access-level-salvage = Salvage + +id-card-access-level-bar = Bar +id-card-access-level-kitchen = Kitchen +id-card-access-level-hydroponics = Hydroponics +id-card-access-level-service = Service +id-card-access-level-janitor = Janitor +id-card-access-level-theatre = Theatre +id-card-access-level-chapel = Chapel + +id-card-access-level-maintenance = Maintenance + +id-card-access-level-external = External + +id-card-access-level-nuclear-operative = Nuclear Operative diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index f99e61d36b..692726f1ef 100644 --- a/Resources/Prototypes/Access/cargo.yml +++ b/Resources/Prototypes/Access/cargo.yml @@ -1,14 +1,14 @@ - type: accessLevel id: Quartermaster - name: Quartermaster + name: id-card-access-level-quartermaster - type: accessLevel id: Cargo - name: Cargo + name: id-card-access-level-cargo - type: accessLevel id: Salvage - name: Salvage + name: id-card-access-level-salvage - type: accessGroup id: Cargo diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index d7f98b2b44..f71ca12f3b 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -1,14 +1,14 @@ - type: accessLevel id: Command - name: Command + name: id-card-access-level-command - type: accessLevel id: Captain - name: Captain + name: id-card-access-level-captain - type: accessLevel id: HeadOfPersonnel - name: Head of Personnel + name: id-card-access-level-head-of-personnel - type: accessGroup id: Command diff --git a/Resources/Prototypes/Access/engineering.yml b/Resources/Prototypes/Access/engineering.yml index 2c5ba5b318..f2f79fa805 100644 --- a/Resources/Prototypes/Access/engineering.yml +++ b/Resources/Prototypes/Access/engineering.yml @@ -1,14 +1,14 @@ - type: accessLevel id: ChiefEngineer - name: Chief Engineer + name: id-card-access-level-chief-engineer - type: accessLevel id: Engineering - name: Engineering + name: id-card-access-level-engineering - type: accessLevel id: Atmospherics - name: Atmospherics + name: id-card-access-level-atmospherics - type: accessGroup id: Engineering diff --git a/Resources/Prototypes/Access/external.yml b/Resources/Prototypes/Access/external.yml index e480751f6c..4b262f47c7 100644 --- a/Resources/Prototypes/Access/external.yml +++ b/Resources/Prototypes/Access/external.yml @@ -1,3 +1,3 @@ - type: accessLevel id: External - name: External + name: id-card-access-level-external diff --git a/Resources/Prototypes/Access/maintenance.yml b/Resources/Prototypes/Access/maintenance.yml index 712132a0bc..e9de4ba359 100644 --- a/Resources/Prototypes/Access/maintenance.yml +++ b/Resources/Prototypes/Access/maintenance.yml @@ -1,3 +1,3 @@ - type: accessLevel id: Maintenance - name: Maintenance + name: id-card-access-level-maintenance diff --git a/Resources/Prototypes/Access/medical.yml b/Resources/Prototypes/Access/medical.yml index 419ac3d292..5b9623c155 100644 --- a/Resources/Prototypes/Access/medical.yml +++ b/Resources/Prototypes/Access/medical.yml @@ -1,14 +1,14 @@ - type: accessLevel id: ChiefMedicalOfficer - name: Chief Medical Officer + name: id-card-access-level-chief-medical-officer - type: accessLevel id: Medical - name: Medical + name: id-card-access-level-medical - type: accessLevel id: Chemistry - name: Chemistry + name: id-card-access-level-chemistry - type: accessGroup id: Medical diff --git a/Resources/Prototypes/Access/research.yml b/Resources/Prototypes/Access/research.yml index 0953693241..04a6a8c402 100644 --- a/Resources/Prototypes/Access/research.yml +++ b/Resources/Prototypes/Access/research.yml @@ -1,10 +1,10 @@ - type: accessLevel id: ResearchDirector - name: Research Director + name: id-card-access-level-research-director - type: accessLevel id: Research - name: Research + name: id-card-access-level-research - type: accessGroup id: Research diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml index d15451a9b6..05d29498d9 100644 --- a/Resources/Prototypes/Access/security.yml +++ b/Resources/Prototypes/Access/security.yml @@ -1,18 +1,18 @@ - type: accessLevel id: HeadOfSecurity - name: Head of Security + name: id-card-access-level-head-of-security - type: accessLevel id: Security - name: Security + name: id-card-access-level-security - type: accessLevel id: Armory - name: Armory + name: id-card-access-level-armory - type: accessLevel id: Brig - name: Brig + name: id-card-access-level-brig #- type: accessLevel # id: Detective diff --git a/Resources/Prototypes/Access/service.yml b/Resources/Prototypes/Access/service.yml index 408ce70b69..492e7a9092 100644 --- a/Resources/Prototypes/Access/service.yml +++ b/Resources/Prototypes/Access/service.yml @@ -1,30 +1,30 @@ - type: accessLevel id: Bar - name: Bar + name: id-card-access-level-bar - type: accessLevel id: Kitchen - name: Kitchen + name: id-card-access-level-kitchen - type: accessLevel id: Hydroponics - name: Hydroponics + name: id-card-access-level-hydroponics - type: accessLevel id: Service - name: Service + name: id-card-access-level-service - type: accessLevel id: Janitor - name: Janitor + name: id-card-access-level-janitor - type: accessLevel id: Theatre - name: Theatre + name: id-card-access-level-theatre - type: accessLevel id: Chapel - name: Chapel + name: id-card-access-level-chapel - type: accessGroup id: Service diff --git a/Resources/Prototypes/Access/syndicate.yml b/Resources/Prototypes/Access/syndicate.yml index 402ad7cf08..32e0c7a016 100644 --- a/Resources/Prototypes/Access/syndicate.yml +++ b/Resources/Prototypes/Access/syndicate.yml @@ -1,3 +1,3 @@ - type: accessLevel id: NuclearOperative - name: Nuclear Operative + name: id-card-access-level-nuclear-operative