Can't crawl over counters (#40099)

Counters and Tables separation

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 1f19184b50618ce205057692ff1607c4cbc372db..2878302e9a22531c9c7138eaac75354843f28042 100644 (file)
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -59,6 +59,9 @@ 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 27cb4d8b686fd7e5c52a9e3fb8247fbc06ce7ddb..3cbbccd3ca0d6c223b1c0cb562164965ea2e0c2d 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:
-        - TableLayer
+        - CounterLayer

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index fda2ac5e182da082a59a654f6335988ad55430db..edf653d0669201c8044c57c8300d8b54e9247a6e 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:
-        - TableLayer
+        - CounterLayer
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Wood
@@ -201,7 +201,7 @@
 
 - type: entity
   id: TableReinforced
-  parent: TableBase
+  parent: CounterBase
   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: TableBase
+  parent: CounterBase
   name: brass table
   description: A shiny, corrosion resistant brass table. Steampunk!
   components:
@@ -615,7 +615,7 @@
 
 - type: entity
   id: TableStone
-  parent: TableBase
+  parent: CounterBase
   name: stone table
   description: Literally the sturdiest thing you have ever seen.
   components:
@@ -675,7 +675,7 @@
       collection: FootstepCarpet
 
 - type: entity
-  parent: TableBase
+  parent: CounterBase
   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 4867fc84d80ecb9ee88d8e7a46641ede5d9757de..1009374cd6a3d42e859059077f38fcebd1416042 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:
-            - TableLayer
+            - CounterLayer
     - type: TimedDespawn
       lifetime: 180
     - type: PointLight

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