From abd2c7642ebce2efe54c07b0b7609b9551ebc7e8 Mon Sep 17 00:00:00 2001 From: PrPleGoo Date: Mon, 8 Apr 2019 18:30:55 +0200 Subject: [PATCH 1/5] Update RobustToolbox --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index d58d576677..42e883c097 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit d58d576677802e7d47a0ca9abb4786d24106f0a4 +Subproject commit 42e883c097b2b9d8cff57ca542b3fa0bacfb0165 From c3192e187cd96f76201c91fb9d803d70f9c685f4 Mon Sep 17 00:00:00 2001 From: PrPleGoo Date: Mon, 8 Apr 2019 18:35:27 +0200 Subject: [PATCH 2/5] Revert "Update RobustToolbox" This reverts commit abd2c7642ebce2efe54c07b0b7609b9551ebc7e8. --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 42e883c097..d58d576677 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 42e883c097b2b9d8cff57ca542b3fa0bacfb0165 +Subproject commit d58d576677802e7d47a0ca9abb4786d24106f0a4 From 69c1eff34e6f6a887c2903d18da57c4a7780ef02 Mon Sep 17 00:00:00 2001 From: PrPleGoo Date: Mon, 8 Apr 2019 18:35:38 +0200 Subject: [PATCH 3/5] Update RobustToolbox --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index d58d576677..e40cda6c99 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit d58d576677802e7d47a0ca9abb4786d24106f0a4 +Subproject commit e40cda6c990eb1c42c4e5422155c45ab7dd84845 From 5251b30591b1a0777bb9eaa387d2c0d5e3920ad4 Mon Sep 17 00:00:00 2001 From: PrPleGoo Date: Thu, 11 Apr 2019 17:04:48 +0200 Subject: [PATCH 4/5] Shoving lockers, content side --- Content.Shared/Maps/ContentTileDefinition.cs | 12 +++++++++++- Resources/Prototypes/Entities/Mobs.yml | 2 +- Resources/Prototypes/Entities/closet.yml | 5 +++++ Resources/Prototypes/Tiles/floors.yml | 3 +++ Resources/Prototypes/Tiles/plating.yml | 2 ++ Resources/Prototypes/Tiles/space.yml | 1 + 6 files changed, 23 insertions(+), 2 deletions(-) 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..e5ba16a814 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: 25 - 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 From 4eef8b9bd8f5013c20af0fd371eecd9f0d54c099 Mon Sep 17 00:00:00 2001 From: PrPleGoo Date: Thu, 11 Apr 2019 17:59:14 +0200 Subject: [PATCH 5/5] Changed human mass to 85. --- Resources/Prototypes/Entities/Mobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml index e5ba16a814..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: 25 + mass: 85 - type: Collidable DebugColor: "#0000FF"