Merge branch 'master' into 2020-08-19-firelocks

2020-09-12 15:52:20 +02:00
parent ca7cffbc48 7cd98a4bce
commit c27ab9bf6a
20 changed files with 355 additions and 11 deletions
--- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
@@ -12,7 +12,12 @@
  - type: Icon
    texture: Constructible/Power/eightdirwire.png
  - type: Sprite
-    texture: Constructible/Power/eightdirwire.png
+  - type: Appearance
+    visuals:
+    - type: PipeVisualizer
+      pipeRSI: Constructible/Atmos/pipe.rsi
+    - type: SiphonVisualizer
+      siphonRSI: Constructible/Atmos/scrubber.rsi
  - type: Destructible
    thresholdvalue: 100

--- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
@@ -12,7 +12,12 @@
  - type: Icon
    texture: Constructible/Power/eightdirwire.png
  - type: Sprite
-    texture: Constructible/Power/eightdirwire.png
+  - type: Appearance
+    visuals:
+    - type: PipeVisualizer
+      pipeRSI: Constructible/Atmos/pipe.rsi
+    - type: VentVisualizer
+      ventRSI: Constructible/Atmos/vent.rsi
  - type: Destructible
    thresholdvalue: 100

--- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
@@ -18,6 +18,7 @@
 - type: entity
  id: LargeBarSign
  name: large bar sign
+  abstract: true
  components:
  - type: Clickable
  - type: InteractionOutline