From d09cc01838247227e91282db9041f04e427b0ee7 Mon Sep 17 00:00:00 2001
From: Vince <39844191+Visne@users.noreply.github.com>
Date: Fri, 19 Jun 2020 15:12:10 +0200
Subject: [PATCH] Added collision mask for vending machines, piano and
 computers (#1153)

* Added collision mask for vending machines, piano and computers

* Changed naming of "Run" to "Walk"

Fixes #844

* Revert "Changed naming of "Run" to "Walk""

This reverts commit 075083aa6250b9569e4c8ec9803f21d6736b2737.
---
 Resources/Prototypes/Entities/Buildings/computers.yml      | 4 ++++
 Resources/Prototypes/Entities/Buildings/instruments.yml    | 7 +++++++
 .../Prototypes/Entities/Buildings/vending_machines.yml     | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/Resources/Prototypes/Entities/Buildings/computers.yml b/Resources/Prototypes/Entities/Buildings/computers.yml
index 4eb5de57f9..f50c04452a 100644
--- a/Resources/Prototypes/Entities/Buildings/computers.yml
+++ b/Resources/Prototypes/Entities/Buildings/computers.yml
@@ -18,6 +18,10 @@
       - MobImpassable
       - VaultImpassable
       - Opaque
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
   - type: Icon
     sprite: Buildings/computer.rsi
     state: computer
diff --git a/Resources/Prototypes/Entities/Buildings/instruments.yml b/Resources/Prototypes/Entities/Buildings/instruments.yml
index b020d4cfc3..05deaefd08 100644
--- a/Resources/Prototypes/Entities/Buildings/instruments.yml
+++ b/Resources/Prototypes/Entities/Buildings/instruments.yml
@@ -41,6 +41,13 @@
      sprite: Objects/Instruments/otherinstruments.rsi
      state: piano
    - type: Anchorable
+   - type: Collidable
+     shapes:
+       - !type:PhysShapeAabb
+         mask:
+           - Impassable
+           - MobImpassable
+           - VaultImpassable
 
  - type: entity
    name: minimoog
diff --git a/Resources/Prototypes/Entities/Buildings/vending_machines.yml b/Resources/Prototypes/Entities/Buildings/vending_machines.yml
index 0b7bed5def..81a98d8023 100644
--- a/Resources/Prototypes/Entities/Buildings/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Buildings/vending_machines.yml
@@ -20,6 +20,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5,-0.25,0.5,0.25"
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
       layer:
       - Opaque
       - Impassable