From de141c49c5076b2a7ae99b507a34ec09d3e24685 Mon Sep 17 00:00:00 2001
From: DamianX <DamianX@users.noreply.github.com>
Date: Fri, 20 Sep 2019 19:42:01 +0200
Subject: [PATCH] Fixed computers and vending machines collision (#350)

* Fixed computers and vending machines collision

* Also fixed mapped entities
---
 Resources/Maps/stationstation.yml                | 16 ++++++++++++----
 .../Prototypes/Entities/buildings/computers.yml  |  4 +++-
 .../Entities/buildings/vending_machines.yml      |  4 +++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index 5466bfb5ac..1df9ef9bc7 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -1833,7 +1833,9 @@ entities:
     type: Transform
   - shapes:
     - !type:PhysShapeAabb
-      layer: 8
+      bounds: "-0.5,-0.25,0.5,0.25"
+      mask: 19
+      layer: 16
     type: Collidable
 - type: computerAlert
   uid: 154
@@ -1844,7 +1846,9 @@ entities:
     type: Transform
   - shapes:
     - !type:PhysShapeAabb
-      layer: 8
+      bounds: "-0.5,-0.25,0.5,0.25"
+      mask: 19
+      layer: 16
     type: Collidable
 - type: table
   uid: 155
@@ -5049,7 +5053,9 @@ entities:
     type: Sprite
   - shapes:
     - !type:PhysShapeAabb
-      layer: 8
+      bounds: "-0.5,-0.25,0.5,0.25"
+      mask: 19
+      layer: 16
     type: Collidable
 - type: vending_machine_youtool
   uid: 419
@@ -5062,7 +5068,9 @@ entities:
     type: Sprite
   - shapes:
     - !type:PhysShapeAabb
-      layer: 8
+      bounds: "-0.5,-0.25,0.5,0.25"
+      mask: 19
+      layer: 16
     type: Collidable
 - type: Generator
   uid: 420
diff --git a/Resources/Prototypes/Entities/buildings/computers.yml b/Resources/Prototypes/Entities/buildings/computers.yml
index e61008a012..c9297c8e08 100644
--- a/Resources/Prototypes/Entities/buildings/computers.yml
+++ b/Resources/Prototypes/Entities/buildings/computers.yml
@@ -6,7 +6,9 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 8
+      bounds: "-0.5,-0.25,0.5,0.25"
+      mask: 19
+      layer: 16
   - type: Icon
     sprite: Buildings/computer.rsi
     state: computer
diff --git a/Resources/Prototypes/Entities/buildings/vending_machines.yml b/Resources/Prototypes/Entities/buildings/vending_machines.yml
index 2e77d934de..97ca099aaf 100644
--- a/Resources/Prototypes/Entities/buildings/vending_machines.yml
+++ b/Resources/Prototypes/Entities/buildings/vending_machines.yml
@@ -16,7 +16,9 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 8
+      bounds: "-0.5,-0.25,0.5,0.25"
+      mask: 19
+      layer: 16
   - type: SnapGrid
     offset: Center
   - type: Damageable