tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework CollisionGroups (#7656)

Browse Source 
* Replace Mob, Vault, and Small impassable with Mid, High, Low

* Remove CollisionGroup.Underplating

* Remove CollisionGroup.Passable

* Fix constructed APCs not being interactable

* Change firelocks to occlude

* Make pipe inherit from BaseItem

* Clean up pipes

* Remove duplicate physics and fixtures from bucket

* Rework CollisionGroups on all entities

* Add SlipLayer

* Remove fixture from delta

* Fix maps

* Address reviews

* Add SubfloorMask

* Fix glass collisions for flying mobs

* Fix maps

* Update new items

* Fix bagel again

* Fix slug

* Fix maps

* Touchups

* Fix tables blocking high pressure movement

* Update StandingState to allow going under flaps

* Cleanup

* More formatting
This commit is contained in:
Jacob Tong
2022-05-10 17:57:20 -07:00
committed by GitHub
parent 6617310ffa
commit 8c853476fb
141 changed files with 750 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
View File

@@ -77,12 +77,12 @@ namespace Content.IntegrationTests.Tests.Utility
Assert.Null(entity);
// Other layers are fine
Assert.NotNull(sEntityManager.SpawnIfUnobstructed(null, entityCoordinates, CollisionGroup.MobImpassable));
Assert.True(sEntityManager.TrySpawnIfUnobstructed(null, entityCoordinates, CollisionGroup.MobImpassable, out entity));
Assert.NotNull(sEntityManager.SpawnIfUnobstructed(null, entityCoordinates, CollisionGroup.MidImpassable));
Assert.True(sEntityManager.TrySpawnIfUnobstructed(null, entityCoordinates, CollisionGroup.MidImpassable, out entity));
Assert.NotNull(entity);
Assert.NotNull(sEntityManager.SpawnIfUnobstructed(null, mapCoordinates, CollisionGroup.MobImpassable));
Assert.True(sEntityManager.TrySpawnIfUnobstructed(null, mapCoordinates, CollisionGroup.MobImpassable, out entity));
Assert.NotNull(sEntityManager.SpawnIfUnobstructed(null, mapCoordinates, CollisionGroup.MidImpassable));
Assert.True(sEntityManager.TrySpawnIfUnobstructed(null, mapCoordinates, CollisionGroup.MidImpassable, out entity));
Assert.NotNull(entity);
});
}

6
Content.Server/AI/Pathfinding/PathfindingSystem.cs
View File

@@ -48,9 +48,9 @@ namespace Content.Server.AI.Pathfinding
public const int TrackedCollisionLayers = (int)
(CollisionGroup.Impassable |
CollisionGroup.MobImpassable |
CollisionGroup.SmallImpassable |
CollisionGroup.VaultImpassable);
CollisionGroup.MidImpassable |
CollisionGroup.LowImpassable |
CollisionGroup.HighImpassable);
/// <summary>
/// Ask for the pathfinder to gimme somethin

4
Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Server.Atmos.EntitySystems
{
foreach (var (_, fixture) in fixtures.Fixtures)
{
_physics.AddCollisionMask(fixtures, fixture, (int) CollisionGroup.VaultImpassable);
_physics.AddCollisionMask(fixtures, fixture, (int) CollisionGroup.TableLayer);
}
}
}
@@ -79,7 +79,7 @@ namespace Content.Server.Atmos.EntitySystems
foreach (var fixture in fixtures.Fixtures.Values)
{
_physics.RemoveCollisionMask(fixtures, fixture, (int) CollisionGroup.VaultImpassable);
_physics.RemoveCollisionMask(fixtures, fixture, (int) CollisionGroup.TableLayer);
}
// TODO: Make them dynamic type? Ehh but they still want movement so uhh make it non-predicted like weightless?

2
Content.Server/Climbing/ClimbSystem.cs
View File

@@ -35,7 +35,7 @@ public sealed class ClimbSystem : SharedClimbSystem
[Dependency] private readonly StunSystem _stunSystem = default!;
private const string ClimbingFixtureName = "climb";
private const int ClimbingCollisionGroup = (int) CollisionGroup.VaultImpassable;
private const int ClimbingCollisionGroup = (int) CollisionGroup.TableLayer;
private readonly Dictionary<EntityUid, List<Fixture>> _fixtureRemoveQueue = new();

2
Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
View File

@@ -62,7 +62,7 @@ public sealed partial class TriggerSystem
_fixtures.TryCreateFixture(body, new Fixture(body, component.Shape)
{
// TODO: Should probably have these settable via datafield but I'm lazy and it's a pain
CollisionLayer = (int) (CollisionGroup.MobImpassable | CollisionGroup.SmallImpassable | CollisionGroup.VaultImpassable), Hard = false, ID = TriggerOnProximityComponent.FixtureID
CollisionLayer = (int) (CollisionGroup.MidImpassable | CollisionGroup.LowImpassable | CollisionGroup.HighImpassable), Hard = false, ID = TriggerOnProximityComponent.FixtureID
});
}

4
Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
View File

@@ -26,6 +26,8 @@ namespace Content.Server.Morgue.Components
{
[Dependency] private readonly IEntityManager _entMan = default!;
private const CollisionGroup TrayCanOpenMask = CollisionGroup.Impassable | CollisionGroup.MidImpassable;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("trayPrototype", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
private string? _trayPrototypeId;
@@ -69,7 +71,7 @@ namespace Content.Server.Morgue.Components
{
if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(Owner,
_entMan.GetComponent<TransformComponent>(Owner).Coordinates.Offset(_entMan.GetComponent<TransformComponent>(Owner).LocalRotation.GetCardinalDir()),
collisionMask: CollisionGroup.Impassable | CollisionGroup.VaultImpassable
collisionMask: TrayCanOpenMask
))
{
if (!silent)

2
Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs
View File

@@ -271,7 +271,7 @@ namespace Content.Server.Shuttles.EntitySystems
{
ID = BurnFixture,
Hard = false,
CollisionLayer = (int) CollisionGroup.MobImpassable
CollisionLayer = (int) CollisionGroup.FullTileMask
};
_fixtureSystem.TryCreateFixture(physicsComponent, fixture);

6
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -42,9 +42,9 @@ namespace Content.Server.Storage.Components
/// Collision masks that get removed when the storage gets opened.
/// </summary>
private const int MasksToRemove = (int) (
CollisionGroup.MobImpassable |
CollisionGroup.VaultImpassable |
CollisionGroup.SmallImpassable);
CollisionGroup.MidImpassable |
CollisionGroup.HighImpassable |
CollisionGroup.LowImpassable);
/// <summary>
/// Collision masks that were removed from ANY layer when the storage was opened;

57
Content.Shared/Physics/CollisionGroup.cs
View File

@@ -1,12 +1,10 @@
using System;
using JetBrains.Annotations;
using Robust.Shared.Map;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Serialization;
using RobustPhysics = Robust.Shared.Physics;
namespace Content.Shared.Physics
{
namespace Content.Shared.Physics;
/// <summary>
/// Defined collision groups for the physics system.
/// </summary>
@@ -15,21 +13,50 @@ namespace Content.Shared.Physics
public enum CollisionGroup
{
None = 0,
Opaque = 1 << 0, // 1 Blocks light, for lasers
Opaque = 1 << 0, // 1 Blocks light, can be hit by lasers
Impassable = 1 << 1, // 2 Walls, objects impassable by any means
MobImpassable = 1 << 2, // 4 Mobs, players, crabs, etc
VaultImpassable = 1 << 3, // 8 Things that cannot be jumped over, not half walls or tables
SmallImpassable = 1 << 4, // 16 Things a smaller object - a cat, a crab - can't go through - a wall, but not a computer terminal or a table
MidImpassable = 1 << 2, // 4 Mobs, players, crabs, etc
HighImpassable = 1 << 3, // 8 Things on top of tables and things that block tall/large mobs.
LowImpassable = 1 << 4, // 16 For things that can fit under a table or squeeze under an airlock
GhostImpassable = 1 << 5, // 32 Things impassible by ghosts/observers, ie blessed tiles or forcefields
Underplating = 1 << 6, // 64 Things that are under plating
[Obsolete("Don't use Passable for collision.")]
// Collision is for what things collide, not what they "don't collide with" so this makes 0 logical sense.
Passable = 1 << 7, // 128 Things that are passable.
BulletImpassable = 1 << 6, // 64 Can be hit by bullets
MapGrid = MapGridHelpers.CollisionGroup, // Map grids, like shuttles. This is the actual grid itself, not the walls or other entities connected to the grid.
MobMask = Impassable | MobImpassable | VaultImpassable | SmallImpassable,
ThrownItem = VaultImpassable,
// 32 possible groups
AllMask = -1,
}
MobMask = Impassable | MidImpassable | LowImpassable,
MobLayer = Opaque | BulletImpassable,
SmallMobMask = Impassable | LowImpassable,
SmallMobLayer = Opaque | BulletImpassable,
FlyingMobMask = Impassable,
FlyingMobLayer = Opaque | BulletImpassable,
LargeMobMask = Impassable | HighImpassable | MidImpassable | LowImpassable,
LargeMobLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
MachineMask = Impassable | MidImpassable | LowImpassable,
MachineLayer = Opaque | MidImpassable | LowImpassable | BulletImpassable,
TableMask = Impassable | MidImpassable,
TableLayer = MidImpassable,
TabletopMachineMask = Impassable | HighImpassable,
TabletopMachineLayer = Opaque | HighImpassable | BulletImpassable,
GlassAirlockLayer = HighImpassable | MidImpassable | BulletImpassable,
AirlockLayer = Opaque | GlassAirlockLayer,
HumanoidBlockLayer = HighImpassable | MidImpassable,
SlipLayer = MidImpassable | LowImpassable,
ItemMask = Impassable | HighImpassable,
ThrownItem = Impassable | HighImpassable,
WallLayer = Opaque | Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
HalfWallLayer = MidImpassable | LowImpassable,
FullTileMask = Impassable | HighImpassable | MidImpassable | LowImpassable,
SubfloorMask = Impassable | LowImpassable
}

8
Content.Shared/Standing/StandingStateComponent.cs
View File

@@ -17,11 +17,11 @@ namespace Content.Shared.Standing
public bool Standing { get; set; } = true;
/// <summary>
/// List of fixtures that had vault-impassable prior to an entity being downed. Required when re-adding the
/// collision mask.
/// List of fixtures that had their collision mask changed when the entity was downed.
/// Required for re-adding the collision mask.
/// </summary>
[DataField("vaultImpassableFixtures")]
public List<string> VaultImpassableFixtures = new();
[DataField("changedFixtures")]
public List<string> ChangedFixtures = new();
public override ComponentState GetComponentState()
{

16
Content.Shared/Standing/StandingStateSystem.cs
View File

@@ -13,6 +13,9 @@ namespace Content.Shared.Standing
{
[Dependency] private readonly IGameTiming _gameTiming = default!;
// If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited.
private const int StandingCollisionLayer = (int) CollisionGroup.MidImpassable;
public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
{
if (!Resolve(uid, ref standingState, false))
@@ -61,15 +64,16 @@ namespace Content.Shared.Standing
// Seemed like the best place to put it
appearance?.SetData(RotationVisuals.RotationState, RotationState.Horizontal);
// Change collision masks to allow going under certain entities like flaps and tables
if (TryComp(uid, out FixturesComponent? fixtureComponent))
{
foreach (var (key, fixture) in fixtureComponent.Fixtures)
{
if ((fixture.CollisionMask & (int) CollisionGroup.VaultImpassable) == 0)
if ((fixture.CollisionMask & StandingCollisionLayer) == 0)
continue;
standingState.VaultImpassableFixtures.Add(key);
fixture.CollisionMask &= ~(int) CollisionGroup.VaultImpassable;
standingState.ChangedFixtures.Add(key);
fixture.CollisionMask &= ~StandingCollisionLayer;
}
}
@@ -111,13 +115,13 @@ namespace Content.Shared.Standing
if (TryComp(uid, out FixturesComponent? fixtureComponent))
{
foreach (var key in standingState.VaultImpassableFixtures)
foreach (var key in standingState.ChangedFixtures)
{
if (fixtureComponent.Fixtures.TryGetValue(key, out var fixture))
fixture.CollisionMask |= (int) CollisionGroup.VaultImpassable;
fixture.CollisionMask |= StandingCollisionLayer;
}
}
standingState.VaultImpassableFixtures.Clear();
standingState.ChangedFixtures.Clear();
return true;
}

12
Resources/Maps/Salvage/tick-colony.yml
View File

@@ -704,8 +704,8 @@ entities:
radius: 0.35
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MidImpassable
- LowImpassable
layer:
- Opaque
mass: 70
@@ -956,8 +956,8 @@ entities:
radius: 0.35
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MidImpassable
- LowImpassable
layer:
- Opaque
mass: 70
@@ -1208,8 +1208,8 @@ entities:
radius: 0.35
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MidImpassable
- LowImpassable
layer:
- Opaque
mass: 70

51
Resources/Maps/atlas.yml
View File

@@ -9898,23 +9898,6 @@ entities:
- pos: 26.5,6.5
parent: 30
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -13813,23 +13796,6 @@ entities:
- pos: 13.5,18.5
parent: 30
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -18755,23 +18721,6 @@ entities:
- pos: -2.5,24.5
parent: 30
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

51
Resources/Maps/bagel.yml
View File

@@ -39982,23 +39982,6 @@ entities:
- pos: -27.5,2.5
parent: 59
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -54822,23 +54805,6 @@ entities:
- containers:
- EntityStorageComponent
type: Construction
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.4,-0.4
- 0.4,0.29
- -0.4,0.29
- -0.4,-0.4
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 25
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -94686,23 +94652,6 @@ entities:
- pos: 10.5,-68.5
parent: 59
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

34
Resources/Maps/barratry.yml
View File

@@ -110524,23 +110524,6 @@ entities:
- pos: -55.5,5.5
parent: 105
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -130394,23 +130377,6 @@ entities:
- pos: 8.5,12.5
parent: 105
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

17
Resources/Maps/delta.yml
View File

@@ -93087,23 +93087,6 @@ entities:
- pos: -56.5,17.5
parent: 49
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

81
Resources/Maps/infiltrator.yml
View File

@@ -7271,36 +7271,6 @@ entities:
type: Transform
- locked: False
type: Lock
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
EntityStorageComponent: !type:Container
ents:
- 701
- 702
- 703
- 720
- 714
- 751
- 711
type: ContainerContainer
- uid: 693
type: TableWood
components:
@@ -7327,23 +7297,6 @@ entities:
type: Transform
- locked: False
type: Lock
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -7364,23 +7317,6 @@ entities:
type: Transform
- locked: False
type: Lock
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -7401,23 +7337,6 @@ entities:
type: Transform
- locked: False
type: Lock
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

34
Resources/Maps/marathon.yml
View File

@@ -35461,23 +35461,6 @@ entities:
- pos: -38.5,56.5
parent: 17
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:
@@ -197474,23 +197457,6 @@ entities:
- pos: -27.5,-30.5
parent: 17
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

17
Resources/Maps/moose.yml
View File

@@ -88173,23 +88173,6 @@ entities:
- pos: -0.5,-0.5
parent: 8644
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

17
Resources/Maps/saltern.yml
View File

@@ -823,23 +823,6 @@ entities:
- pos: -11.5,21.5
parent: 854
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

17
Resources/Maps/splitstation.yml
View File

@@ -226804,23 +226804,6 @@ entities:
- pos: 21.5,-29.5
parent: 71
type: Transform
- fixtures:
- shape: !type:PolygonShape
vertices:
- 0.25,-0.48
- 0.25,0.48
- -0.25,0.48
- -0.25,-0.48
mask:
- Impassable
- SmallImpassable
layer:
- MobImpassable
- ThrownItem
- SmallImpassable
- Opaque
mass: 70
type: Fixtures
- isPlaceable: False
type: PlaceableSurface
- containers:

30
Resources/Prototypes/Entities/Effects/chemistry_effects.yml
View File

@@ -49,8 +49,10 @@
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
mask:
- ItemMask
layer:
- MobImpassable
- SlipLayer
- type: FoamSolutionAreaEffect
- type: SolutionContainerManager
solutions:
@@ -70,15 +72,6 @@
layers:
- state: mfoam
map: ["enum.FoamVisualLayers.Base"]
- type: Physics
- type: Fixtures
fixtures:
- hard: true
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
layer:
- MobImpassable
- type: Appearance
visuals:
- type: FoamVisualizer
@@ -98,15 +91,6 @@
layers:
- state: mfoam
map: ["enum.FoamVisualLayers.Base"]
- type: Physics
- type: Fixtures
fixtures:
- hard: true
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
layer:
- MobImpassable
- type: Appearance
visuals:
- type: FoamVisualizer
@@ -138,11 +122,9 @@
- shape:
!type:PhysShapeAabb {}
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- WallLayer
mask:
- WallLayer
- type: Occluder
sizeX: 32
sizeY: 32

6
Resources/Prototypes/Entities/Effects/puddle.yml
View File

@@ -20,10 +20,10 @@
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
layer:
- SmallImpassable
mask:
- SmallImpassable
- ItemMask
layer:
- SlipLayer
hard: false
- type: Appearance
visuals:

116
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -26,11 +26,9 @@
radius: 0.25
mass: 5
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- FlyingMobMask
layer:
- Opaque
- FlyingMobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -90,11 +88,9 @@
radius: 0.1
mass: 5
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- FlyingMobMask
layer:
- Opaque
- FlyingMobLayer
- type: MobState
thresholds:
0: !type:NormalMobState {}
@@ -291,11 +287,9 @@
radius: 0.2
mass: 5
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- FlyingMobMask
layer:
- Opaque
- FlyingMobLayer
- type: MobState
thresholds:
0: !type:NormalMobState {}
@@ -341,11 +335,9 @@
radius: 0.40
mass: 45
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -400,11 +392,9 @@
radius: 0.35
mass: 5
mask:
- Impassable
- MobImpassable #Bullets!?
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -518,11 +508,9 @@
radius: 0.48
mass: 20
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -559,11 +547,9 @@
radius: 0.25
mass: 60
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -686,10 +672,9 @@
radius: 0.2
mass: 10
mask:
- SmallImpassable
- MobImpassable
- SmallMobMask
layer:
- Opaque
- SmallMobLayer
- type: MobState
thresholds:
0: !type:NormalMobState {}
@@ -829,11 +814,9 @@
radius: 0.2
mass: 5
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -879,11 +862,9 @@
radius: 0.2
mass: 5
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -924,11 +905,9 @@
radius: 0.2
mass: 2
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- SmallMobMask
layer:
- Opaque
- SmallMobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -972,11 +951,9 @@
radius: 0.25
mass: 5
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- FlyingMobMask
layer:
- Opaque
- FlyingMobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -1017,11 +994,9 @@
radius: 0.25
mass: 10
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -1068,11 +1043,9 @@
radius: 0.25
mass: 10
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -1125,11 +1098,9 @@
radius: 0.25
mass: 8
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- SmallMobMask
layer:
- Opaque
- SmallMobLayer
- type: Appearance
visuals:
- type: RotationVisualizer
@@ -1175,11 +1146,9 @@
radius: 0.35
mass: 25
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -1240,12 +1209,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -1299,12 +1265,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -1358,12 +1321,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer

6
Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
View File

@@ -24,11 +24,9 @@
radius: 0.5
mass: 100
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: MovementIgnoreGravity
- type: MobState
thresholds:

10
Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
View File

@@ -25,11 +25,9 @@
radius: 0.40
mass: 20
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: MobState
thresholds:
0: !type:NormalMobState {}
@@ -107,9 +105,7 @@
radius: 0.40
mass: 5
mask:
- Impassable
- MobImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- type: GhostTakeoverAvailable

8
Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
View File

@@ -30,13 +30,9 @@
bounds: "-0.35,-0.35,0.35,0.35"
mass: 100
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobImpassable
- MachineLayer
- type: CharacterInfo
- type: HumanoidAppearance
- type: AnimationPlayer

46
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
View File

@@ -21,11 +21,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -224,11 +222,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -376,11 +372,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable #Bullets?!
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -421,12 +415,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -478,12 +469,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -524,12 +512,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable
- SmallImpassable
- VaultImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -604,12 +589,9 @@
radius: 0.35
mass: 10
mask:
- Impassable
- MobImpassable
- SmallImpassable
- VaultImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer

7
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
View File

@@ -52,12 +52,9 @@
radius: 0.35
mass: 20
mask:
- Impassable
- MobImpassable #Bullets?!
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: SolutionContainerManager
- type: Bloodstream
bloodlossDamage:

6
Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
View File

@@ -29,11 +29,9 @@
radius: 0.20
mass: 2.5
mask:
- Impassable
- MobImpassable
- SmallImpassable
- SmallMobMask
layer:
- Opaque
- SmallMobLayer
- type: MobState
thresholds:
0: !type:NormalMobState {}

7
Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
View File

@@ -34,12 +34,9 @@
radius: 0.35
mass: 120
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: MobState
thresholds:
0: !type:NormalMobState {}

4
Resources/Prototypes/Entities/Mobs/Player/guardian.yml
View File

@@ -43,9 +43,9 @@
radius: 0.35
mass: 10
mask:
- VaultImpassable
- FlyingMobMask
layer:
- Opaque
- FlyingMobLayer
- type: Damageable
damageContainer: Biological
- type: MobState

19
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
View File

@@ -36,12 +36,9 @@
radius: 0.35
mass: 20
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: MovementSpeedModifier
baseWalkSpeed : 4
baseSprintSpeed : 3
@@ -135,10 +132,9 @@
radius: 0.35
mass: 20
mask:
- SmallImpassable
- MobImpassable
- SmallMobMask
layer:
- Opaque
- SmallMobLayer
- type: Appearance
visuals:
- type: GenericEnumVisualizer
@@ -215,12 +211,9 @@
radius: 1
mass: 500
mask:
- SmallImpassable
- MobImpassable
- VaultImpassable
- Impassable
- LargeMobMask
layer:
- Opaque
- LargeMobLayer
- type: Appearance
visuals:
- type: DamageStateVisualizer

14
Resources/Prototypes/Entities/Mobs/Species/human.yml
View File

@@ -191,12 +191,9 @@
mass: 70
restitution: 0.0
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: AtmosExposed
- type: Flammable
fireSpread: true
@@ -425,12 +422,9 @@
mass: 70
restitution: 0.0
mask:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MobMask
layer:
- Opaque
- MobLayer
- type: HumanoidAppearance
- type: Body
template: HumanoidTemplate

4
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View File

@@ -191,13 +191,13 @@
id: "slips"
hard: false
layer:
- SmallImpassable
- SlipLayer
- shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
mass: 5
mask:
- SmallImpassable
- ItemMask
- type: Tag
tags:
- Recyclable

17
Resources/Prototypes/Entities/Objects/Decoration/flora.yml
View File

@@ -16,8 +16,8 @@
radius: 0.4
mass: 500
layer:
- HalfWallLayer
- Opaque
- VaultImpassable
- type: Climbable
- type: entity
@@ -39,8 +39,7 @@
bounds: "-0.35,-1.3,0.35,-0.5"
mass: 500
layer:
- Opaque
- Impassable
- WallLayer
- type: entity
parent: BaseTree
@@ -56,8 +55,7 @@
bounds: "-0.1,-1.0,0.1,-0.4"
mass: 500
layer:
- Opaque
- Impassable
- WallLayer
- type: entity
parent: BaseTree
@@ -73,8 +71,7 @@
bounds: "-0.18,-1.9,0.18,-1.2"
mass: 500
layer:
- Opaque
- Impassable
- WallLayer
- type: entity
parent: BaseTree
@@ -90,8 +87,7 @@
bounds: "-0.1,-1.5,0.1,-0.8"
mass: 500
layer:
- Opaque
- Impassable
- WallLayer
- type: entity
parent: BaseRock
@@ -315,8 +311,7 @@
bounds: "-0.8,-1.5,0.8,-0.8"
mass: 500
layer:
- Opaque
- Impassable
- WallLayer
- type: entity
parent: BaseTreeConifer

12
Resources/Prototypes/Entities/Objects/Devices/nuke.yml
View File

@@ -18,10 +18,10 @@
!type:PhysShapeCircle
radius: 0.45
mass: 150
layer:
- SmallImpassable
mask:
- VaultImpassable
- MachineMask
layer:
- HalfWallLayer
- type: Nuke
# ~50 tile radius in open space
# close to defaulkt max cap.
@@ -65,10 +65,10 @@
!type:PhysShapeCircle
radius: 0.45
mass: 150
layer:
- SmallImpassable
mask:
- VaultImpassable
- TabletopMachineMask
layer:
- TabletopMachineLayer
- type: SolutionContainerManager
solutions:
tank:

4
Resources/Prototypes/Entities/Objects/Devices/pda.yml
View File

@@ -205,13 +205,13 @@
id: "slips"
hard: false
layer:
- SmallImpassable
- SlipLayer
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
mass: 2.5
mask:
- SmallImpassable
- ItemMask
- type: entity
parent: BasePDA

18
Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
View File

@@ -84,6 +84,7 @@
visible: false
map: [ "light" ]
- type: Physics
canCollide: true
- type: Fixtures
fixtures:
- shape:
@@ -91,10 +92,9 @@
bounds: "-0.2, -0.5, 0.2, 0.5"
mass: 20
mask:
- Impassable
- MachineMask
layer:
- Opaque
- Impassable
- MachineLayer
- type: PointLight
enabled: false
radius: 8
@@ -153,10 +153,10 @@
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb {}
!type:PhysShapeAabb
bounds: "-0.2, -0.5, 0.2, 0.5"
mass: 20
mask:
- MachineMask
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- MachineLayer

10
Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
View File

@@ -18,10 +18,7 @@
bounds: "-0.5,-0.5,0.5,0.5"
mass: 15
layer:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- WallLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Inflatable
@@ -62,10 +59,7 @@
bounds: "-0.5,-0.5,0.5,0.5"
mass: 15
layer:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- WallLayer
- type: Door
openSound:
path: /Audio/Misc/zip.ogg

2
Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
View File

@@ -27,7 +27,7 @@
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.5,0.5"
layer:
- MobImpassable
- MidImpassable
- type: Damageable
damageModifierSet: Wood
- type: Destructible

3
Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
View File

@@ -24,8 +24,7 @@
!type:PhysShapeAabb
bounds: "-0.35,-0.2,0.25,0.1"
mask:
- Impassable
- VaultImpassable
- ItemMask
- type: Appearance
visuals:
- type: StackVisualizer

12
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
View File

@@ -62,9 +62,9 @@
bounds: "-0.25,-0.40,0.25,0.25"
mass: 20
mask:
- Impassable
- MobMask
layer:
- Opaque
- MobLayer
- type: Pullable
- type: entity
@@ -124,11 +124,11 @@
- shape:
!type:PhysShapeCircle
radius: 0.3
layer:
- SmallImpassable
mask:
- VaultImpassable
mass: 100
layer:
- MobLayer
mask:
- MobMask
- type: Spillable
- type: SolutionContainerManager
solutions:

4
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
View File

@@ -28,13 +28,13 @@
id: "slips"
hard: false
layer:
- SmallImpassable
- SlipLayer
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
mass: 5
mask:
- SmallImpassable
- ItemMask
- type: entity
name: soap

5
Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
View File

@@ -92,10 +92,7 @@
bounds: "-0.25,-0.25,0.25,0.25"
hard: false
mask:
- Opaque
- Impassable
- MobImpassable
- SmallImpassable
- FullTileMask
- type: Appearance
visuals:
- type: VaporVisualizer

13
Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
View File

@@ -4,6 +4,8 @@
description: A deployable barrier. Swipe your ID card to lock/unlock it.
parent: BaseStructure
components:
- type: Transform
noRot: true
- type: Sprite
sprite: Objects/Specific/Security/barrier.rsi
netsync: false
@@ -15,14 +17,11 @@
- shape:
!type:PhysShapeCircle
radius: 0.45
layer:
- Opaque
- Impassable
- VaultImpassable
- SmallImpassable
mask:
- Impassable
mass: 150
mask:
- MachineMask
layer:
- WallLayer
- type: AccessReader
access: [["Security"]]
- type: Lock

6
Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
View File

@@ -32,11 +32,9 @@
radius: 0.45
mass: 150
mask:
- Impassable
- MachineMask
layer:
- Opaque
- MobImpassable
- SmallImpassable
- MachineLayer
- type: Icon
sprite: Structures/Storage/Crates/artifact.rsi
state: artifact_container_icon

4
Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifacts.yml
View File

@@ -21,9 +21,9 @@
radius: 0.45
mass: 150
layer:
- SmallImpassable
- WallLayer
mask:
- VaultImpassable
- MachineMask
- type: InteractionOutline
- type: Artifact
- type: RandomArtifactSprite

26
Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
View File

@@ -29,20 +29,21 @@
target: MobMonkey
- type: CollisionWake
enabled: false
- type: Physics
bodyType: KinematicController
- type: Fixtures
fixtures: # TODO: Make a second fixture.
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
mass: 2.5
mask:
- ItemMask
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
id: "rehydrate"
hard: false
layer:
- SmallImpassable
mask:
- Impassable
- MobImpassable
- LowImpassable
- type: entity
parent: PlushieCarp
@@ -78,9 +79,12 @@
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
mass: 2.5
mask:
- ItemMask
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
id: "rehydrate"
hard: false
layer:
- SmallImpassable
mask:
- Impassable
- MobImpassable
- LowImpassable

10
Resources/Prototypes/Entities/Objects/Tools/bucket.yml
View File

@@ -29,16 +29,6 @@
interfaces:
- key: enum.TransferAmountUiKey.Key
type: TransferAmountBoundUserInterface
- type: Physics
bodyType: Dynamic
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.25,0.25,0.25"
mass: 5
mask:
- Impassable
- type: Spillable
solution: bucket
- type: DrawableSolution

5
Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
View File

@@ -31,10 +31,9 @@
mass: 180
restitution: 0.0
mask:
- Impassable
- VaultImpassable
- MobMask
layer:
- VaultImpassable
- MobLayer
- type: VehicleVisuals
- type: Appearance
- type: Repairable

5
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
View File

@@ -34,8 +34,7 @@
hard: true
# Didn't use MapGrid for now as the bounds are stuffed.
layer:
- Impassable
- SmallImpassable
- VaultImpassable
- LargeMobLayer
mask:
- Impassable
- BulletImpassable

10
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View File

@@ -23,8 +23,7 @@
hard: false
mask:
- Impassable
layer:
- MobImpassable
- BulletImpassable
- type: Projectile
damage:
types:
@@ -50,8 +49,7 @@
hard: false
mask:
- Impassable
layer:
- MobImpassable
- BulletImpassable
- type: entity
id: BulletBaseFlash
@@ -129,8 +127,7 @@
hard: false
mask:
- Impassable
layer:
- MobImpassable
- BulletImpassable
- type: Ammo
isProjectile: true
ammoVelocity: 20
@@ -163,6 +160,7 @@
bounds: "-0.2,-0.2,0.2,0.2"
hard: false
mask:
- Impassable
- Opaque
- type: Projectile
damage:

6
Resources/Prototypes/Entities/Objects/Weapons/security.yml
View File

@@ -83,11 +83,9 @@
!type:PhysShapeAabb
bounds: "-0.15,-0.3,0.15,0.3"
mask:
- Impassable
- VaultImpassable
- SmallImpassable
- MachineMask
layer:
- MobImpassable
- MachineLayer
mass: 70
- type: Appearance
- type: AnimationPlayer

3
Resources/Prototypes/Entities/Objects/base_item.yml
View File

@@ -27,8 +27,7 @@
bounds: "-0.25,-0.25,0.25,0.25"
mass: 5
mask:
- Impassable
- SmallImpassable
- ItemMask
restitution: 0.3 # fite me
friction: 0.2
- type: Sprite

9
Resources/Prototypes/Entities/Structures/Decoration/banners.yml
View File

@@ -18,13 +18,12 @@
radius: 0.2
mass: 25
mask:
- SmallImpassable
- VaultImpassable
- MachineMask
layer:
- Opaque
- MobImpassable
- SmallImpassable
- VaultImpassable
- MidImpassable
- HighImpassable
- BulletImpassable
- type: InteractionOutline
- type: entity

8
Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
View File

@@ -19,13 +19,9 @@
bounds: "-0.4,-0.3,0.4,0.3"
mass: 25
mask:
- Impassable
- VaultImpassable
- SmallImpassable
- TabletopMachineMask
layer:
- Opaque
- MobImpassable
- SmallImpassable
- TabletopMachineLayer
- type: ApcPowerReceiver
- type: ExtensionCableReceiver
- type: ActivatableUI

13
Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
View File

@@ -10,19 +10,6 @@
drawdepth: SmallObjects
state: booze
netsync: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
mass: 25
mask:
- Impassable
- VaultImpassable
layer:
- Opaque
- MobImpassable
- SmallImpassable
- type: ReagentDispenser
pack: BoozeDispenserInventory
emagPack: BoozeDispenserEmagInventory

13
Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
View File

@@ -10,19 +10,6 @@
drawdepth: SmallObjects
state: soda
netsync: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.3,0.4,0.3"
mass: 25
mask:
- Impassable
- VaultImpassable
layer:
- Opaque
- MobImpassable
- SmallImpassable
- type: ReagentDispenser
pack: SodaDispenserInventory
emagPack: SodaDispenserEmagInventory

8
Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
View File

@@ -87,9 +87,6 @@
components:
- type: Door
occludes: false
crushDamage:
types:
Blunt: 15
- type: Occluder
enabled: false
- type: Sprite
@@ -101,10 +98,9 @@
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
mass: 100
mask:
- Impassable
- FullTileMask
layer: #removed opaque from the layer, allowing lasers to pass through glass airlocks
- Impassable
- VaultImpassable
- GlassAirlockLayer
- type: Construction
graph: Airlock
node: glassAirlock

5
Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
View File

@@ -18,10 +18,9 @@
bounds: "-0.45,-0.45,0.45,0.45"
mass: 100
mask:
- MobMask
- FullTileMask
layer:
- MobImpassable
- VaultImpassable
- HumanoidBlockLayer
- type: Anchorable
delay: 2
- type: Pullable

6
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
View File

@@ -32,11 +32,9 @@
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
mass: 100
mask:
- Impassable
- FullTileMask
layer:
- Opaque
- Impassable
- VaultImpassable
- AirlockLayer
- type: Door
board: DoorElectronics
crushDamage:

37
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
View File

@@ -48,13 +48,10 @@
!type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
mask:
- MobImpassable
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- HighImpassable
layer:
- AirlockLayer
- type: Door
openDrawDepth: WallTops
closeTimeOne: 0.1
@@ -92,6 +89,7 @@
type: WiresBoundUserInterface
- type: Airtight
fixVacuum: true
- type: Occluder
- type: Construction
graph: Firelock
node: Firelock
@@ -103,6 +101,20 @@
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/firelock.rsi
- type: Occluder
enabled: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
mask:
- Impassable
- HighImpassable
layer:
- GlassAirlockLayer
- type: Door
occludes: false
- type: entity
id: FirelockEdge
@@ -122,10 +134,11 @@
!type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,-0.2" # don't want this colliding with walls or they won't close
mask:
- MobImpassable
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- HighImpassable
layer:
- GlassAirlockLayer
- type: Occluder
enabled: false
- type: Door
occludes: false

8
Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
View File

@@ -30,9 +30,11 @@
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
mass: 50
layer:
- SmallImpassable
mask:
- VaultImpassable
- Impassable
- HighImpassable
layer:
- HighImpassable
- MidImpassable
- type: Transform
noRot: true

8
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
View File

@@ -20,13 +20,9 @@
bounds: "-0.49,-0.49,0.49,0.49"
mass: 100
mask:
- MobImpassable
- FullTileMask
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- AirlockLayer
- type: Door
bumpOpen: false
clickOpen: true

15
Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
View File

@@ -19,13 +19,9 @@
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
mass: 100
mask:
- MobImpassable
- FullTileMask
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
- AirlockLayer
- type: Door
board: DoorElectronics
bumpOpen: false
@@ -182,9 +178,10 @@
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
mass: 50
layer:
- Opaque
mask:
- VaultImpassable
- Impassable
- HighImpassable
layer:
- HighImpassable
- type: Transform
noRot: true

2
Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
View File

@@ -19,7 +19,7 @@
mass: 30
mask:
- Impassable
- VaultImpassable
- HighImpassable
- type: Anchorable
- type: Pullable
- type: Rotatable

9
Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
View File

@@ -13,13 +13,10 @@
!type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,-0.3"
mass: 50
layer:
- Impassable
- MobImpassable
- VaultImpassable
- SmallImpassable
mask:
- VaultImpassable
- TabletopMachineMask
layer:
- GlassAirlockLayer
- type: Sprite
netsync: false
sprite: Structures/Doors/Windoors/windoor.rsi

8
Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
View File

@@ -15,12 +15,10 @@
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
mass: 50
mask: # tables should collide with other tables
- TableMask
layer:
- VaultImpassable
mask:
- Impassable
- VaultImpassable # tables should collide with other tables
- SmallImpassable
- TableLayer
- type: Sprite
netsync: false
- type: Icon

15
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
View File

@@ -16,8 +16,9 @@
bounds: "-0.40,-0.30,0.40,0.45"
mass: 50
mask:
- Impassable
- SmallImpassable
- TableMask
layer:
- TableLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
@@ -61,8 +62,9 @@
bounds: "-0.45,-0.45,0.45,0.45"
mass: 50
mask:
- Impassable
- SmallImpassable
- MachineMask
layer:
- HalfWallLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Wood
@@ -106,8 +108,9 @@
bounds: "-0.45,-0.45,0.45,0.45"
mass: 50
mask:
- Impassable
- SmallImpassable
- MachineMask
layer:
- HalfWallLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic

2
Resources/Prototypes/Entities/Structures/Furniture/beds.yml
View File

@@ -20,7 +20,7 @@
bounds: "-0.45,-0.45,0.45,0.05"
mass: 25
mask:
- SmallImpassable
- TableMask
- type: Sprite
sprite: Structures/Furniture/furniture.rsi
state: bed

13
Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
View File

@@ -18,11 +18,6 @@
- type: Physics
canCollide: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb {}
layer:
- Passable
- type: Damageable
damageContainer: Inorganic
- type: Destructible
@@ -136,14 +131,6 @@
state: chapel
- type: Tag
tags: [ Carpet ]
- type: Physics
canCollide: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb {}
layer:
- Passable
- type: Damageable
damageContainer: Inorganic
- type: Destructible

5
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
View File

@@ -15,10 +15,9 @@
- shape:
!type:PhysShapeCircle
radius: 0.2
mask:
- Impassable
- VaultImpassable
mass: 10
mask:
- TableMask
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
noRot: true

13
Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
name: baseinstrument
id: BasePlaceableInstrument
parent: BaseStructureDynamic
@@ -35,10 +35,15 @@
!type:PhysShapeCircle
radius: 0.45
mass: 50
layer:
- SmallImpassable
mask:
- VaultImpassable
- Impassable
- HighImpassable
- MidImpassable
layer:
- Opaque
- HighImpassable
- MidImpassable
- BulletImpassable
- type: Transform
anchored: true

6
Resources/Prototypes/Entities/Structures/Furniture/memorial.yml
View File

@@ -15,8 +15,8 @@
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.20"
mass: 50
layer:
- SmallImpassable
mask:
- Impassable
- FullTileMask
layer:
- WallLayer
- type: InteractionOutline

14
Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
View File

@@ -18,6 +18,7 @@
- Impassable
layer:
- Opaque
- BulletImpassable
- type: Sprite
drawdepth: Overdoors
offset: "0.0,0.3"
@@ -69,19 +70,6 @@
components:
- type: Sprite
state: plant-25
- type: Physics
bodyType: Dynamic
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeCircle
radius: 0.2
position: "0.0,-0.3"
mass: 25
layer:
- SmallImpassable
mask:
- Impassable
- type: entity
id: PottedPlantBioluminscent

5
Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
View File

@@ -27,10 +27,7 @@
radius: 0.35
mass: 30
mask:
- Impassable
- SmallImpassable
layer:
- Opaque
- MobMask
- type: Damageable
- type: Destructible
thresholds:

6
Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
View File

@@ -422,7 +422,7 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.25,0.25,0.25"
mass: 50
layer:
- SmallImpassable
mask:
- Impassable
- TabletopMachineMask
layer:
- TabletopMachineLayer

7
Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
View File

@@ -14,12 +14,9 @@
bounds: "-0.25,-0.5,0.25,0.5"
mass: 25
mask:
- MobMask
- MachineMask
layer:
- Opaque
- MobImpassable
- SmallImpassable
- VaultImpassable
- MachineLayer
- type: InteractionOutline
- type: Rotatable
- type: Anchorable

7
Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
View File

@@ -16,11 +16,10 @@
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
mass: 25
layer:
- MobMask
- Opaque
mask:
- MobMask
- MachineMask
layer:
- MachineLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic

5
Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
View File

@@ -31,10 +31,9 @@
bounds: "-0.25,-0.4,0.25,0.4"
mass: 25
mask:
- SmallImpassable
- MachineMask
layer:
- Opaque
- MobImpassable
- MachineLayer
- type: Destructible
thresholds:
- trigger:

7
Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
View File

@@ -18,11 +18,10 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
mass: 25
layer:
- SmallImpassable
- Opaque
mask:
- MobMask
- MachineMask
layer:
- MachineLayer
- type: Construction
graph: Machine
node: machine

22
Resources/Prototypes/Entities/Structures/Machines/frame.yml
View File

@@ -18,15 +18,10 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
mass: 25
layer:
- Impassable
- MobImpassable
- VaultImpassable
- Opaque
mask:
- Impassable
- MobImpassable
- VaultImpassable
- MachineMask
layer:
- MachineLayer
- type: Clickable
- type: InteractionOutline
- type: Anchorable
@@ -71,15 +66,10 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
mass: 25
layer:
- Impassable
- MobImpassable
- VaultImpassable
- Opaque
mask:
- Impassable
- MobImpassable
- VaultImpassable
- MachineMask
layer:
- MachineLayer
- type: Clickable
- type: InteractionOutline
- type: Anchorable

7
Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
View File

@@ -34,12 +34,9 @@
bounds: "-1.5,-1.5,1.5,1.5"
mass: 500
mask:
- Impassable
- LargeMobMask
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- WallLayer
- type: Repairable
fuelCost: 10
doAfterDelay: 5

14
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -30,12 +30,9 @@
bounds: "-0.4,-0.4,0.4,0.4"
mass: 25
mask:
- Impassable
- VaultImpassable
- SmallImpassable
- MachineMask
layer:
- Opaque
- MobImpassable
- MachineLayer
- type: Construction
graph: Machine
node: machine
@@ -119,12 +116,9 @@
bounds: "-0.4,-0.4,0.4,0.4"
mass: 25
mask:
- Impassable
- VaultImpassable
- SmallImpassable
- MachineMask
layer:
- Opaque
- MobImpassable
- MachineLayer
- type: ResearchClient
- type: Construction
graph: Machine

7
Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
View File

@@ -21,11 +21,10 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
mass: 25
layer:
- SmallImpassable
- Opaque
mask:
- MobMask
- MachineMask
layer:
- MachineLayer
- type: Construction
graph: Machine
node: machine

6
Resources/Prototypes/Entities/Structures/Machines/microwave.yml
View File

@@ -27,10 +27,10 @@
!type:PhysShapeAabb
bounds: "-0.3,-0.16,0.3,0.16"
mass: 25
layer:
- SmallImpassable
mask:
- VaultImpassable
- TabletopMachineMask
layer:
- TabletopMachineLayer
- type: Sprite
netsync: false
sprite: Structures/Machines/microwave.rsi

6
Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
View File

@@ -31,10 +31,10 @@
- shape:
!type:PhysShapeAabb
bounds: "-0.08,-0.35,0.15,0.25"
layer:
- SmallImpassable
mask:
- VaultImpassable
- TabletopMachineMask
layer:
- TabletopMachineLayer
- type: Sprite
netsync: false
sprite: Structures/Machines/juicer.rsi

6
Resources/Prototypes/Entities/Structures/Machines/recycler.yml
View File

@@ -20,10 +20,7 @@
id: brrt
hard: false
layer:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- FullTileMask
- shape:
!type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,0.49"
@@ -33,6 +30,7 @@
- Impassable
layer:
- Opaque
- BulletImpassable
- type: Transform
anchored: true
noRot: false

7
Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
View File

@@ -19,9 +19,8 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.4,0.25,0.4"
mass: 25
layer:
- MobMask
- Opaque
mask:
- MobMask
- MachineMask
layer:
- MachineLayer
- type: SeedExtractor

2
Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
View File

@@ -47,5 +47,5 @@
bounds: "-0.45,-0.45,0.45,0.05"
mass: 25
mask:
- SmallImpassable
- LowImpassable

5
Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
View File

@@ -20,10 +20,9 @@
bounds: "-0.25,-0.25,0.25,0.25"
mass: 25
mask:
- SmallImpassable
- MachineMask
layer:
- Opaque
- MobImpassable
- MachineLayer
- type: TraitorDeathMatchRedemption
placement:
mode: AlignTileAny

7
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View File

@@ -24,12 +24,9 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.45,0.25,0.45"
mask:
- Impassable
- VaultImpassable
- SmallImpassable
- FullTileMask
layer:
- Opaque
- MobImpassable
- WallLayer
mass: 100
- type: Destructible
thresholds:

28
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
View File

@@ -1,6 +1,7 @@
- type: entity
abstract: true
id: GasPipeBase
parent: BaseItem
name: pipe
description: Holds gas.
placement:
@@ -8,32 +9,6 @@
components:
- type: Item
size: 10
- type: Clickable
- type: InteractionOutline
- type: MovedByPressure
- type: DamageOnHighSpeedImpact
damage:
types:
Blunt: 5
soundHit:
path: /Audio/Effects/hit_kick.ogg
- type: CollisionWake
- type: TileFrictionModifier
modifier: 0.5
- type: Physics
bodyType: Dynamic
fixedRotation: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.25,0.25,0.25"
mass: 5
mask:
- Impassable
- VaultImpassable
restitution: 0.3 # fite me
friction: 0.2
- type: Transform
anchored: true
- type: Damageable
@@ -43,7 +18,6 @@
- type: PipeAppearance
- type: Anchorable
- type: Rotatable
- type: Pullable
- type: Destructible
thresholds:
- trigger:

11
Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
View File

@@ -17,15 +17,10 @@
!type:PhysShapeAabb
bounds: "-0.25,-0.4,0.25,0.4"
mass: 25
layer:
- Impassable
- MobImpassable
- VaultImpassable
- Opaque
mask:
- Impassable
- MobImpassable
- VaultImpassable
- MachineMask
layer:
- MachineLayer
- type: Clickable
- type: InteractionOutline
- type: Anchorable

55
Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
View File

@@ -16,6 +16,12 @@
- type: Physics
bodyType: Static
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
mask:
- SubfloorMask
- type: Transform
anchored: true
- type: Anchorable
@@ -60,13 +66,6 @@
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
state: pipe-b
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
layer: [ Underplating ]
- type: Construction
graph: DisposalPipe
node: broken
@@ -87,13 +86,6 @@
- type: DisposalVisualizer
state_free: conpipe-s
state_anchored: pipe-s
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
layer: [ Underplating ]
- type: Construction
graph: DisposalPipe
node: pipe
@@ -120,13 +112,6 @@
interfaces:
- key: enum.DisposalTaggerUiKey.Key
type: DisposalTaggerBoundUserInterface
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
layer: [ Underplating ]
- type: Construction
graph: DisposalPipe
node: tagger
@@ -147,13 +132,13 @@
- type: DisposalVisualizer
state_free: conpipe-t
state_anchored: pipe-t
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.4"
layer: [ Underplating ]
mask:
- SubfloorMask
- type: Construction
graph: DisposalPipe
node: trunk
@@ -186,13 +171,13 @@
interfaces:
- key: enum.DisposalRouterUiKey.Key
type: DisposalRouterBoundUserInterface
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.25,0.5"
layer: [ Underplating ]
mask:
- SubfloorMask
- type: Construction
graph: DisposalPipe
node: router
@@ -218,13 +203,13 @@
state_anchored: pipe-j2s
- type: Flippable
mirrorEntity: DisposalRouter
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.5,0.5"
layer: [ Underplating ]
mask:
- SubfloorMask
- type: entity
id: DisposalJunction
@@ -248,13 +233,13 @@
state_anchored: pipe-j1
- type: Flippable
mirrorEntity: DisposalJunctionFlipped
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.25,0.5"
layer: [ Underplating ]
mask:
- SubfloorMask
- type: Construction
graph: DisposalPipe
node: junction
@@ -280,13 +265,13 @@
state_anchored: pipe-j2
- type: Flippable
mirrorEntity: DisposalJunction
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.5,0.5"
layer: [ Underplating ]
mask:
- SubfloorMask
- type: entity
id: DisposalYJunction
@@ -308,13 +293,13 @@
- type: DisposalVisualizer
state_free: conpipe-y
state_anchored: pipe-y
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.5,0.25"
layer: [ Underplating ]
mask:
- SubfloorMask
- type: Construction
graph: DisposalPipe
node: yJunction
@@ -335,13 +320,13 @@
- type: DisposalVisualizer
state_free: conpipe-c
state_anchored: pipe-c
- type: Physics
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.25,0.25"
layer: [ Underplating ]
mask:
- SubfloorMask
- type: Construction
graph: DisposalPipe
node: bend

7
Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
View File

@@ -27,12 +27,9 @@
bounds: "-0.25,-0.4,0.25,0.4"
mass: 30
mask:
- Impassable
- MachineMask
layer:
- Opaque
- SmallImpassable
- VaultImpassable
- MobImpassable
- MachineLayer
- type: Destructible
thresholds:
- trigger:

7
Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml
View File

@@ -17,10 +17,9 @@
bounds: "-0.45,-0.45,0.45,0.45"
mass: 25
mask:
- Opaque
- Impassable
- MobImpassable
- VaultImpassable
- MachineMask
layer:
- MachineLayer
- type: Transform
anchored: true
noRot: false

2
Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
View File

@@ -26,8 +26,8 @@
layer: [None]
mask:
# Has to hit mobs, singularity, and singularity generator
- MobMask
- Opaque
- FullTileMask
- type: ParticleProjectile
- type: SinguloFood
# Energy is setup by the PA particle fire function.

11
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
View File

@@ -16,15 +16,10 @@
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
mass: 25
layer:
- Impassable
- MobImpassable
- VaultImpassable
- Opaque
mask:
- Impassable
- MobImpassable
- VaultImpassable
- MachineMask
layer:
- MachineLayer
- type: Transform
anchored: true
noRot: true

Some files were not shown because too many files have changed in this diff Show More