From 377bd1890e2ed222b99531f58df3150dab1b340a Mon Sep 17 00:00:00 2001 From: moneyl <8206401+Moneyl@users.noreply.github.com> Date: Thu, 23 May 2019 15:43:16 -0400 Subject: [PATCH 1/2] Update submodule. --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 10440648bc..e7a8e9b1aa 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 10440648bc1225cecb5eb09ec2c45d0ec18423c9 +Subproject commit e7a8e9b1aadabfc6983a29e9f6cb79831ba385bb From 196ec030f53b58aaaee71c4f45d5ec20075d608a Mon Sep 17 00:00:00 2001 From: moneyl <8206401+Moneyl@users.noreply.github.com> Date: Thu, 23 May 2019 15:46:43 -0400 Subject: [PATCH 2/2] Add aabb values and Collidable component to power objects --- Resources/Prototypes/Entities/Power.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Prototypes/Entities/Power.yml b/Resources/Prototypes/Entities/Power.yml index c49ea8244c..f47d27f500 100644 --- a/Resources/Prototypes/Entities/Power.yml +++ b/Resources/Prototypes/Entities/Power.yml @@ -41,6 +41,8 @@ components: - type: Clickable - type: BoundingBox + aabb: -0.5, -0.5, 0.3, 0.5 + - type: Collidable - type: Sprite texture: Objects/generator.png - type: Icon @@ -105,6 +107,8 @@ components: - type: Clickable - type: BoundingBox + aabb: -0.5, -0.5, 0.5, 0.5 + - type: Collidable - type: Sprite netsync: false sprite: Buildings/smes.rsi @@ -140,6 +144,8 @@ components: - type: Clickable - type: BoundingBox + aabb: -0.5, -0.25, 0.5, 0.25 + - type: Collidable - type: Sprite texture: Objects/wiredmachine.png - type: Icon @@ -156,6 +162,8 @@ components: - type: Clickable - type: BoundingBox + aabb: -0.5, -0.25, 0.5, 0.25 + - type: Collidable - type: Sprite texture: Objects/wirelessmachine.png - type: Icon