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/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