Skip to content

Commit

Permalink
Saltern airlocks (#1008)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
AJCM-git and Hugal31 committed May 30, 2020
1 parent 24f28ee commit a12821b
Show file tree
Hide file tree
Showing 15 changed files with 3,607 additions and 2,425 deletions.
5,721 changes: 3,388 additions & 2,333 deletions Resources/Maps/saltern.yml

Large diffs are not rendered by default.

174 changes: 151 additions & 23 deletions 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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -58,6 +54,72 @@
components:
- type: AccessReader
necessary: ["Command"]

- type: entity
parent: AirlockSecurity
id: AirlockSecurityLocked
suffix: Security, Locked
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
Expand All @@ -67,16 +129,82 @@
necessary: ["Command"]

- type: entity
parent: AirlockSecurity
id: AirlockSecurityLocked
parent: AirlockSecurityGlass
id: AirlockSecurityGlassLocked
suffix: Security, Locked
components:
- type: AccessReader
necessary: ["Security"]

# Maintenance Hatchs
- type: entity
parent: AirlockSecurityGlass
id: AirlockSecurityGlassLocked
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"]
necessary: ["Security", "Maintenance"]
14 changes: 12 additions & 2 deletions 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
Expand Down Expand Up @@ -57,7 +57,7 @@
- type: entity
id: AirlockGlass
parent: Airlock
name: Glass Airlock
name: glass airlock
components:
- type: Airlock
occludes: false
Expand All @@ -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

0 comments on commit a12821b

Please sign in to comment.