Revert "Can't crawl over counters (#40099)"

This reverts commit 01a7fc66f011967579330b1c155c326b61fa5806.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872

diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 2878302e9a22531c9c7138eaac75354843f28042..1f19184b50618ce205057692ff1607c4cbc372db 100644 (file)
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -59,9 +59,6 @@ public enum CollisionGroup
     TableMask = Impassable | MidImpassable,
     TableLayer = MidImpassable,
 
-    // Tables that SmallMobs can't go under
-    CounterLayer = MidImpassable | LowImpassable,
-
     // Tabletop machines, windoors, firelocks
     TabletopMachineMask = Impassable | HighImpassable,
     // Tabletop machines

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index 3cbbccd3ca0d6c223b1c0cb562164965ea2e0c2d..27cb4d8b686fd7e5c52a9e3fb8247fbc06ce7ddb 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -57,4 +57,4 @@
         mask:
         - TableMask
         layer:
-        - CounterLayer
+        - TableLayer

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index edf653d0669201c8044c57c8300d8b54e9247a6e..fda2ac5e182da082a59a654f6335988ad55430db 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -77,7 +77,7 @@
         mask:
         - TableMask
         layer:
-        - CounterLayer
+        - TableLayer
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Wood
@@ -201,7 +201,7 @@
 
 - type: entity
   id: TableReinforced
-  parent: CounterBase
+  parent: TableBase
   name: reinforced table
   description: A square piece of metal standing on four metal legs. Extra robust.
   components:
@@ -471,7 +471,7 @@
 
 - type: entity
   id: TableBrass
-  parent: CounterBase
+  parent: TableBase
   name: brass table
   description: A shiny, corrosion resistant brass table. Steampunk!
   components:
@@ -615,7 +615,7 @@
 
 - type: entity
   id: TableStone
-  parent: CounterBase
+  parent: TableBase
   name: stone table
   description: Literally the sturdiest thing you have ever seen.
   components:
@@ -675,7 +675,7 @@
       collection: FootstepCarpet
 
 - type: entity
-  parent: CounterBase
+  parent: TableBase
   id: TableXeno
   name: xeno table
   description: I wouldn't put the silverware on it.

diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index 1009374cd6a3d42e859059077f38fcebd1416042..4867fc84d80ecb9ee88d8e7a46641ede5d9757de 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -105,7 +105,7 @@
           mask:
             - TableMask
           layer:
-            - CounterLayer
+            - TableLayer
     - type: TimedDespawn
       lifetime: 180
     - type: PointLight

diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
index feec88eeaf7038f23e2770ea0df4038b1cc46cc5..6722181b269edc0cdd604e64009a96be1859e02f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -29,7 +29,10 @@
           - 0.50,0.50
           - -0.50,0.50
         layer:
-        - ConveyorMask
+        - Impassable
+        - MidImpassable
+        - LowImpassable
+        - DoorPassable
         hard: False
   - type: Conveyor
   - type: DeviceNetwork