Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Plastic flaps collision fix (make conveyors great again) #1911

Merged
merged 1 commit into from
Sep 22, 2024
Merged

Plastic flaps collision fix (make conveyors great again) #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Content.Shared/Physics/CollisionGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
5 changes: 4 additions & 1 deletion Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions Resources/Prototypes/Entities/Structures/plastic_flaps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading