]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Airlock assembly prototypes (#23821)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Thu, 1 Feb 2024 09:49:47 +0000 (03:49 -0600)
committerGitHub <noreply@github.com>
Thu, 1 Feb 2024 09:49:47 +0000 (20:49 +1100)
* adds prototypes for airlock assemblies for other doors

* fix tests

20 files changed:
Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json
Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json
Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json
Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json
Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json
Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json
Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png

index f69768cf858867950749174c875cf50612bfc8e5..2fc5817287f6b0bd93d3c5cffd3cb892b92c9288 100644 (file)
+#Atmospherics
 - type: entity
-  id: AirlockAssembly
-  name: airlock assembly
-  description: It opens, it closes, and maybe crushes you.
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
-    state: "assembly"
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
-        density: 110
-        mask:
-        - FullTileMask
-        layer:
-        - HumanoidBlockLayer
-  - type: Anchorable
-    delay: 2
-  - type: Pullable
-  - type: Transform
-    anchored: true
-    noRot: true
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 300
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Construction
-    graph: Airlock
-    node: assembly
-  placement:
-    mode: SnapgridCenter
+  parent: AirlockAssembly
+  id: AirlockAssemblyAtmospherics
+  name: airlock assembly
+  suffix: Atmospherics
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyAtmosphericsGlass
+  name: airlock assembly
+  suffix: Atmospherics, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi
+    state: "assembly"
+
+#Cargo
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCargo
+  name: airlock assembly
+  suffix: Cargo
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCargoGlass
+  name: airlock assembly
+  suffix: Cargo, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
+    state: "assembly"
+
+#Command
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCommand
+  name: airlock assembly
+  suffix: Command
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/command.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCommandGlass
+  name: airlock assembly
+  suffix: Command, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/command.rsi
+    state: "assembly"
+
+#Engineering
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyEngineering
+  name: airlock assembly
+  suffix: Engineering
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyEngineeringGlass
+  name: airlock assembly
+  suffix: Engineering, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
+    state: "assembly"
+
+#External
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyExternal
+  name: airlock assembly
+  suffix: External
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/external.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyExternalGlass
+  name: airlock assembly
+  suffix: External, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/external.rsi
+    state: "assembly"
+
+#Public (Glass Airlock)
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyGlass
+  name: airlock assembly
+  suffix: Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
+    state: "assembly"
+
+#Freezer
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyFreezer
+  name: airlock assembly
+  suffix: Freezer
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
+    state: "assembly"
+
+#Maintenance
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMaintenance
+  name: airlock assembly
+  suffix: Maintenance
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMaintenanceGlass
+  name: airlock assembly
+  suffix: Maintenance, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/maint.rsi
+    state: "assembly"
+
+#Medical
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMedical
+  name: airlock assembly
+  suffix: Medical
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/medical.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMedicalGlass
+  name: airlock assembly
+  suffix: Medical, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/medical.rsi
+    state: "assembly"
+
+#Science
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyScience
+  name: airlock assembly
+  suffix: Science
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/science.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyScienceGlass
+  name: airlock assembly
+  suffix: Science, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/science.rsi
+    state: "assembly"
+
+#Security
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySecurity
+  name: airlock assembly
+  suffix: Security
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/security.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySecurityGlass
+  name: airlock assembly
+  suffix: Security, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/security.rsi
+    state: "assembly"
+
+#Shuttle
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttle
+  name: airlock assembly
+  suffix: Shuttle
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttleGlass
+  name: airlock assembly
+  suffix: Shuttle, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
+    state: "assembly"
+
+#Virology
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyVirology
+  name: airlock assembly
+  suffix: Virology
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/virology.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyVirologyGlass
+  name: airlock assembly
+  suffix: Virology, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/virology.rsi
+    state: "assembly"
+
+#CentralCommand
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCentralCommand
+  name: airlock assembly
+  suffix: CentralCommand
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCentralCommandGlass
+  name: airlock assembly
+  suffix: CentralCommand, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
+    state: "assembly"
+
+#Mining
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMining
+  name: airlock assembly
+  suffix: Mining
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/mining.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMiningGlass
+  name: airlock assembly
+  suffix: Mining, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/mining.rsi
+    state: "assembly"
+
+#Syndicate
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySyndicate
+  name: airlock assembly
+  suffix: Syndicate
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySyndicateGlass
+  name: airlock assembly
+  suffix: Syndicate, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi
+    state: "assembly"
+
+#ShuttleSyndicate
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttleSyndicate
+  name: airlock assembly
+  suffix: ShuttleSyndicate
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttleSyndicateGlass
+  name: airlock assembly
+  suffix: ShuttleSyndicate, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
+    state: "assembly"
+
+#High Security
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyHighSec
+  name: airlock assembly
+  suffix: HighSec
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/highsec/highsec.rsi
+    state: "assembly"
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
new file mode 100644 (file)
index 0000000..fcdb0d2
--- /dev/null
@@ -0,0 +1,45 @@
+#Base
+- type: entity
+  id: AirlockAssembly
+  name: airlock assembly
+  description: It opens, it closes, and maybe crushes you.
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
+    state: "assembly"
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 110
+        mask:
+        - FullTileMask
+        layer:
+        - HumanoidBlockLayer
+  - type: Anchorable
+    delay: 2
+  - type: Pullable
+  - type: Transform
+    anchored: true
+    noRot: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Airlock
+    node: assembly
+  placement:
+    mode: SnapgridCenter
\ No newline at end of file
index 814d8379085726788b724bad9e3bea90f88c45c8..7db8f8b6e85e0e9e567016b66d0f2570478dafe8 100644 (file)
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
new file mode 100644 (file)
index 0000000..85715a9
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png differ
index aa15016736748e3ce52b626a19dcfeaaf46e74a3..603c7588fd7086e64f25601be3b53d12c043683f 100644 (file)
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "assembly"
+    },
     {
       "name": "bolted_unlit"
     },
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png
new file mode 100644 (file)
index 0000000..0b14b77
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png differ
index f3162728da4c018301371cd41eac02ca4e768cce..505b597a61350ef511fc8ef615e76d96dda87a09 100644 (file)
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "assembly"
+    },
     {
       "name": "bolted_unlit"
     },
index 5e2dae4c261975d9534887d1fe82740b4cfc6b89..26d9dc17c253075d97164034bea2e811b3052eea 100644 (file)
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png
new file mode 100644 (file)
index 0000000..499ec46
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png differ
index 8806685e8c7e8e3eabe42f85718ce6aaaff35ef4..ded8386db5c472309ce396b4ab53289f0d5ede77 100644 (file)
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "assembly"
+    },
     {
       "name": "bolted_unlit"
     },
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/assembly.png
new file mode 100644 (file)
index 0000000..587c560
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/assembly.png differ
index 8408176365e096964725357bd5154ec12bc28f6f..1081b1b57d2dc987d1fa1e744ed641dbb3450fb4 100644 (file)
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "assembly"
+    },
     {
       "name": "bolted_unlit"
     },
index da1739bb279ebc611aaf6e03d031e6940313bad1..891e7fd9ee4ba1dcadb701d22aff584ce06dcf60 100644 (file)
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
new file mode 100644 (file)
index 0000000..62b788c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png differ
index aa15016736748e3ce52b626a19dcfeaaf46e74a3..603c7588fd7086e64f25601be3b53d12c043683f 100644 (file)
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "assembly"
+    },
     {
       "name": "bolted_unlit"
     },
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/assembly.png
new file mode 100644 (file)
index 0000000..8518b52
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/assembly.png differ
index 7248a273c1b7e46d86fea9eecccf8e1eea3d3449..72a5cbe0d12afec18e0bb4cbafcb0f06d20ae4db 100644 (file)
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "assembly"
+    },
     {
       "name": "bolted_unlit"
     },
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/assembly.png
new file mode 100644 (file)
index 0000000..4102c5d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/assembly.png differ
index d9058e33726cd6dfa1527c45719d6287de0ad545..712b0ea1fc2fa94f844afbc801416f32e0ae7f35 100644 (file)
@@ -7,6 +7,9 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "assembly"
+    },
     {
       "name": "bolted_unlit"
     },
index 9ac8b2ad682a34277675e4de772cf89bdec1567b..2a4287034ab002803ff9447030121996148bcf0a 100644 (file)
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png differ