From 49ea3da72e8e30b333683d1403f609035710c8e8 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:45:48 +0100
Subject: [PATCH] Fix soap and banana peel slips. (#3681)

* Fix soap and banana peel slips.

* Update submodule.
---
 Resources/Prototypes/Entities/Objects/Consumable/trash.yml | 6 ++++--
 Resources/Prototypes/Entities/Objects/Specific/janitor.yml | 4 +++-
 RobustToolbox                                              | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
index 9c44a9658a..ba8eacbbfb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
@@ -182,13 +182,15 @@
     state: peel
   - type: Slippery
     intersectPercentage: 0.2
+  - type: CollisionWake
+    enabled: false
   - type: Physics
     bodyType: KinematicController
     mass: 5
-    fixtures:
+    fixtures: # TODO: Make a second fixture. One should be for slipping, and the other for collisions.
       - shape:
           !type:PhysShapeAabb
-          bounds: "-0.3,-0.4,0.3,0.4"
+          bounds: "-0.2,-0.2,0.2,0.2"
         layer:
           - SmallImpassable
         mask:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
index fffe608eef..77ecd1b17c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
@@ -106,10 +106,12 @@
   - type: Slippery
     paralyzeTime: 2
     intersectPercentage: 0.2
+  - type: CollisionWake
+    enabled: false
   - type: Physics
     bodyType: KinematicController
     mass: 2.5
-    fixtures:
+    fixtures: # TODO: Make a second fixture. One should be for slipping, and the other for collisions.
       - shape:
           !type:PhysShapeAabb
           bounds: "-0.3,-0.4,0.3,0.4"
diff --git a/RobustToolbox b/RobustToolbox
index 6e5026d270..ffe4e5a8ab 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 6e5026d270926e8dccfeca22efa7c5b119a3926e
+Subproject commit ffe4e5a8abda64f97f2d8178037dc5881cccbdee