Locked airlocks (#989)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-05-27 17:14:01 -04:00
parent 24bc06b253
commit c22713fb24
35 changed files with 1022 additions and 1275 deletions
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -356,7 +356,7 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 34
-  type: airlock_engineering
+  type: AirlockEngineering
  components:
  - parent: 0
    pos: -12.5,1.5
@@ -671,35 +671,35 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 79
-  type: airlock_external
+  type: AirlockExternal
  components:
  - parent: 0
    pos: 7.5,-8.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 80
-  type: airlock_external
+  type: AirlockExternal
  components:
  - parent: 0
    pos: 5.5,-8.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 81
-  type: airlock_engineering
+  type: AirlockEngineering
  components:
  - parent: 0
    pos: -7.5,-6.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 82
-  type: airlock_engineering
+  type: AirlockEngineering
  components:
  - parent: 0
    pos: 3.5,-4.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 83
-  type: airlock_engineering
+  type: AirlockEngineering
  components:
  - parent: 0
    pos: 2.5,-4.5
@@ -1100,14 +1100,14 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 138
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -1.5,-8.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 139
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: 0.5,-8.5
@@ -1149,7 +1149,7 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 145
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -3.5,-8.5
@@ -1234,14 +1234,14 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 152
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -0.5,-0.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 153
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -5.5,-0.5
@@ -1382,35 +1382,35 @@ entities:
    rot: 1.5707963267949 rad
    type: Transform
 - uid: 172
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -9.5,-5.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 173
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -0.5,5.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 174
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -5.5,5.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 175
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -0.5,-2.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 176
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: -5.5,-2.5
@@ -1587,14 +1587,14 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 201
-  type: airlock_medical_glass
+  type: AirlockMedicalGlass
  components:
  - parent: 0
    pos: 26.5,-3.5
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 202
-  type: airlock_medical_glass
+  type: AirlockMedicalGlass
  components:
  - parent: 0
    pos: 28.5,-0.5
@@ -2770,21 +2770,21 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 352
-  type: airlock_external
+  type: AirlockExternal
  components:
  - parent: 0
    pos: -13.5,4.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 353
-  type: airlock_external
+  type: AirlockExternal
  components:
  - parent: 0
    pos: -13.5,6.5
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 354
-  type: airlock_engineering
+  type: AirlockEngineering
  components:
  - parent: 0
    pos: -13.5,1.5
@@ -2931,7 +2931,7 @@ entities:
    rot: -1.5707963267949 rad
    type: Transform
 - uid: 370
-  type: airlock_engineering
+  type: AirlockEngineering
  components:
  - parent: 0
    pos: -10.5,-6.5
@@ -4516,28 +4516,28 @@ entities:
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 587
-  type: airlock_medical_glass
+  type: AirlockMedicalGlass
  components:
  - parent: 0
    pos: 15.5,3.5
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 588
-  type: airlock_medical_glass
+  type: AirlockMedicalGlass
  components:
  - parent: 0
    pos: 16.5,3.5
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 589
-  type: airlock_medical_glass
+  type: AirlockMedicalGlass
  components:
  - parent: 0
    pos: 20.5,3.5
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 590
-  type: airlock_medical_glass
+  type: AirlockMedicalGlass
  components:
  - parent: 0
    pos: 26.5,4.5
@@ -5583,14 +5583,14 @@ entities:
    rot: 1.5707963267948966 rad
    type: Transform
 - uid: 728
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: 17.5,8.5
    rot: 1.5707963267948966 rad
    type: Transform
 - uid: 729
-  type: spawn_point_latejoin
+  type: SpawnPointLatejoin
  components:
  - parent: 0
    pos: 19.5,-3.5
@@ -6605,28 +6605,28 @@ entities:
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 868
-  type: airlock_science_glass
+  type: AirlockScienceGlass
  components:
  - parent: 0
    pos: 14.5,20.5
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 869
-  type: airlock_science
+  type: AirlockScience
  components:
  - parent: 0
    pos: 14.5,24.5
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 870
-  type: airlock_science
+  type: AirlockScience
  components:
  - parent: 0
    pos: 16.5,18.5
    rot: -1.5707963267948966 rad
    type: Transform
 - uid: 871
-  type: airlock_science
+  type: AirlockScience
  components:
  - parent: 0
    pos: 16.5,15.5
@@ -7392,7 +7392,7 @@ entities:
  - parent: 966
    type: Transform
 - uid: 968
-  type: airlock_engineering
+  type: AirlockEngineering
  components:
  - parent: 0
    pos: 4.5,-2.5
--- a/Resources/Prototypes/AccessLevels/cargo.yml
+++ b/Resources/Prototypes/AccessLevels/cargo.yml
@@ -1,2 +1,2 @@
 - type: accessLevel
-  id: cargo
+  id: Cargo
--- a/Resources/Prototypes/AccessLevels/command.yml
+++ b/Resources/Prototypes/AccessLevels/command.yml
@@ -1,9 +1,9 @@
 - type: accessLevel
-  id: command
+  id: Command

 - type: accessLevel
-  id: captain
+  id: Captain

 - type: accessLevel
-  id: idCard
+  id: IdCard
  name: ID modification
--- a/Resources/Prototypes/AccessLevels/engineering.yml
+++ b/Resources/Prototypes/AccessLevels/engineering.yml
@@ -1,2 +1,2 @@
 - type: accessLevel
-  id: engineering
+  id: Engineering
--- a/Resources/Prototypes/AccessLevels/external.yml
+++ b/Resources/Prototypes/AccessLevels/external.yml
@@ -1,2 +1,2 @@
 - type: accessLevel
-  id: medical
+  id: External
--- a/Resources/Prototypes/AccessLevels/maintenance.yml
+++ b/Resources/Prototypes/AccessLevels/maintenance.yml
@@ -1,2 +1,2 @@
 - type: accessLevel
-  id: maintenance
+  id: Maintenance
--- a/Resources/Prototypes/AccessLevels/medical.yml
+++ b/Resources/Prototypes/AccessLevels/medical.yml
@@ -1,2 +1,2 @@
 - type: accessLevel
-  id: service
+  id: Medical
--- a/Resources/Prototypes/AccessLevels/research.yml
+++ b/Resources/Prototypes/AccessLevels/research.yml
@@ -1,2 +1,2 @@
 - type: accessLevel
-  id: research
+  id: Research
--- a/Resources/Prototypes/AccessLevels/security.yml
+++ b/Resources/Prototypes/AccessLevels/security.yml
@@ -1,2 +1,2 @@
 - type: accessLevel
-  id: security
+  id: Security
--- a/Resources/Prototypes/AccessLevels/service.yml
+++ b/Resources/Prototypes/AccessLevels/service.yml
@@ -0,0 +1,2 @@
+- type: accessLevel
+  id: Service
--- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_access.yml
+++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_access.yml
@@ -0,0 +1,82 @@
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalLocked
+  suffix: External, Locked
+  components:
+  - type: AccessReader
+    necessary: ["External"]
+
+- type: entity
+  parent: AirlockEngineering
+  id: AirlockEngineeringLocked
+  suffix: Engineering, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Engineering"]
+- type: entity
+  parent: AirlockEngineeringGlass
+  id: AirlockEngineeringGlassLocked
+  suffix: Glass, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Engineering"]
+
+- type: entity
+  parent: AirlockMedical
+  id: AirlockMedicalLocked
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Medical"]
+- type: entity
+  parent: AirlockMedicalGlass
+  id: AirlockMedicalGlassLocked
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Medical"]
+
+- type: entity
+  parent: AirlockScience
+  id: AirlockScienceLocked
+  suffix: Science, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Science"]
+- type: entity
+  parent: AirlockScienceGlass
+  id: AirlockScienceGlassLocked
+  suffix: Science, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Science"]
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockCommandLocked
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Command"]
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockCommandGlassLocked
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Command"]
+
+- type: entity
+  parent: AirlockSecurity
+  id: AirlockSecurityLocked
+  suffix: Security, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Security"]
+- type: entity
+  parent: AirlockSecurityGlass
+  id: AirlockSecurityGlassLocked
+  suffix: Security, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Security"]
--- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml
@@ -61,12 +61,9 @@
  components:
  - type: Airlock
    occludes: false
-
  - type: Occluder
    enabled: false
-
  - type: Sprite
    sprite: Buildings/Doors/airlock_glass.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_glass.rsi
--- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml
+++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml
@@ -1,14 +1,12 @@
 - type: entity
  parent: Airlock
-  id: airlock_external
-  name: External Airlock
+  id: AirlockExternal
+  suffix: External
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_external.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_external.rsi
-
  - type: Appearance
    visuals:
    - type: AirlockVisualizer2D
@@ -19,114 +17,95 @@

 - type: entity
  parent: Airlock
-  id: airlock_engineering
-  name: Engineering Airlock
+  id: AirlockEngineering
+  suffix: Engineering
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_engineering.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_engineering.rsi
-
-
 - type: entity
  parent: AirlockGlass
  id: AirlockEngineeringGlass
-  name: Glass Engineering Airlock
+  suffix: Engineering
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_engineering_glass.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_engineering_glass.rsi

 - type: entity
  parent: Airlock
-  id: airlock_medical
-  name: Medical Airlock
+  id: AirlockMedical
+  suffix: Medical
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_medical.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_medical.rsi
-
 - type: entity
  parent: AirlockGlass
-  id: airlock_medical_glass
-  name: Glass Medical Airlock
+  id: AirlockMedicalGlass
+  suffix: Medical
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_medical_glass.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_medical_glass.rsi

-
 - type: entity
  parent: Airlock
-  id: airlock_science
-  name: Science Airlock
+  id: AirlockScience
+  suffix: Science
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_science.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_science.rsi
-
 - type: entity
  parent: AirlockGlass
-  id: airlock_science_glass
-  name: Glass Science Airlock
+  id: AirlockScienceGlass
+  suffix: Science
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_science_glass.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_science_glass.rsi

-
 - type: entity
  parent: Airlock
  id: AirlockCommand
-  name: Command Airlock
+  suffix: Command
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_command.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_command.rsi
-
 - type: entity
  parent: AirlockGlass
  id: AirlockCommandGlass
-  name: Glass Command Airlock
+  suffix: Command
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_command_glass.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_command_glass.rsi

-
 - type: entity
  parent: Airlock
  id: AirlockSecurity
-  name: Security Airlock
+  suffix: Security
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_security.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_security.rsi
-
 - type: entity
  parent: AirlockGlass
  id: AirlockSecurityGlass
-  name: Glass Security Airlock
+  suffix: Security
  components:
  - type: Sprite
    sprite: Buildings/Doors/airlock_security_glass.rsi
-
  - type: Icon
    sprite: Buildings/Doors/airlock_security_glass.rsi
--- a/Resources/Prototypes/Entities/Buildings/airlock_access.yml
+++ b/Resources/Prototypes/Entities/Buildings/airlock_access.yml
@@ -1,8 +0,0 @@
- type: entity
-  parent: airlock_engineering
-  id: airlock_engineering_locked
-  name: Engineering Airlock
-  suffix: Locked
-  components:
-  - type: AccessReader
-    required: ["engineering"]
--- a/Resources/Prototypes/Entities/Buildings/computers.yml
+++ b/Resources/Prototypes/Entities/Buildings/computers.yml
@@ -158,7 +158,7 @@
  name: ID Card Computer
  components:
  - type: AccessReader
-    necessary: ["idCard"]
+    necessary: ["IdCard"]
  - type: IdCardConsole
  - type: UserInterface
    interfaces:
--- a/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml
@@ -14,8 +14,6 @@
    - idcard
    sprite: Clothing/id_cards.rsi
    HeldPrefix: default
-  - type: IdCard
-  - type: Access

 #IDs with layers

@@ -26,15 +24,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idassistant
+    - state: default
+    - state: assigned
+    - state: idassistant
  - type: Icon
    state: default
  - type: IdCard
    jobTitle: Assistant
  - type: Access
-    tags: ["maintenance", "service"]
+    tags: ["Maintenance", "Service"]

 - type: entity
  parent: IDCardStandard
@@ -43,9 +41,9 @@
  components:
  - type: Sprite
    layers:
-            - state: gold
-            - state: assigned
-            - state: idcaptain
+    - state: gold
+    - state: assigned
+    - state: idcaptain
  - type: Icon
    state: gold
  - type: Clothing
@@ -53,7 +51,7 @@
  - type: IdCard
    jobTitle: Captain
  - type: Access
-    tags: ["maintenance", "cargo", "engineering", "medical", "research", "security", "service", "captain", "command"]
+    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External"]

 - type: entity
  parent: IDCardStandard
@@ -62,15 +60,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idsecurityofficer
+    - state: default
+    - state: assigned
+    - state: idsecurityofficer
  - type: Icon
    state: idsecurityofficer
  - type: IdCard
    jobTitle: Security Officer
  - type: Access
-    tags: ["security"]
+    tags: ["Security", "Maintenance", "Service"]

 - type: entity
  parent: IDCardStandard
@@ -79,15 +77,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idstationengineer
+    - state: default
+    - state: assigned
+    - state: idstationengineer
  - type: Icon
    state: idstationengineer
  - type: IdCard
    jobTitle: Engineer
  - type: Access
-    tags: ["engineering"]
+    tags: ["Engineering", "Maintenance", "External"]

 - type: entity
  parent: IDCardStandard
@@ -96,15 +94,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idmedicaldoctor
+    - state: default
+    - state: assigned
+    - state: idmedicaldoctor
  - type: Icon
    state: idmedicaldoctor
  - type: IdCard
    jobTitle: Doctor
  - type: Access
-    tags: ["medical"]
+    tags: ["Medical"]

 - type: entity
  parent: IDCardStandard
@@ -113,15 +111,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idcargotechnician
+    - state: default
+    - state: assigned
+    - state: idcargotechnician
  - type: Icon
    state: idcargotechnician
  - type: IdCard
    jobTitle: Cargo Technician
  - type: Access
-    tags: ["cargo"]
+    tags: ["Cargo", "Maintenance"]

 - type: entity
  parent: IDCardStandard
@@ -130,15 +128,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idscientist
+    - state: default
+    - state: assigned
+    - state: idscientist
  - type: Icon
    state: idscientist
  - type: IdCard
    jobTitle: Scientist
  - type: Access
-    tags: ["research"]
+    tags: ["Research"]

 - type: entity
  parent: IDCardStandard
@@ -147,15 +145,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idclown
+    - state: default
+    - state: assigned
+    - state: idclown
  - type: Icon
    state: idclown
  - type: IdCard
    jobTitle: Clown
  - type: Access
-    tags: ["maintenance", "service"]
+    tags: ["Maintenance", "Service"]

 - type: entity
  parent: IDCardStandard
@@ -164,15 +162,15 @@
  components:
  - type: Sprite
    layers:
-            - state: default
-            - state: assigned
-            - state: idjanitor
+    - state: default
+    - state: assigned
+    - state: idjanitor
  - type: Icon
    state: idjanitor
  - type: IdCard
    jobTitle: Janitor
  - type: Access
-    tags: ["maintenance", "service"]
+    tags: ["Maintenance", "Service"]

 - type: entity
  parent: IDCardStandard
@@ -189,7 +187,7 @@
  - type: IdCard
    jobTitle: Bartender
  - type: Access
-    tags: ["maintenance", "service"]
+    tags: ["Service"]

 - type: entity
  parent: IDCardStandard
@@ -206,7 +204,7 @@
  - type: IdCard
    jobTitle: Chef
  - type: Access
-    tags: ["maintenance", "service"]
+    tags: ["Maintenance", "Service"]

 - type: entity
  parent: IDCardStandard
@@ -215,9 +213,9 @@
  components:
  - type: Sprite
    layers:
-            - state: silver
-            - state: assigned
-            - state: idheadofpersonnel
+    - state: silver
+    - state: assigned
+    - state: idheadofpersonnel
  - type: Icon
    state: idheadofpersonnel
  - type: Clothing
@@ -225,7 +223,7 @@
  - type: IdCard
    jobTitle: Head of Personnel
  - type: Access
-    tags: ["command"]
+    tags: ["Maintenance", "Cargo", "Security", "Service","Command"]

 - type: entity
  parent: IDCardStandard
@@ -234,9 +232,9 @@
  components:
  - type: Sprite
    layers:
-            - state: silver
-            - state: assigned
-            - state: idchiefengineer
+    - state: silver
+    - state: assigned
+    - state: idchiefengineer
  - type: Icon
    state: idchiefengineer
  - type: Clothing
@@ -244,7 +242,7 @@
  - type: IdCard
    jobTitle: Chief Engineer
  - type: Access
-    tags: ["engineering", "command"]
+    tags: ["Engineering", "Command", "Maintenance", "External"]

 - type: entity
  parent: IDCardStandard
@@ -253,9 +251,9 @@
  components:
  - type: Sprite
    layers:
-            - state: silver
-            - state: assigned
-            - state: idchiefmedicalofficer
+    - state: silver
+    - state: assigned
+    - state: idchiefmedicalofficer
  - type: Icon
    state: idchiefmedicalofficer
  - type: Clothing
@@ -263,7 +261,7 @@
  - type: IdCard
    jobTitle: Chief Medical Officer
  - type: Access
-    tags: ["medical", "command"]
+    tags: ["Medical", "Command", "Maintenance"]

 - type: entity
  parent: IDCardStandard
@@ -272,9 +270,9 @@
  components:
  - type: Sprite
    layers:
-            - state: silver
-            - state: assigned
-            - state: idresearchdirector
+    - state: silver
+    - state: assigned
+    - state: idresearchdirector
  - type: Icon
    state: idresearchdirector
  - type: Clothing
@@ -282,7 +280,7 @@
  - type: IdCard
    jobTitle: Research Director
  - type: Access
-    tags: ["research", "command"]
+    tags: ["Research", "Command", "Maintenance"]

 - type: entity
  parent: IDCardStandard
@@ -291,9 +289,9 @@
  components:
  - type: Sprite
    layers:
-            - state: silver
-            - state: assigned
-            - state: idheadofsecurity
+    - state: silver
+    - state: assigned
+    - state: idheadofsecurity
  - type: Icon
    state: idheadofsecurity
  - type: Clothing
@@ -301,7 +299,7 @@
  - type: IdCard
    jobTitle: Head of Security
  - type: Access
-    tags: ["security", "command"]
+    tags: ["Security", "Maintenance", "Service", "Command"]

 - type: entity
  parent: IDCardStandard
@@ -310,9 +308,9 @@
  components:
  - type: Sprite
    layers:
-            - state: gold
-            - state: assigned
-            - state: idcentcom
+    - state: gold
+    - state: assigned
+    - state: idcentcom
  - type: Icon
    state: idcentcom
  - type: Clothing
@@ -320,4 +318,4 @@
  - type: IdCard
    jobTitle: Central Commander
  - type: Access
-    tags: ["maintenance", "cargo", "engineering", "medical", "research", "security", "service", "captain", "command"]
+    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External"]
--- a/Resources/Prototypes/Entities/Markers/spawn_points.yml
+++ b/Resources/Prototypes/Entities/Markers/spawn_points.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: Spawn Point
-  id: spawn_point
+  id: SpawnPoint
  abstract: true
  components:
  - type: Sprite
@@ -8,43 +8,36 @@
    visible: false
    sprite: Objects/markers.rsi
    state: cross_blue
-
  - type: Icon
    sprite: Objects/markers.rsi
-
  - type: SpawnPoint
  - type: Marker
  - type: Clickable
  - type: InteractionOutline
  - type: Collidable
-
  placement:
    mode: AlignTileAny

 - type: entity
  name: LateJoin Spawn Point
-  id: spawn_point_latejoin
-  parent: spawn_point
+  id: SpawnPointLatejoin
+  parent: SpawnPoint
  components:
  - type: Sprite
    state: cross_red
-
  - type: SpawnPoint
    spawn_type: LateJoin
-
  - type: Icon
    state: cross_red

 - type: entity
  name: Observer Spawn Point
  id: SpawnPointObserver
-  parent: spawn_point
+  parent: SpawnPoint
  components:
  - type: Sprite
    state: observer_start
-
  - type: SpawnPoint
    spawn_type: Observer
-
  - type: Icon
    state: observer_start
--- a/Resources/Prototypes/Entities/Markers/spawn_points_jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/spawn_points_jobs.yml
@@ -1,7 +1,7 @@
 # Base
 - type: entity
  id: SpawnPointJobBase
-  parent: spawn_point
+  parent: SpawnPoint
  abstract: true
  components:
  - type: SpawnPoint
--- a/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml
+++ b/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml
@@ -6,8 +6,10 @@
  startingGear: CargoTechGear
  department:
  - Cargo
-
  icon: "CargoTechnician"
+  access:
+  - Cargo
+  - Maintenance

 - type: startingGear
  id: CargoTechGear
--- a/Resources/Prototypes/Jobs/Civilian/Assistant.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Assistant.yml
@@ -5,11 +5,10 @@
  startingGear: AssistantGear
  department:
  - Civilian
-
  icon: "Assistant"
-
  access:
-  - maintenance
+  - Maintenance
+  - Service

 - type: startingGear
  id: AssistantGear
--- a/Resources/Prototypes/Jobs/Civilian/Bartender.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Bartender.yml
@@ -5,8 +5,9 @@
  startingGear: BartenderGear
  department:
  - Civilian
-
  icon: "Bartender"
+  access:
+  - Service

 - type: startingGear
  id: BartenderGear
--- a/Resources/Prototypes/Jobs/Civilian/Chef.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Chef.yml
@@ -5,8 +5,10 @@
  startingGear: ChefGear
  department:
  - Civilian
-
  icon: "Chef"
+  access:
+  - Service
+  - Maintenance

 - type: startingGear
  id: ChefGear
--- a/Resources/Prototypes/Jobs/Civilian/Clown.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Clown.yml
@@ -5,8 +5,10 @@
  startingGear: ClownGear
  department:
  - Civilian
-
  icon: "Clown"
+  access:
+  - Service
+  - Maintenance

 - type: startingGear
  id: ClownGear
--- a/Resources/Prototypes/Jobs/Civilian/Janitor.yml
+++ b/Resources/Prototypes/Jobs/Civilian/Janitor.yml
@@ -5,12 +5,10 @@
  startingGear: JanitorGear
  department:
  - Civilian
-
  icon: "Janitor"
-
  access:
-  - service
-  - maintenance
+  - Service
+  - Maintenance

 - type: startingGear
  id: JanitorGear
--- a/Resources/Prototypes/Jobs/Command/Captain.yml
+++ b/Resources/Prototypes/Jobs/Command/Captain.yml
@@ -6,22 +6,21 @@
  startingGear: CaptainGear
  department:
  - Command
-
  icon: "Captain"
-
  access:
  # All of em.
  # Could probably do with some kind of wildcard or whatever to automate this.
-  - captain
-  - idCard
-  - command
-  - security
-  - engineering
-  - medical
-  - cargo
-  - research
-  - service
-  - maintenance
+  - Captain
+  - IdCard
+  - Command
+  - Security
+  - Engineering
+  - Medical
+  - Cargo
+  - Research
+  - Service
+  - Maintenance
+  - External

 - type: startingGear
  id: CaptainGear
--- a/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml
+++ b/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml
@@ -7,16 +7,14 @@
  department:
  - Command
  - Civilian
-
  icon: "HeadOfPersonnel"
-
  access:
-  - command
-  - idCard
-  - security # HoPcurity strikes again
-  - service
-  - cargo
-  - maintenance
+  - Command
+  - IdCard
+  - Security # HoPcurity strikes again
+  - Service
+  - Cargo
+  - Maintenance
  # I mean they'll give themselves the rest of the access levels *anyways*.

 - type: startingGear
--- a/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml
@@ -7,13 +7,12 @@
  department:
  - Command
  - Engineering
-
  icon: "ChiefEngineer"
-
  access:
-  - maintenance
-  - engineering
-  - command
+  - Maintenance
+  - Engineering
+  - Command
+  - External

 - type: startingGear
  id: ChiefEngineerGear
--- a/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml
@@ -6,12 +6,11 @@
  startingGear: StationEngineerGear
  department:
  - Engineering
-
  icon: "StationEngineer"
-
  access:
-  - maintenance
-  - engineering
+  - Maintenance
+  - Engineering
+  - External

 - type: startingGear
  id: StationEngineerGear
--- a/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml
@@ -9,12 +9,11 @@
  department:
  - Command
  - Medical
-
  icon: "ChiefMedicalOfficer"
-
  access:
-  - medical
-  - command
+  - Medical
+  - Command
+  - Maintenance

 - type: startingGear
  id: CMOGear
--- a/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml
+++ b/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml
@@ -6,11 +6,9 @@
  startingGear: DoctorGear
  department:
  - Medical
-
  icon: "MedicalDoctor"
-
  access:
-  - medical
+  - Medical

 - type: startingGear
  id: DoctorGear
--- a/Resources/Prototypes/Jobs/Science/ResearchDirector.yml
+++ b/Resources/Prototypes/Jobs/Science/ResearchDirector.yml
@@ -7,12 +7,11 @@
  department:
  - Command
  - Science
-
  icon: "ResearchDirector"
-
  access:
-  - research
-  - command
+  - Research
+  - Command
+  - Maintenance

 - type: startingGear
  id: ResearchDirectorGear
--- a/Resources/Prototypes/Jobs/Science/Scientist.yml
+++ b/Resources/Prototypes/Jobs/Science/Scientist.yml
@@ -6,11 +6,9 @@
  startingGear: ScientistGear
  department:
  - Science
-
  icon: "Scientist"
-
  access:
-  - research
+  - Research

 - type: startingGear
  id: ScientistGear
--- a/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml
+++ b/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml
@@ -7,13 +7,12 @@
  department:
  - Command
  - Security
-
  icon: "HeadOfSecurity"
-
  access:
-  - command
-  - security
-  - maintenance
+  - Command
+  - Security
+  - Maintenance
+  - Service

 - type: startingGear
  id: HoSGear
--- a/Resources/Prototypes/Jobs/Security/SecurityOfficer.yml
+++ b/Resources/Prototypes/Jobs/Security/SecurityOfficer.yml
@@ -6,12 +6,11 @@
  startingGear: SecurityOfficerGear
  department:
  - Security
-
  icon: "SecurityOfficer"
-
  access:
-  - security
-  - maintenance
+  - Security
+  - Maintenance
+  - Service

 - type: startingGear
  id: SecurityOfficerGear