Saltern airlocks (#1008)

* Guidelines, access, IDs resprite * Import CEV-Eris maintenance doors * more cleaning * Restore the IDs so they dont (hopefully) appear in the log * Airlocks and a little bit of organizing/cleanup * fixing a mistake * Remove excess line feeds in airlock_types.yml * some enhancements * formating IDs * Applying feedback * Fixing all (this time for real) * deleting empty spaces in spawn_point * Renaming the jobs and adding maint airlocks * Placing the airlocks * fix tiny fuckup * Import cargo airlock from CEV-Eris * Cargo airlocks * Fixes sufficient access type. Renames airlocks to match the guidelines * I give up * I tried really hard, okay? Co-authored-by: Hugo Laloge <hugo.laloge@gmail.com>
2020-05-30 07:43:13 -04:00
parent 24f28eea88
commit a12821bba5
15 changed files with 3712 additions and 2530 deletions
--- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_access.yml
+++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_access.yml
@@ -1,3 +1,12 @@
+# Airlocks
+- type: entity
+  parent: Airlock
+  id: AirlockServiceLocked
+  suffix: Service, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Service"]
+
 - type: entity
  parent: AirlockExternal
  id: AirlockExternalLocked
@@ -13,13 +22,14 @@
  components:
  - type: AccessReader
    necessary: ["Engineering"]
+
 - type: entity
-  parent: AirlockEngineeringGlass
-  id: AirlockEngineeringGlassLocked
-  suffix: Glass, Locked
+  parent: AirlockCargo
+  id: AirlockCargoLocked
+  suffix: Cargo, Locked
  components:
  - type: AccessReader
-    necessary: ["Engineering"]
+    necessary: ["Cargo"]

 - type: entity
  parent: AirlockMedical
@@ -28,13 +38,6 @@
  components:
  - type: AccessReader
    necessary: ["Medical"]
- type: entity
-  parent: AirlockMedicalGlass
-  id: AirlockMedicalGlassLocked
-  suffix: Medical, Locked
-  components:
-  - type: AccessReader
-    necessary: ["Medical"]

 - type: entity
  parent: AirlockScience
@@ -43,13 +46,6 @@
  components:
  - type: AccessReader
    necessary: ["Science"]
- type: entity
-  parent: AirlockScienceGlass
-  id: AirlockScienceGlassLocked
-  suffix: Science, Locked
-  components:
-  - type: AccessReader
-    necessary: ["Science"]

 - type: entity
  parent: AirlockCommand
@@ -58,13 +54,6 @@
  components:
  - type: AccessReader
    necessary: ["Command"]
- type: entity
-  parent: AirlockCommandGlass
-  id: AirlockCommandGlassLocked
-  suffix: Command, Locked
-  components:
-  - type: AccessReader
-    necessary: ["Command"]

 - type: entity
  parent: AirlockSecurity
@@ -73,6 +62,72 @@
  components:
  - type: AccessReader
    necessary: ["Security"]
+
+- type: entity
+  parent: AirlockSecurity
+  id: AirlockVaultLocked
+  suffix: Vault, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Security", "Command"]
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockEVALocked
+  suffix: EVA, Locked
+  components:
+  - type: AccessReader
+    necessary: ["External"]
+
+# Glass Airlocks
+- type: entity
+  parent: AirlockGlass
+  id: AirlockServiceGlassLocked
+  suffix: Service, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Service"]
+
+- type: entity
+  parent: AirlockEngineeringGlass
+  id: AirlockEngineeringGlassLocked
+  suffix: Glass, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Engineering"]
+
+- type: entity
+  parent: AirlockCargoGlass
+  id: AirlockCargoGlassLocked
+  suffix: Cargo, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Cargo"]
+
+- type: entity
+  parent: AirlockMedicalGlass
+  id: AirlockMedicalGlassLocked
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Medical"]
+
+- type: entity
+  parent: AirlockScienceGlass
+  id: AirlockScienceGlassLocked
+  suffix: Science, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Science"]
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockCommandGlassLocked
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Command"]
+
 - type: entity
  parent: AirlockSecurityGlass
  id: AirlockSecurityGlassLocked
@@ -80,3 +135,76 @@
  components:
  - type: AccessReader
    necessary: ["Security"]
+
+# Maintenance Hatchs
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintLocked
+  suffix: Locked
+  components:
+  - type: AccessReader
+    necessary: ["Maintenance"]
+
+- type: entity
+  parent: AirlockMaintCargo
+  id: AirlockMaintCargoLocked
+  suffix: Cargo, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Cargo", "Maintenance"]
+
+- type: entity
+  parent: AirlockMaintCommand
+  id: AirlockMaintCommandLocked
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Command", "Maintenance"]
+
+- type: entity
+  parent: AirlockMaintCommon
+  id: AirlockMaintCommonLocked
+  suffix: Common, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Maintenance"]
+
+- type: entity
+  parent: AirlockMaintEngi
+  id: AirlockMaintEngiLocked
+  suffix: Engineering, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Engineering", "Maintenance"]
+  
+- type: entity
+  parent: AirlockMaintInt
+  id: AirlockMaintIntLocked
+  suffix: Interior, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Maintenance"]
+
+- type: entity
+  parent: AirlockMaintMed
+  id: AirlockMaintMedLocked
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Medical", "Maintenance"]
+
+- type: entity
+  parent: AirlockMaintRnD
+  id: AirlockMaintRnDLocked
+  suffix: RnD, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Research", "Maintenance"]
+
+- type: entity
+  parent: AirlockMaintSec
+  id: AirlockMaintSecLocked
+  suffix: Security, Locked
+  components:
+  - type: AccessReader
+    necessary: ["Security", "Maintenance"]
--- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: Airlock
-  name: Airlock
+  name: airlock
  description: It opens, it closes, and maybe crushes you.
  components:
  - type: Clickable
@@ -57,7 +57,7 @@
 - type: entity
  id: AirlockGlass
  parent: Airlock
-  name: Glass Airlock
+  name: glass airlock
  components:
  - type: Airlock
    occludes: false
@@ -67,3 +67,13 @@
    sprite: Buildings/Doors/airlock_glass.rsi
  - type: Icon
    sprite: Buildings/Doors/airlock_glass.rsi
+
+- type: entity
+  parent: Airlock
+  id: AirlockMaint
+  name: maintenance hatch
+  components:
+  - type: Sprite
+    sprite: Buildings/Doors/airlock_maint.rsi
+  - type: Icon
+    sprite: Buildings/Doors/airlock_maint.rsi
--- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml
+++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml
@@ -1,4 +1,5 @@
- type: entity
+# Airlocks
+- type: entity
  parent: Airlock
  id: AirlockExternal
  suffix: External
@@ -26,14 +27,14 @@
    sprite: Buildings/Doors/airlock_engineering.rsi

 - type: entity
-  parent: AirlockGlass
-  id: AirlockEngineeringGlass
-  suffix: Engineering
+  parent: Airlock
+  id: AirlockCargo
+  suffix: Cargo 
  components:
  - type: Sprite
-    sprite: Buildings/Doors/airlock_engineering_glass.rsi
+    sprite: Buildings/Doors/airlock_cargo.rsi
  - type: Icon
-    sprite: Buildings/Doors/airlock_engineering_glass.rsi
+    sprite: Buildings/Doors/airlock_cargo.rsi

 - type: entity
  parent: Airlock
@@ -44,6 +45,58 @@
    sprite: Buildings/Doors/airlock_medical.rsi
  - type: Icon
    sprite: Buildings/Doors/airlock_medical.rsi
+
+- type: entity
+  parent: 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: Airlock
+  id: AirlockCommand
+  suffix: Command
+  components:
+  - type: Sprite
+    sprite: Buildings/Doors/airlock_command.rsi
+  - type: Icon
+    sprite: Buildings/Doors/airlock_command.rsi
+
+- type: entity
+  parent: Airlock
+  id: AirlockSecurity
+  suffix: Security
+  components:
+  - type: Sprite
+    sprite: Buildings/Doors/airlock_security.rsi
+  - type: Icon
+    sprite: Buildings/Doors/airlock_security.rsi
+
+# Glass Airlocks
+- type: entity
+  parent: AirlockGlass
+  id: AirlockEngineeringGlass
+  suffix: Engineering
+  components:
+  - type: Sprite
+    sprite: Buildings/Doors/airlock_engineering_glass.rsi
+  - type: Icon
+    sprite: Buildings/Doors/airlock_engineering_glass.rsi
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockCargoGlass
+  suffix: Cargo
+  components:
+  - type: Sprite
+    sprite: Buildings/Doors/airlock_cargo_glass.rsi
+  - type: Icon
+    sprite: Buildings/Doors/airlock_cargo_glass.rsi
+  
 - type: entity
  parent: AirlockGlass
  id: AirlockMedicalGlass
@@ -54,15 +107,6 @@
  - type: Icon
    sprite: Buildings/Doors/airlock_medical_glass.rsi

- type: entity
-  parent: 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: AirlockScienceGlass
@@ -73,35 +117,6 @@
  - type: Icon
    sprite: Buildings/Doors/airlock_science_glass.rsi

- type: entity
-  parent: Airlock
-  id: AirlockCargo
-  suffix: Cargo
-  components:
-  - type: Sprite
-    sprite: Buildings/Doors/airlock_cargo.rsi
-  - type: Icon
-    sprite: Buildings/Doors/airlock_cargo.rsi
-
- type: entity
-  parent: AirlockGlass
-  id: AirlockCargoGlass
-  suffix: Cargo
-  components:
-  - type: Sprite
-    sprite: Buildings/Doors/airlock_cargo_glass.rsi
-  - type: Icon
-    sprite: Buildings/Doors/airlock_cargo_glass.rsi
-
- type: entity
-  parent: Airlock
-  id: AirlockCommand
-  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
@@ -112,15 +127,6 @@
  - type: Icon
    sprite: Buildings/Doors/airlock_command_glass.rsi

- type: entity
-  parent: Airlock
-  id: AirlockSecurity
-  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
@@ -131,20 +137,10 @@
  - type: Icon
    sprite: Buildings/Doors/airlock_security_glass.rsi

+# Maintenance Hatchs
 - type: entity
-  parent: Airlock
-  id: AirlockMaint
-  name: Maintenance Hatch
-  components:
-  - type: Sprite
-    sprite: Buildings/Doors/airlock_maint.rsi
-  - type: Icon
-    sprite: Buildings/Doors/airlock_maint.rsi
-
- type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintCargo
-  name: Maintenance Hatch
  suffix: Cargo
  components:
  - type: Sprite
@@ -153,9 +149,8 @@
    sprite: Buildings/Doors/airlock_maint_cargo.rsi

 - type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintCommand
-  name: Maintenance Hatch
  suffix: Command
  components:
  - type: Sprite
@@ -164,9 +159,8 @@
    sprite: Buildings/Doors/airlock_maint_command.rsi

 - type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintCommon
-  name: Maintenance Hatch
  suffix: Common
  components:
  - type: Sprite
@@ -175,9 +169,8 @@
    sprite: Buildings/Doors/airlock_maint_common.rsi

 - type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintEngi
-  name: Maintenance Hatch
  suffix: Engineering
  components:
  - type: Sprite
@@ -186,9 +179,8 @@
    sprite: Buildings/Doors/airlock_maint_engi.rsi

 - type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintInt
-  name: Maintenance Hatch
  suffix: Interior
  components:
  - type: Sprite
@@ -197,9 +189,8 @@
    sprite: Buildings/Doors/airlock_maint_int.rsi

 - type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintMed
-  name: Maintenance Hatch
  suffix: Medical
  components:
  - type: Sprite
@@ -208,9 +199,8 @@
    sprite: Buildings/Doors/airlock_maint_med.rsi

 - type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintRnD
-  name: Maintenance Hatch
  suffix: RnD
  components:
  - type: Sprite
@@ -219,9 +209,8 @@
    sprite: Buildings/Doors/airlock_maint_rnd.rsi

 - type: entity
-  parent: Airlock
+  parent: AirlockMaint
  id: AirlockMaintSec
-  name: Maintenance Hatch
  suffix: Security
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml
@@ -51,7 +51,7 @@
  - type: IdCard
    jobTitle: Captain
  - type: Access
-    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External"]
+    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External", IdCard]

 - type: entity
  parent: IDCardStandard
@@ -223,7 +223,7 @@
  - type: IdCard
    jobTitle: Head of Personnel
  - type: Access
-    tags: ["Maintenance", "Cargo", "Security", "Service","Command"]
+    tags: ["Maintenance", "Cargo", "Security", "Service","Command", IdCard]

 - type: entity
  parent: IDCardStandard
@@ -318,4 +318,4 @@
  - type: IdCard
    jobTitle: Central Commander
  - type: Access
-    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External"]
+    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External", IdCard]
--- a/Resources/Prototypes/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Jobs/Command/captain.yml
--- a/Resources/Prototypes/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Jobs/Command/head_of_personnel.yml
--- a/Resources/Prototypes/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/chief_engineer.yml
--- a/Resources/Prototypes/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/station_engineer.yml
--- a/Resources/Prototypes/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Jobs/Medical/chief_medical_officer.yml
--- a/Resources/Prototypes/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Jobs/Medical/medical_doctor.yml
--- a/Resources/Prototypes/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Jobs/Science/research_director.yml
--- a/Resources/Prototypes/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Jobs/Science/scientist.yml
--- a/Resources/Prototypes/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Jobs/Security/head_of_security.yml
--- a/Resources/Prototypes/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Jobs/Security/security_officer.yml