From 7609dc92b7b621db78bb5f80ef7b9fc61fbbb200 Mon Sep 17 00:00:00 2001
From: stalengd
Date: Sat, 21 Sep 2024 19:01:47 +0300
Subject: [PATCH] Plastic flaps collision fix
---
Content.Shared/Physics/CollisionGroup.cs | 12 ++++++++++--
.../Structures/Storage/Tanks/base_structuretanks.yml | 5 ++++-
.../Prototypes/Entities/Structures/plastic_flaps.yml | 10 ++++++++--
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 0a11f93dbc81b2..f71cba8764da36 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -53,7 +53,11 @@ public enum CollisionGroup
ConveyorMask = Impassable | MidImpassable | LowImpassable | DoorPassable,
// Crates
- CrateMask = Impassable | HighImpassable | LowImpassable,
+ // SS220 Plastic Flaps Collision Fix begin
+ //CrateMask = Impassable | HighImpassable | LowImpassable,
+ // Why: not deleted for compatibility with wizards changes
+ CrateMask = MachineMask,
+ // SS220 Plastic Flaps Collision Fix end
// Tables that SmallMobs can go under
TableMask = Impassable | MidImpassable,
@@ -73,7 +77,11 @@ public enum CollisionGroup
// Soap, spills
SlipLayer = MidImpassable | LowImpassable,
- ItemMask = Impassable | HighImpassable,
+ // SS220 Plastic Flaps Collision Fix begin
+ //ItemMask = Impassable | HighImpassable,
+ // Why: plastic flaps moved to HighImpassible layer, and items should be able to pass
+ ItemMask = Impassable,
+ // SS220 Plastic Flaps Collision Fix end
ThrownItem = Impassable | HighImpassable | BulletImpassable,
WallLayer = Opaque | Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
index 7b56e6d36b55f0..2f208fff4972a2 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -19,7 +19,10 @@
mask:
- MachineMask
layer:
- - WallLayer
+ # SS220 Plastic Flaps Collision Fix begin
+ #- WallLayer
+ - MachineLayer
+ # SS220 Plastic Flaps Collision Fix end
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index ab705c035be132..bf9755bac1c03e 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -23,7 +23,10 @@
mask:
- Impassable
layer:
- - MidImpassable
+ # SS220 Plastic Flaps Collision Fix begin
+ #- MidImpassable
+ - HighImpassable
+ # SS220 Plastic Flaps Collision Fix end
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: Metallic
@@ -70,7 +73,10 @@
- Impassable
layer:
- Opaque
- - MidImpassable
+ # SS220 Plastic Flaps Collision Fix begin
+ #- MidImpassable
+ - HighImpassable
+ # SS220 Plastic Flaps Collision Fix end
- type: Occluder
- type: Construction
graph: PlasticFlapsGraph