diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index a539da4f4a..255182e7ad 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using SS14.Shared.Interfaces.Map;
 using SS14.Shared.Prototypes;
 using SS14.Shared.Utility;
@@ -19,6 +19,7 @@ namespace Content.Shared.Maps
         public bool IsSubFloor { get; private set; }
         public bool CanCrowbar { get; private set; }
         public string FootstepSounds { get; private set; }
+        public float Friction { get; set; }
 
         public void AssignTileId(ushort id)
         {
@@ -45,6 +46,15 @@ namespace Content.Shared.Maps
             {
                 FootstepSounds = node.AsString();
             }
+
+            if (mapping.TryGetNode("friction", out node))
+            {
+                Friction = node.AsFloat();
+            }
+            else
+            {
+                Friction = 0;
+            }
         }
     }
 }
diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml
index 8523ceb11f..86af247a7e 100644
--- a/Resources/Prototypes/Entities/Mobs.yml
+++ b/Resources/Prototypes/Entities/Mobs.yml
@@ -40,7 +40,7 @@
     aabb: "-0.5,-0.25,-0.05,0.25"
 
   - type: Physics
-    mass: 5
+    mass: 85
 
   - type: Collidable
     DebugColor: "#0000FF"
diff --git a/Resources/Prototypes/Entities/closet.yml b/Resources/Prototypes/Entities/closet.yml
index 01fb939d29..9057e27a54 100644
--- a/Resources/Prototypes/Entities/closet.yml
+++ b/Resources/Prototypes/Entities/closet.yml
@@ -15,9 +15,14 @@
 
   - type: Clickable
   - type: BoundingBox
+    aabb: "-0.5,-0.25,0.5,0.25"
   - type: Collidable
+    IsInteractingWithFloor: true
   - type: Storage
     Capacity: 80
+  - type: Physics
+    mass: 25
+    Anchored: false
 
   placement:
     snap:
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index cb875d980b..8a608a8071 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -5,6 +5,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds: footstep_floor
+  friction: 0.35
 
 - type: tile
   name: floor_white
@@ -13,6 +14,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds: footstep_floor
+  friction: 0.1
 
 - type: tile
   name: floor_techmaint
@@ -21,3 +23,4 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds: footstep_floor
+  friction: 0.5
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 77b960b118..e2083c8f20 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -4,6 +4,7 @@
   texture: plating
   is_subfloor: true
   footstep_sounds: footstep_plating
+  friction: 0.5
 
 - type: tile
   name: underplating
@@ -11,3 +12,4 @@
   texture: underplating
   is_subfloor: true
   footstep_sounds: footstep_plating
+  friction: 0.5
diff --git a/Resources/Prototypes/Tiles/space.yml b/Resources/Prototypes/Tiles/space.yml
index 7807d85b61..28da91051c 100644
--- a/Resources/Prototypes/Tiles/space.yml
+++ b/Resources/Prototypes/Tiles/space.yml
@@ -2,3 +2,4 @@
   name: space
   display_name: Space
   texture: ""
+  friction: 0
\ No newline at end of file