reviews + test

2021-08-05 22:01:02 -07:00
parent 5af4c06231
commit 9354abb024
6 changed files with 95 additions and 110 deletions
--- a/Content.Server/Doors/Systems/AirlockSystem.cs
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -43,8 +43,8 @@ namespace Content.Server.Doors.Systems
            if (component.WiresComponent != null)
            {
                component.WiresComponent.IsPanelVisible =
-                    args.State != SharedDoorComponent.DoorState.Open
-                    || component.OpenPanelVisible;
+                    component.OpenPanelVisible
+                    ||  args.State != SharedDoorComponent.DoorState.Open;
            }
            // If the door is closed, we should look if the bolt was locked while closing
            component.UpdateBoltLightStatus();
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -10,9 +10,9 @@
    drawdepth: FloorObjects
    sprite: Structures/Doors/Windoors/windoor.rsi
    layers:
-      - state: assembly
-      - state: panel_open
-        visible: false
+    - state: assembly
+    - state: panel_open
+      visible: true
  - type: Physics
    fixtures:
    - shape:
@@ -37,7 +37,7 @@
        acts: ["Destruction"]
      - !type:SpawnEntitiesBehavior
        spawn:
-          MetalRod:
+          SheetSteel1:
            min: 1
            max: 3
  - type: Construction
@@ -71,9 +71,9 @@
        acts: ["Destruction"]
      - !type:SpawnEntitiesBehavior
        spawn:
-          MetalRod:
-            min: 2
-            max: 4
+          SheetPlasteel1:
+            min: 1
+            max: 2
  - type: Construction
    graph: windoor
    node: assemblySecure
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
@@ -50,9 +50,9 @@
          ShardGlass:
            min: 1
            max: 2
-          MetalRod:
-            min: 1
-            max: 3
+          SheetSteel1:
+            min: 2
+            max: 4
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
  - type: AccessReader
@@ -125,19 +125,11 @@
          ShardGlass:
            min: 1
            max: 2
-          MetalRod:
-            min: 2
-            max: 4
+          SheetPlasteel1:
+            min: 1
+            max: 2
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
  - type: Construction
    graph: windoor
    node: windoorSecure
-
-# "0.49,-0.49,-0.49,-0.2"
-# to:
-# (-0.2, -0.49), (-0.2, 0.49), (-0.49, 0.49), (-0.49, -0.49)
-# what i want is:
-# (0.49, -0.49), (0.49, -0.2), (-0.49, -0.2), (-0.49, -0.49)
-# which is:
-# "-0.2,-0.49,-0.49,0.49"
--- a/Resources/Prototypes/Recipes/Construction/Graphs/windoor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/windoor.yml
@@ -47,6 +47,79 @@
      - tool: Welding
        doAfter: 2

+  - node: glass
+    entity: WindoorAssembly
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assembly
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetGlass1
+        amount: 5
+      - !type:DeleteEntity { }
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: wired
+    entity: WindoorAssembly
+    edges:
+    - to: electronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: glass
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 1
+
+  - node: electronics
+    entity: WindoorAssembly
+    edges:
+    - to: windoor
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: windoor
+    entity: Windoor
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:AirlockBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:ContainerNotEmpty # TODO ShadowCommander: Remove when map gets updated
+        container: board
+      completed:
+      - !type:EmptyAllContainers {}
+      steps:
+      - tool: Prying
+        doAfter: 1
+
  - node: assemblySecure
    entity: WindoorAssemblySecure
    actions:
@@ -73,43 +146,12 @@
      - tool: Welding
        doAfter: 10

-  - node: glass
-    entity: WindoorAssembly
-    edges:
-    - to: wired
-      conditions:
-      - !type:EntityAnchored { }
-      completed:
-      - !type:SetLayerVisibility
-        layer: 1
-        value: true
-      steps:
-      - material: Cable
-        amount: 5
-        doAfter: 1
-    - to: assembly
-      conditions:
-      - !type:EntityAnchored
-        anchored: false
-      completed:
-      - !type:SpawnPrototype
-        prototype: SheetGlass1
-        amount: 5
-      - !type:DeleteEntity { }
-      steps:
-      - tool: Screwing
-        doAfter: 2
-
  - node: glassSecure
    entity: WindoorAssemblySecure
    edges:
    - to: wiredSecure
      conditions:
      - !type:EntityAnchored { }
-      completed:
-      - !type:SetLayerVisibility
-        layer: 2
-        value: true
      steps:
      - material: Cable
        amount: 5
@@ -127,35 +169,13 @@
      - tool: Screwing
        doAfter: 4

-  - node: wired
-    entity: WindoorAssembly
-    edges:
-    - to: electronics
-      conditions:
-      - !type:EntityAnchored {}
-      steps:
-      - tag: DoorElectronics
-        store: board
-        name: "door electronics circuit board"
-        icon:
-          sprite: "Objects/Misc/module.rsi"
-          state: "door_electronics"
-        doAfter: 1
-    - to: glass
-      completed:
-      - !type:SpawnPrototype
-        prototype: CableApcStack1
-        amount: 5
-      steps:
-      - tool: Cutting
-        doAfter: 1

  - node: wiredSecure
    entity: WindoorAssemblySecure
    edges:
    - to: electronicsSecure
      conditions:
-      - !type:EntityAnchored {}
+      - !type:EntityAnchored { }
      steps:
      - tag: DoorElectronics
        store: board
@@ -173,16 +193,6 @@
      - tool: Cutting
        doAfter: 3

-  - node: electronics
-    entity: WindoorAssembly
-    edges:
-    - to: windoor
-      conditions:
-      - !type:EntityAnchored {}
-      steps:
-      - tool: Screwing
-        doAfter: 2
-
  - node: electronicsSecure
    entity: WindoorAssemblySecure
    edges:
@@ -193,23 +203,6 @@
      - tool: Screwing
        doAfter: 4

-  - node: windoor
-    entity: Windoor
-    edges:
-    - to: wired
-      conditions:
-      - !type:EntityAnchored {}
-      - !type:AirlockBolted
-        value: false
-      - !type:WirePanel {}
-      - !type:ContainerNotEmpty # TODO ShadowCommander: Remove when map gets updated
-        container: board
-      completed:
-      - !type:EmptyAllContainers {}
-      steps:
-      - tool: Prying
-        doAfter: 1
-
  - node: windoorSecure
    entity: WindoorSecure
    edges:
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -207,7 +207,7 @@
  description: It opens, it closes, and you can see through it!
  icon:
    sprite: Structures/Doors/Windoors/windoor.rsi
-    state: assembly
+    state: closed
  objectType: Structure
  placementMode: SnapgridCenter
  canBuildInImpassable: false
@@ -224,7 +224,7 @@
  description: It opens, it closes, and you can see through it! This one looks tough.
  icon:
    sprite: Structures/Doors/Windoors/windoor.rsi
-    state: assembly
+    state: closed
  objectType: Structure
  placementMode: SnapgridCenter
  canBuildInImpassable: false
--- a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json
@@ -1,5 +1,7 @@
 {
-    "name":1,
+    "version":1,
+    "license":"CC-BY-SA-3.0",
+    "copyright":"Taken from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi",
    "size": {"x":32,"y":32},
    "states":
    [
@@ -18,7 +20,5 @@
        {"name":"bolted_unlit","directions":4},
        {"name":"welded","directions":4},
        {"name":"secure_underlay","directions":4}
-    ],
-    "license":"CC-BY-SA-3.0",
-    "copyright":"https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi"
+    ]
 }