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

Revert "Content update for fixture changes (#5524)"

Browse Source 
This reverts commit 0a843b671f.
This commit is contained in:
metalgearsloth
2021-12-01 13:55:24 +11:00
parent 6ccd1d7110
commit 43b637826d
108 changed files with 829 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
View File

@@ -81,7 +81,6 @@ namespace Content.IntegrationTests.Tests.Disposal
damageContainer: Biological damageContainer: Biological
- type: Physics - type: Physics
bodyType: KinematicController bodyType: KinematicController
- type: Fixtures
- type: DoAfter - type: DoAfter
- type: entity - type: entity
@@ -94,7 +93,6 @@ namespace Content.IntegrationTests.Tests.Disposal
- Anchoring - Anchoring
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
- type: DoAfter - type: DoAfter
- type: entity - type: entity
@@ -108,7 +106,6 @@ namespace Content.IntegrationTests.Tests.Disposal
- type: ApcPowerReceiver - type: ApcPowerReceiver
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
- type: entity - type: entity
name: DisposalTrunkDummy name: DisposalTrunkDummy

2
Content.IntegrationTests/Tests/Doors/AirlockTest.cs
View File

@@ -20,7 +20,6 @@ namespace Content.IntegrationTests.Tests.Doors
components: components:
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -36,7 +35,6 @@ namespace Content.IntegrationTests.Tests.Doors
- type: Airlock - type: Airlock
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
View File

@@ -25,7 +25,6 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
components: components:
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -21,7 +21,6 @@ namespace Content.IntegrationTests.Tests.Utility
name: {BlockerDummyId} name: {BlockerDummyId}
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

5
Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
View File

@@ -66,11 +66,6 @@ namespace Content.Server.Power.EntitySystems
foreach (var receiver in receivers) foreach (var receiver in receivers)
{ {
// No point resetting what the receiver is doing if it's deleting, plus significant perf savings
// in not doing needless lookups
if (EntityManager.GetComponent<MetaDataComponent>(receiver.OwnerUid).EntityLifeStage >
EntityLifeStage.MapInitialized) continue;
TryFindAndSetProvider(receiver); TryFindAndSetProvider(receiver);
} }
} }

15
Content.Server/Shuttles/EntitySystems/DockingSystem.cs
View File

@@ -21,8 +21,9 @@ namespace Content.Server.Shuttles.EntitySystems
public sealed class DockingSystem : EntitySystem public sealed class DockingSystem : EntitySystem
{ {
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly FixtureSystem _fixtureSystem = default!; [Dependency] private readonly SharedBroadphaseSystem _broadphaseSystem = default!;
[Dependency] private readonly SharedJointSystem _jointSystem = default!; [Dependency] private readonly SharedJointSystem _jointSystem = default!;
[Dependency] private readonly AirtightSystem _airtightSystem = default!;
private const string DockingFixture = "docking"; private const string DockingFixture = "docking";
private const string DockingJoint = "docking"; private const string DockingJoint = "docking";
@@ -107,7 +108,7 @@ namespace Content.Server.Shuttles.EntitySystems
!EntityManager.HasComponent<ShuttleComponent>(grid.GridEntityId)) return null; !EntityManager.HasComponent<ShuttleComponent>(grid.GridEntityId)) return null;
var transform = body.GetTransform(); var transform = body.GetTransform();
var dockingFixture = _fixtureSystem.GetFixtureOrNull(body, DockingFixture); var dockingFixture = body.GetFixture(DockingFixture);
if (dockingFixture == null) if (dockingFixture == null)
{ {
@@ -141,7 +142,7 @@ namespace Content.Server.Shuttles.EntitySystems
!EntityManager.TryGetComponent(ent, out PhysicsComponent? otherBody)) continue; !EntityManager.TryGetComponent(ent, out PhysicsComponent? otherBody)) continue;
var otherTransform = otherBody.GetTransform(); var otherTransform = otherBody.GetTransform();
var otherDockingFixture = _fixtureSystem.GetFixtureOrNull(otherBody, DockingFixture); var otherDockingFixture = otherBody.GetFixture(DockingFixture);
if (otherDockingFixture == null) if (otherDockingFixture == null)
{ {
@@ -266,7 +267,7 @@ namespace Content.Server.Shuttles.EntitySystems
return; return;
} }
_fixtureSystem.DestroyFixture(physicsComponent, DockingFixture); _broadphaseSystem.DestroyFixture(physicsComponent, DockingFixture);
} }
private void EnableDocking(EntityUid uid, DockingComponent component) private void EnableDocking(EntityUid uid, DockingComponent component)
@@ -296,7 +297,7 @@ namespace Content.Server.Shuttles.EntitySystems
// TODO: I want this to ideally be 2 fixtures to force them to have some level of alignment buuuttt // TODO: I want this to ideally be 2 fixtures to force them to have some level of alignment buuuttt
// I also need collisionmanager for that yet again so they get dis. // I also need collisionmanager for that yet again so they get dis.
_fixtureSystem.CreateFixture(physicsComponent, fixture); _broadphaseSystem.CreateFixture(physicsComponent, fixture);
} }
/// <summary> /// <summary>
@@ -384,8 +385,8 @@ namespace Content.Server.Shuttles.EntitySystems
return; return;
} }
var fixtureA = _fixtureSystem.GetFixtureOrNull(bodyA, DockingFixture); var fixtureA = bodyA.GetFixture(DockingFixture);
var fixtureB = _fixtureSystem.GetFixtureOrNull(bodyB, DockingFixture); var fixtureB = bodyB.GetFixture(DockingFixture);
if (fixtureA == null || fixtureB == null) if (fixtureA == null || fixtureB == null)
{ {

3
Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
View File

@@ -101,9 +101,6 @@ namespace Content.Server.Shuttles.EntitySystems
private void OnShuttleShutdown(EntityUid uid, ShuttleComponent component, ComponentShutdown args) private void OnShuttleShutdown(EntityUid uid, ShuttleComponent component, ComponentShutdown args)
{ {
// None of the below is necessary for any cleanup if we're just deleting.
if (EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating) return;
if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent)) if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
{ {
return; return;

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

@@ -28,7 +28,7 @@ namespace Content.Server.Shuttles.EntitySystems
{ {
[Robust.Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!; [Robust.Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!;
[Robust.Shared.IoC.Dependency] private readonly AmbientSoundSystem _ambient = default!; [Robust.Shared.IoC.Dependency] private readonly AmbientSoundSystem _ambient = default!;
[Robust.Shared.IoC.Dependency] private readonly FixtureSystem _fixtureSystem = default!; [Robust.Shared.IoC.Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
[Robust.Shared.IoC.Dependency] private readonly DamageableSystem _damageable = default!; [Robust.Shared.IoC.Dependency] private readonly DamageableSystem _damageable = default!;
// Essentially whenever thruster enables we update the shuttle's available impulses which are used for movement. // Essentially whenever thruster enables we update the shuttle's available impulses which are used for movement.
@@ -259,7 +259,7 @@ namespace Content.Server.Shuttles.EntitySystems
CollisionLayer = (int) CollisionGroup.MobImpassable CollisionLayer = (int) CollisionGroup.MobImpassable
}; };
_fixtureSystem.CreateFixture(physicsComponent, fixture); _broadphase.CreateFixture(physicsComponent, fixture);
} }
break; break;
@@ -323,7 +323,7 @@ namespace Content.Server.Shuttles.EntitySystems
if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent)) if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
{ {
_fixtureSystem.DestroyFixture(physicsComponent, BurnFixture); _broadphase.DestroyFixture(physicsComponent, BurnFixture);
} }
_activeThrusters.Remove(component); _activeThrusters.Remove(component);

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

@@ -279,18 +279,18 @@ namespace Content.Server.Storage.Components
private void ModifyComponents() private void ModifyComponents()
{ {
if (!_isCollidableWhenOpen && Owner.TryGetComponent<FixturesComponent>(out var manager)) if (!_isCollidableWhenOpen && Owner.TryGetComponent<IPhysBody>(out var physics))
{ {
if (Open) if (Open)
{ {
foreach (var (_, fixture) in manager.Fixtures) foreach (var fixture in physics.Fixtures)
{ {
fixture.CollisionLayer &= ~OpenMask; fixture.CollisionLayer &= ~OpenMask;
} }
} }
else else
{ {
foreach (var (_, fixture) in manager.Fixtures) foreach (var fixture in physics.Fixtures)
{ {
fixture.CollisionLayer |= OpenMask; fixture.CollisionLayer |= OpenMask;
} }

7
Content.Shared/Singularity/SharedSingularitySystem.cs
View File

@@ -2,9 +2,7 @@
using Content.Shared.Radiation; using Content.Shared.Radiation;
using Content.Shared.Singularity.Components; using Content.Shared.Singularity.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Collision.Shapes;
using Robust.Shared.Physics.Dynamics; using Robust.Shared.Physics.Dynamics;
@@ -12,8 +10,6 @@ namespace Content.Shared.Singularity
{ {
public abstract class SharedSingularitySystem : EntitySystem public abstract class SharedSingularitySystem : EntitySystem
{ {
[Dependency] private readonly FixtureSystem _fixtures = default!;
public const string DeleteFixture = "DeleteCircle"; public const string DeleteFixture = "DeleteCircle";
private float GetFalloff(int level) private float GetFalloff(int level)
@@ -78,7 +74,8 @@ namespace Content.Shared.Singularity
appearance.SetData(SingularityVisuals.Level, value); appearance.SetData(SingularityVisuals.Level, value);
} }
if (physics != null && _fixtures.GetFixtureOrNull(physics, DeleteFixture) is {Shape: PhysShapeCircle circle}) if (physics != null &&
physics.GetFixture(DeleteFixture) is {Shape: PhysShapeCircle circle})
{ {
circle.Radius = value - 0.5f; circle.Radius = value - 0.5f;
} }

12
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -17,11 +17,11 @@ namespace Content.Shared.Throwing
/// <summary> /// <summary>
/// Handles throwing landing and collisions. /// Handles throwing landing and collisions.
/// </summary> /// </summary>
public sealed class ThrownItemSystem : EntitySystem public class ThrownItemSystem : EntitySystem
{ {
[Dependency] private readonly SharedBroadphaseSystem _broadphaseSystem = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedAdminLogSystem _adminLogSystem = default!; [Dependency] private readonly SharedAdminLogSystem _adminLogSystem = default!;
[Dependency] private readonly FixtureSystem _fixtures = default!;
private const string ThrowingFixture = "throw-fixture"; private const string ThrowingFixture = "throw-fixture";
@@ -56,14 +56,14 @@ namespace Content.Shared.Throwing
if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent) || if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent) ||
physicsComponent.Fixtures.Count != 1) return; physicsComponent.Fixtures.Count != 1) return;
if (_fixtures.GetFixtureOrNull(physicsComponent, ThrowingFixture) != null) if (physicsComponent.GetFixture(ThrowingFixture) != null)
{ {
Logger.Error($"Found existing throwing fixture on {component.Owner}"); Logger.Error($"Found existing throwing fixture on {component.Owner}");
return; return;
} }
var shape = physicsComponent.Fixtures[0].Shape; var shape = physicsComponent.Fixtures[0].Shape;
_fixtures.CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture}); _broadphaseSystem.CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture});
} }
private void HandleCollision(EntityUid uid, ThrownItemComponent component, StartCollideEvent args) private void HandleCollision(EntityUid uid, ThrownItemComponent component, StartCollideEvent args)
@@ -99,11 +99,11 @@ namespace Content.Shared.Throwing
{ {
if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent)) if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
{ {
var fixture = _fixtures.GetFixtureOrNull(physicsComponent, ThrowingFixture); var fixture = physicsComponent.GetFixture(ThrowingFixture);
if (fixture != null) if (fixture != null)
{ {
_fixtures.DestroyFixture(physicsComponent, fixture); _broadphaseSystem.DestroyFixture(physicsComponent, fixture);
} }
} }

1579
Resources/Maps/saltern.yml
View File

File diff suppressed because it is too large Load Diff

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

@@ -43,7 +43,6 @@
- type: Transform - type: Transform
anchored: true anchored: true
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- hard: false - hard: false
shape: shape:
@@ -71,7 +70,6 @@
- state: mfoam - state: mfoam
map: ["enum.FoamVisualLayers.Base"] map: ["enum.FoamVisualLayers.Base"]
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- hard: true - hard: true
shape: shape:
@@ -99,7 +97,6 @@
- state: mfoam - state: mfoam
map: ["enum.FoamVisualLayers.Base"] map: ["enum.FoamVisualLayers.Base"]
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- hard: true - hard: true
shape: shape:
@@ -133,7 +130,6 @@
netsync: false netsync: false
drawdepth: Walls drawdepth: Walls
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

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

@@ -15,7 +15,6 @@
- type: Clickable - type: Clickable
- type: Slippery - type: Slippery
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -17,7 +17,6 @@
state: bat state: bat
sprite: Mobs/Animals/bat.rsi sprite: Mobs/Animals/bat.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -54,7 +53,6 @@
state: 0 state: 0
sprite: Mobs/Animals/bee.rsi sprite: Mobs/Animals/bee.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -117,7 +115,6 @@
state: butterfly state: butterfly
sprite: Mobs/Animals/butterfly.rsi sprite: Mobs/Animals/butterfly.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -165,7 +162,6 @@
state: cow state: cow
sprite: Mobs/Animals/cow.rsi sprite: Mobs/Animals/cow.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -210,7 +206,6 @@
state: crab state: crab
sprite: Mobs/Animals/crab.rsi sprite: Mobs/Animals/crab.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -283,7 +278,6 @@
state: crawling state: crawling
sprite: Mobs/Animals/gorilla.rsi sprite: Mobs/Animals/gorilla.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -355,7 +349,6 @@
Slots: Slots:
- Helmet - Helmet
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -450,7 +443,6 @@
state: parrot state: parrot
sprite: Mobs/Animals/parrot.rsi sprite: Mobs/Animals/parrot.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -483,7 +475,6 @@
state: penguin state: penguin
sprite: Mobs/Animals/penguin.rsi sprite: Mobs/Animals/penguin.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -516,7 +507,6 @@
state: snake state: snake
sprite: Mobs/Animals/snake.rsi sprite: Mobs/Animals/snake.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -554,7 +544,6 @@
state: tarantula state: tarantula
sprite: Mobs/Animals/spider.rsi sprite: Mobs/Animals/spider.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle

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

@@ -18,7 +18,6 @@
state: alive state: alive
sprite: Mobs/Aliens/Carps/space.rsi sprite: Mobs/Aliens/Carps/space.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -69,7 +68,6 @@
state: alive state: alive
sprite: Mobs/Aliens/Carps/holo.rsi sprite: Mobs/Aliens/Carps/holo.rsi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle

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

@@ -23,7 +23,6 @@
state: normal state: normal
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -14,7 +14,6 @@
- map: ["enum.DamageStateVisualLayers.Base"] - map: ["enum.DamageStateVisualLayers.Base"]
state: corgi state: corgi
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -66,7 +65,6 @@
- map: ["enum.DamageStateVisualLayers.Base"] - map: ["enum.DamageStateVisualLayers.Base"]
state: cat state: cat
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -140,7 +138,6 @@
- map: ["enum.DamageStateVisualLayers.Base"] - map: ["enum.DamageStateVisualLayers.Base"]
state: sloth state: sloth
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle

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

@@ -36,7 +36,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: KinematicController # Same for all inheritors bodyType: KinematicController # Same for all inheritors
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
# Circles, cuz rotation of rectangles looks very bad # Circles, cuz rotation of rectangles looks very bad

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

@@ -21,7 +21,6 @@
sprite: Mobs/Aliens/Xenos/xeno.rsi sprite: Mobs/Aliens/Xenos/xeno.rsi
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

3
Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
View File

@@ -19,9 +19,7 @@
- type: PlayerInputMover - type: PlayerInputMover
- type: Physics - type: Physics
bodyType: Kinematic bodyType: Kinematic
status: InAir
# TODO: Even need these? Don't think so but CBF checking right now. # TODO: Even need these? Don't think so but CBF checking right now.
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -29,6 +27,7 @@
mass: 5 mass: 5
mask: mask:
- GhostImpassable - GhostImpassable
status: InAir
- type: Body - type: Body
template: AGhostTemplate template: AGhostTemplate
preset: HumanPreset preset: HumanPreset

3
Resources/Prototypes/Entities/Mobs/Player/observer.yml
View File

@@ -11,8 +11,6 @@
- type: Physics - type: Physics
bodyType: KinematicController bodyType: KinematicController
fixedRotation: true fixedRotation: true
status: InAir
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -20,6 +18,7 @@
mass: 5 mass: 5
mask: mask:
- GhostImpassable - GhostImpassable
status: InAir
- type: PlayerInputMover - type: PlayerInputMover
- type: Eye - type: Eye
drawFov: false drawFov: false

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

@@ -152,7 +152,6 @@
- map: [ "enum.Slots.POCKET2" ] - map: [ "enum.Slots.POCKET2" ]
- type: Physics - type: Physics
bodyType: KinematicController bodyType: KinematicController
- type: Fixtures
fixtures: # TODO: This needs a second fixture just for mob collisions. fixtures: # TODO: This needs a second fixture just for mob collisions.
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -390,7 +389,6 @@
- map: ["hand-right"] - map: ["hand-right"]
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -144,7 +144,6 @@
enabled: false enabled: false
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -12,7 +12,6 @@
state: nuclearbomb_base state: nuclearbomb_base
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle

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

@@ -117,7 +117,6 @@
enabled: false enabled: false
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View File

@@ -62,7 +62,6 @@
map: [ "enum.VaporVisualLayers.Base" ] map: [ "enum.VaporVisualLayers.Base" ]
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -92,7 +92,6 @@
shader: unshaded shader: unshaded
visible: false visible: false
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}
@@ -160,7 +159,6 @@
- !type:DoActsBehavior - !type:DoActsBehavior
acts: [ "Destruction" ] acts: [ "Destruction" ]
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

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

@@ -10,7 +10,6 @@
state: inflatable_wall state: inflatable_wall
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -41,7 +41,6 @@
Quantity: 500 Quantity: 500
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -19,7 +19,6 @@
enabled: false enabled: false
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -81,7 +81,6 @@
map: ["enum.VaporVisualLayers.Base"] map: ["enum.VaporVisualLayers.Base"]
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
View File

@@ -21,7 +21,6 @@
- type: MovedByPressure - type: MovedByPressure
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -10,7 +10,6 @@
state: idle state: idle
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle

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

@@ -31,7 +31,6 @@
enabled: false enabled: false
- type: Physics - type: Physics
bodyType: KinematicController bodyType: KinematicController
- type: Fixtures
fixtures: # TODO: Make a second fixture. fixtures: # TODO: Make a second fixture.
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -72,7 +71,6 @@
enabled: false enabled: false
- type: Physics - type: Physics
bodyType: KinematicController bodyType: KinematicController
- type: Fixtures
fixtures: # TODO: Make a second fixture. fixtures: # TODO: Make a second fixture.
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -32,7 +32,6 @@
type: TransferAmountBoundUserInterface type: TransferAmountBoundUserInterface
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -25,7 +25,6 @@
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
fixedRotation: false fixedRotation: false
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle

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

@@ -13,9 +13,6 @@
state: bullet state: bullet
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
linearDamping: 0
angularDamping: 0
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -25,6 +22,8 @@
- Impassable - Impassable
layer: layer:
- MobImpassable - MobImpassable
linearDamping: 0
angularDamping: 0
- type: Projectile - type: Projectile
damage: damage:
types: types:
@@ -105,7 +104,6 @@
- state: spark - state: spark
shader: unshaded shader: unshaded
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -140,7 +138,6 @@
sprite: Structures/Power/Generation/Singularity/emitter.rsi sprite: Structures/Power/Generation/Singularity/emitter.rsi
state: 'projectile' state: 'projectile'
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Objects/base.yml
View File

@@ -20,7 +20,6 @@
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
fixedRotation: false fixedRotation: false
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Dispensers/base.yml
View File

@@ -10,7 +10,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -10,7 +10,6 @@
sprite: Structures/Doors/Airlocks/Standard/basic.rsi sprite: Structures/Doors/Airlocks/Standard/basic.rsi
state: "assembly" state: "assembly"
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
View File

@@ -22,7 +22,6 @@
- state: panel_open - state: panel_open
map: ["enum.WiresVisualLayers.MaintenancePanel"] map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
View File

@@ -24,7 +24,6 @@
#- state: panel_open #- state: panel_open
# map: ["enum.WiresVisualLayers.MaintenancePanel"] # map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -34,7 +34,6 @@
map: ["enum.WiresVisualLayers.MaintenancePanel"] map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Physics - type: Physics
canCollide: false canCollide: false
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -121,7 +120,6 @@
airBlockedDirection: airBlockedDirection:
- South - South
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -24,7 +24,6 @@
acts: ["Destruction"] acts: ["Destruction"]
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -12,7 +12,6 @@
- state: closed - state: closed
map: ["enum.DoorVisualLayers.Base"] map: ["enum.DoorVisualLayers.Base"]
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -11,7 +11,6 @@
layers: layers:
- state: assembly - state: assembly
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
View File

@@ -7,7 +7,6 @@
components: components:
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -10,7 +10,6 @@
placeCentered: true placeCentered: true
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -15,7 +15,6 @@
tags: [ Carpet ] tags: [ Carpet ]
- type: Physics - type: Physics
canCollide: false canCollide: false
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

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

@@ -10,7 +10,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -52,7 +51,6 @@
- type: Sprite - type: Sprite
state: chair state: chair
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -76,7 +74,6 @@
state: stool state: stool
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -103,7 +100,6 @@
state: bar state: bar
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -126,7 +122,6 @@
- type: Sprite - type: Sprite
state: office-white state: office-white
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -163,7 +158,6 @@
state: comfy state: comfy
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -185,7 +179,6 @@
state: wooden state: wooden
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -234,7 +227,6 @@
netsync: false netsync: false
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -8,7 +8,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -73,7 +72,6 @@
state: plant-25 state: plant-25
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
View File

@@ -18,7 +18,6 @@
toilet: toilet:
maxVol: 250 maxVol: 250
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

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

@@ -6,7 +6,6 @@
components: components:
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Machines/base.yml
View File

@@ -7,7 +7,6 @@
- type: Anchorable - type: Anchorable
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -23,7 +23,6 @@
- FitsInDispenser - FitsInDispenser
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -12,7 +12,6 @@
- state: pod_0 - state: pod_0
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -10,7 +10,6 @@
anchored: true anchored: true
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -61,7 +60,6 @@
anchored: true anchored: true
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -26,7 +26,6 @@
- type: ExtensionCableReceiver - type: ExtensionCableReceiver
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -18,7 +18,6 @@
map: ["enum.WiresVisualLayers.MaintenancePanel"] map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -97,7 +96,6 @@
map: ["enum.WiresVisualLayers.MaintenancePanel"] map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -16,7 +16,6 @@
map: ["enum.MedicalScannerVisualLayers.Terminal"] map: ["enum.MedicalScannerVisualLayers.Terminal"]
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -19,7 +19,6 @@
- key: enum.MicrowaveUiKey.Key - key: enum.MicrowaveUiKey.Key
type: MicrowaveBoundUserInterface type: MicrowaveBoundUserInterface
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -16,7 +16,6 @@
visuals: visuals:
- type: ReagentGrinderVisualizer - type: ReagentGrinderVisualizer
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -5,7 +5,6 @@
description: A large crushing machine used to recycle small items inefficiently. There are lights on the side. description: A large crushing machine used to recycle small items inefficiently. There are lights on the side.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -13,7 +13,6 @@
netsync: false netsync: false
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -13,7 +13,6 @@
shader: unshaded shader: unshaded
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -16,7 +16,6 @@
netsync: false netsync: false
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -23,7 +23,6 @@
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
fixedRotation: false fixedRotation: false
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -9,7 +9,6 @@
anchored: true anchored: true
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -13,7 +13,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
- type: Transform - type: Transform
anchored: true anchored: true
- type: Anchorable - type: Anchorable
@@ -58,7 +57,6 @@
state_anchored: pipe-s state_anchored: pipe-s
state_broken: pipe-b state_broken: pipe-b
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -87,7 +85,6 @@
- key: enum.DisposalTaggerUiKey.Key - key: enum.DisposalTaggerUiKey.Key
type: DisposalTaggerBoundUserInterface type: DisposalTaggerBoundUserInterface
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -112,7 +109,6 @@
state_anchored: pipe-t state_anchored: pipe-t
state_broken: pipe-b state_broken: pipe-b
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -147,7 +143,6 @@
- key: enum.DisposalRouterUiKey.Key - key: enum.DisposalRouterUiKey.Key
type: DisposalRouterBoundUserInterface type: DisposalRouterBoundUserInterface
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -177,7 +172,6 @@
- type: Flippable - type: Flippable
mirrorEntity: DisposalRouter mirrorEntity: DisposalRouter
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -208,7 +202,6 @@
- type: Flippable - type: Flippable
mirrorEntity: DisposalJunctionFlipped mirrorEntity: DisposalJunctionFlipped
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -238,7 +231,6 @@
- type: Flippable - type: Flippable
mirrorEntity: DisposalJunction mirrorEntity: DisposalJunction
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -267,7 +259,6 @@
state_anchored: pipe-y state_anchored: pipe-y
state_broken: pipe-b state_broken: pipe-b
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -292,7 +283,6 @@
state_anchored: pipe-c state_anchored: pipe-c
state_broken: pipe-b state_broken: pipe-b
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -20,7 +20,6 @@
map: ["enum.DisposalUnitVisualLayers.Light"] map: ["enum.DisposalUnitVisualLayers.Light"]
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
View File

@@ -9,7 +9,6 @@
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -17,7 +17,6 @@
types: types:
Radiation: 10 Radiation: 10
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

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

@@ -9,7 +9,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

2
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
View File

@@ -9,7 +9,6 @@
- type: Clickable - type: Clickable
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
# Using a circle here makes it a lot easier to pull it all the way from Cargo # Using a circle here makes it a lot easier to pull it all the way from Cargo
@@ -57,7 +56,6 @@
- type: Clickable - type: Clickable
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
View File

@@ -9,7 +9,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
View File

@@ -13,7 +13,6 @@
- type: Clickable - type: Clickable
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
# Using a circle here makes it a lot easier to pull it all the way from Cargo # Using a circle here makes it a lot easier to pull it all the way from Cargo

1
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
View File

@@ -11,7 +11,6 @@
path: /Audio/Effects/singularity.ogg path: /Audio/Effects/singularity.ogg
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- id: DeleteCircle - id: DeleteCircle
shape: shape:

3
Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
View File

@@ -11,7 +11,6 @@
sprite: Structures/Power/Generation/ame.rsi sprite: Structures/Power/Generation/ame.rsi
state: control state: control
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -75,7 +74,6 @@
components: components:
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -104,7 +102,6 @@
sprite: Structures/Power/Generation/ame.rsi sprite: Structures/Power/Generation/ame.rsi
state: shield_0 state: shield_0
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

1
Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
View File

@@ -14,7 +14,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

3
Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
View File

@@ -11,7 +11,6 @@
anchored: true anchored: true
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -110,7 +109,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeCircle !type:PhysShapeCircle
@@ -152,7 +150,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

1
Resources/Prototypes/Entities/Structures/Power/apc.yml
View File

@@ -22,7 +22,6 @@
access: [["Engineering"]] access: [["Engineering"]]
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
View File

@@ -11,7 +11,6 @@
drawdepth: BelowFloor drawdepth: BelowFloor
- type: Clickable - type: Clickable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Power/cables.yml
View File

@@ -6,7 +6,6 @@
components: components:
- type: Clickable - type: Clickable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

4
Resources/Prototypes/Entities/Structures/Power/debug_power.yml
View File

@@ -20,7 +20,6 @@
- type: Clickable - type: Clickable
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -64,7 +63,6 @@
- type: Clickable - type: Clickable
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -96,7 +94,6 @@
- type: Clickable - type: Clickable
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -156,7 +153,6 @@
- type: Clickable - type: Clickable
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

2
Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
View File

@@ -46,7 +46,6 @@
damageModifierSet: Metallic damageModifierSet: Metallic
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -373,7 +372,6 @@
state: grey-1 state: grey-1
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
View File

@@ -26,7 +26,6 @@
path: /Audio/Effects/bang.ogg path: /Audio/Effects/bang.ogg
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
View File

@@ -20,7 +20,6 @@
map: ["enum.StorageVisualLayers.Welded"] map: ["enum.StorageVisualLayers.Welded"]
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
View File

@@ -553,7 +553,6 @@
acts: [ "Destruction" ] acts: [ "Destruction" ]
- type: Physics - type: Physics
bodyType: Dynamic bodyType: Dynamic
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
View File

@@ -7,7 +7,6 @@
components: components:
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

3
Resources/Prototypes/Entities/Structures/Storage/morgue.yml
View File

@@ -17,7 +17,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -60,7 +59,6 @@
components: components:
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -99,7 +97,6 @@
- type: InteractionOutline - type: InteractionOutline
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Storage/storage.yml
View File

@@ -15,7 +15,6 @@
state: rack state: rack
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
View File

@@ -4,7 +4,6 @@
name: atmos plaque name: atmos plaque
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
View File

@@ -4,7 +4,6 @@
name: bar sign name: bar sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
View File

@@ -8,7 +8,6 @@
- type: Physics - type: Physics
bodyType: Static bodyType: Static
canCollide: false canCollide: false
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

47
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
View File

@@ -10,7 +10,6 @@
description: Return to monky. description: Return to monky.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -32,7 +31,6 @@
components: components:
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -52,7 +50,6 @@
components: components:
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -73,7 +70,6 @@
components: components:
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -94,7 +90,6 @@
components: components:
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -115,7 +110,6 @@
components: components:
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -135,7 +129,6 @@
components: components:
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -155,7 +148,6 @@
components: components:
- type: Rotatable - type: Rotatable
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -176,7 +168,6 @@
name: armory sign name: armory sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -195,7 +186,6 @@
name: tool storage sign name: tool storage sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -214,7 +204,6 @@
name: anomaly lab sign name: anomaly lab sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -233,7 +222,6 @@
name: atmos sign name: atmos sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -252,7 +240,6 @@
name: bar sign name: bar sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -271,7 +258,6 @@
name: library sign name: library sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -290,7 +276,6 @@
name: chapel sign name: chapel sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -309,7 +294,6 @@
name: head sign name: head sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -328,7 +312,6 @@
name: conference room sign name: conference room sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -347,7 +330,6 @@
name: drones sign name: drones sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -365,7 +347,6 @@
name: engine sign name: engine sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -383,7 +364,6 @@
name: cloning sign name: cloning sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -401,7 +381,6 @@
name: interrogation sign name: interrogation sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -419,7 +398,6 @@
name: surgery sign name: surgery sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -437,7 +415,6 @@
name: telecomms sign name: telecomms sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -455,7 +432,6 @@
name: cargo sign name: cargo sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -473,7 +449,6 @@
name: cargo dock sign name: cargo dock sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -491,7 +466,6 @@
name: chemistry sign name: chemistry sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -509,7 +483,6 @@
name: docking sign name: docking sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -527,7 +500,6 @@
name: engineering sign name: engineering sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -545,7 +517,6 @@
name: EVA sign name: EVA sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -563,7 +534,6 @@
name: gravity sign name: gravity sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -581,7 +551,6 @@
name: medbay sign name: medbay sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -599,7 +568,6 @@
name: morgue sign name: morgue sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -617,7 +585,6 @@
name: prison sign name: prison sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -635,7 +602,6 @@
name: research and development sign name: research and development sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -653,7 +619,6 @@
name: science sign name: science sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -671,7 +636,6 @@
name: toxins sign name: toxins sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -689,7 +653,6 @@
name: bridge sign name: bridge sign
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -710,7 +673,6 @@
description: WARNING! Air flow tube. Ensure the flow is disengaged before working. description: WARNING! Air flow tube. Ensure the flow is disengaged before working.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -729,7 +691,6 @@
description: WARNING! CO2 flow tube. Ensure the flow is disengaged before working. description: WARNING! CO2 flow tube. Ensure the flow is disengaged before working.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -748,7 +709,6 @@
description: WARNING! N2 flow tube. Ensure the flow is disengaged before working. description: WARNING! N2 flow tube. Ensure the flow is disengaged before working.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -767,7 +727,6 @@
description: WARNING! N2O flow tube. Ensure the flow is disengaged before working. description: WARNING! N2O flow tube. Ensure the flow is disengaged before working.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -786,7 +745,6 @@
description: WARNING! O2 flow tube. Ensure the flow is disengaged before working. description: WARNING! O2 flow tube. Ensure the flow is disengaged before working.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -805,7 +763,6 @@
description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working. description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -824,7 +781,6 @@
description: WARNING! Waste flow tube. Ensure the flow is disengaged before working. description: WARNING! Waste flow tube. Ensure the flow is disengaged before working.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -843,7 +799,6 @@
description: A warning sign which reads 'NO SMOKING' description: A warning sign which reads 'NO SMOKING'
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -862,7 +817,6 @@
description: Technical information of some sort, shame its too worn-out to read. description: Technical information of some sort, shame its too worn-out to read.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -881,7 +835,6 @@
description: Looks like a planet crashing by some station above it. Its kinda scary. description: Looks like a planet crashing by some station above it. Its kinda scary.
components: components:
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

2
Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
View File

@@ -11,7 +11,6 @@
node: tubeLight node: tubeLight
- type: Physics - type: Physics
canCollide: false canCollide: false
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb
@@ -155,7 +154,6 @@
enabled: false enabled: false
offset: "0, -0.5" offset: "0, -0.5"
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Walls/barricades.yml
View File

@@ -11,7 +11,6 @@
sprite: Structures/Walls/barricades.rsi sprite: Structures/Walls/barricades.rsi
state: barricadewooden state: barricadewooden
- type: Physics - type: Physics
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

1
Resources/Prototypes/Entities/Structures/Walls/base.yml
View File

@@ -22,7 +22,6 @@
damageModifierSet: Metallic damageModifierSet: Metallic
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb !type:PhysShapeAabb

1
Resources/Prototypes/Entities/Structures/Walls/girder.yml
View File

@@ -8,7 +8,6 @@
anchored: true anchored: true
- type: Physics - type: Physics
bodyType: Static bodyType: Static
- type: Fixtures
fixtures: fixtures:
- shape: - shape:
!type:PhysShapeAabb {} !type:PhysShapeAabb {}

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