From 41cbcc85e0434b94f60a018663e511ae344fd4e9 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Wed, 14 Oct 2020 20:16:57 +0200 Subject: [PATCH] Rename last usages of Collidable to Physics --- .../PowerReceiverComponent.cs | 12 +- .../Maps/Test/Breathing/3by3-20oxy-80nit.yml | 2 +- Resources/Maps/Test/Pathfinding/simple.yml | 38 +-- Resources/Maps/saltern.yml | 286 +++++++++--------- Resources/Maps/stationstation.yml | 260 ++++++++-------- .../Constructible/Doors/airlock_base.yml | 2 +- .../Entities/Constructible/Doors/firelock.yml | 4 +- .../Entities/Constructible/Furniture/beds.yml | 4 +- .../Constructible/Furniture/bookshelf.yml | 2 +- .../Constructible/Furniture/instruments.yml | 2 +- .../Constructible/Furniture/pilot_chair.yml | 2 +- .../Constructible/Furniture/potted_plants.yml | 2 +- .../Constructible/Furniture/seats.yml | 2 +- .../Constructible/Furniture/storage.yml | 4 +- .../Constructible/Furniture/tables.yml | 2 +- .../Entities/Constructible/Ground/catwalk.yml | 2 +- .../Constructible/Ground/crayondecals.yml | 4 +- .../Constructible/Ground/gascanisterports.yml | 3 +- .../Constructible/Ground/gascanisters.yml | 3 +- .../Entities/Constructible/Ground/kitchen.yml | 2 +- .../Entities/Constructible/Ground/pipes.yml | 4 +- .../Entities/Constructible/Ground/pumps.yml | 2 +- .../Constructible/Ground/scrubbers.yml | 2 +- .../Entities/Constructible/Ground/vents.yml | 2 +- .../Power/AME/ame_controller.yml | 2 +- .../Constructible/Power/AME/ame_structure.yml | 2 +- .../Constructible/Power/chem_master.yml | 4 +- .../Constructible/Power/cloning_machine.yml | 2 +- .../Constructible/Power/computers.yml | 6 +- .../Constructible/Power/debug_power.yml | 8 +- .../Constructible/Power/gravity_generator.yml | 2 +- .../Entities/Constructible/Power/lathe.yml | 6 +- .../Constructible/Power/medical_scanner.yml | 2 +- .../Constructible/Power/microwave.yml | 2 +- .../Constructible/Power/power_base.yml | 12 +- .../Power/reagent_dispenser_base.yml | 2 +- .../Entities/Constructible/Power/research.yml | 4 +- .../Constructible/Power/vending_machines.yml | 2 +- .../Entities/Constructible/Power/wires.yml | 2 +- .../Constructible/Storage/Closets/closet.yml | 2 +- .../Storage/StorageTanks/base_tank.yml | 2 +- .../Constructible/Storage/crate_base.yml | 2 +- .../Entities/Constructible/Walls/asteroid.yml | 2 +- .../Constructible/Walls/atmos_plaque.yml | 2 +- .../Entities/Constructible/Walls/bar_sign.yml | 4 +- .../Entities/Constructible/Walls/girder.yml | 2 +- .../Entities/Constructible/Walls/lighting.yml | 2 +- .../Entities/Constructible/Walls/linking.yml | 4 +- .../Entities/Constructible/Walls/low_wall.yml | 2 +- .../Entities/Constructible/Walls/mirror.yml | 2 +- .../Entities/Constructible/Walls/signs.yml | 96 +++--- .../Entities/Constructible/Walls/walls.yml | 2 +- .../Entities/Constructible/Walls/windows.yml | 2 +- .../Entities/Constructible/conveyor.yml | 2 +- .../Entities/Constructible/disposal.yml | 4 +- .../Entities/Constructible/recycler.yml | 2 +- .../Effects/Markers/construction_ghost.yml | 4 +- .../Markers/gamemode_conditional_spawners.yml | 2 +- .../Entities/Effects/Markers/marker_base.yml | 2 +- .../Entities/Effects/Markers/spawn_points.yml | 2 +- .../Effects/Markers/timed_spawners.yml | 2 +- .../Entities/Effects/Markers/toy_spawner.yml | 4 +- .../Effects/Markers/trash_spawner.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 26 +- .../Prototypes/Entities/Mobs/NPCs/carp.yml | 6 +- .../Prototypes/Entities/Mobs/NPCs/mimic.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 12 +- .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 2 +- .../Entities/Mobs/Player/observer.yml | 2 +- .../Entities/Mobs/Species/human.yml | 4 +- .../Entities/Objects/Consumable/trash.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 2 +- .../Objects/Misc/fire_extinguisher.yml | 2 +- .../Entities/Objects/Misc/fluff_lights.yml | 4 +- .../Entities/Objects/Misc/teleporters.yml | 2 +- .../Entities/Objects/Power/powercells.yml | 8 +- .../Entities/Objects/Specific/janitor.yml | 8 +- .../Weapons/Guns/Projectiles/projectiles.yml | 4 +- Resources/Prototypes/Entities/item_base.yml | 2 +- Resources/Prototypes/Entities/puddle.yml | 2 +- 80 files changed, 473 insertions(+), 475 deletions(-) diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs index c87979f17c..a6e924e4f0 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs @@ -25,7 +25,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents { [Dependency] private readonly IServerEntityManager _serverEntityManager = default!; - [ViewVariables] [ComponentDependency] private readonly IPhysicsComponent? _collidableComponent = null; + [ViewVariables] [ComponentDependency] private readonly IPhysicsComponent? _physicsComponent = null; public override string Name => "PowerReceiver"; @@ -54,7 +54,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents /// public bool Connectable => Anchored; - private bool Anchored => _collidableComponent == null || _collidableComponent.Anchored; + private bool Anchored => _physicsComponent == null || _physicsComponent.Anchored; [ViewVariables] public bool NeedsProvider { get; private set; } = true; @@ -96,18 +96,18 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents { TryFindAndSetProvider(); } - if (_collidableComponent != null) + if (_physicsComponent != null) { AnchorUpdate(); - _collidableComponent.AnchoredChanged += AnchorUpdate; + _physicsComponent.AnchoredChanged += AnchorUpdate; } } public override void OnRemove() { - if (_collidableComponent != null) + if (_physicsComponent != null) { - _collidableComponent.AnchoredChanged -= AnchorUpdate; + _physicsComponent.AnchoredChanged -= AnchorUpdate; } _provider.RemoveReceiver(this); base.OnRemove(); diff --git a/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml b/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml index 3731c4f884..c45f45edb6 100644 --- a/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml +++ b/Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml @@ -91,7 +91,7 @@ entities: - shapes: - !type:PhysShapeGrid grid: 0 - type: Collidable + type: Physics - uniqueMixes: - volume: 2500 temperatureArchived: 293.15 diff --git a/Resources/Maps/Test/Pathfinding/simple.yml b/Resources/Maps/Test/Pathfinding/simple.yml index cc6b54039f..a9ad2d797c 100644 --- a/Resources/Maps/Test/Pathfinding/simple.yml +++ b/Resources/Maps/Test/Pathfinding/simple.yml @@ -93,7 +93,7 @@ entities: - shapes: - !type:PhysShapeGrid grid: 0 - type: Collidable + type: Physics - uid: 1 type: wall_light components: @@ -103,7 +103,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 2 type: wall_light components: @@ -113,7 +113,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 3 type: wall_light components: @@ -123,7 +123,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 4 type: wall_light components: @@ -133,7 +133,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 5 type: wall_light components: @@ -143,7 +143,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 6 type: wall_light components: @@ -153,7 +153,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 7 type: wall_light components: @@ -163,7 +163,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 8 type: wall_light components: @@ -173,7 +173,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 9 type: wall_light components: @@ -183,7 +183,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 10 type: wall_light components: @@ -193,7 +193,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 11 type: wall_light components: @@ -203,7 +203,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 12 type: wall_light components: @@ -213,7 +213,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 13 type: wall_light components: @@ -223,7 +223,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 14 type: wall_light components: @@ -233,7 +233,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 15 type: wall_light components: @@ -243,7 +243,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 16 type: wall_light components: @@ -253,7 +253,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 17 type: wall_light components: @@ -263,7 +263,7 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics - uid: 18 type: wall_light components: @@ -273,5 +273,5 @@ entities: type: Transform - shapes: - !type:PhysShapeAabb {} - type: Collidable + type: Physics ... diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index a7fc250b5f..5c96962500 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -211,7 +211,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 17 @@ -600,7 +600,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: PowerCellCharger-powerCellContainer: type: Content.Server.GameObjects.ContainerSlot @@ -3451,7 +3451,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -5804,7 +5804,7 @@ entities: pos: -8.5,8.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 580 type: ChairOfficeDark components: @@ -5813,7 +5813,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 581 type: Table components: @@ -8400,7 +8400,7 @@ entities: - shapes: - !type:PhysShapeGrid grid: 0 - type: Collidable + type: Physics - uniqueMixes: - volume: 2500 moles: @@ -19647,7 +19647,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 903 type: PianoInstrument components: @@ -19656,7 +19656,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 904 type: VendingMachineTheater components: @@ -20063,7 +20063,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 961 type: Chair components: @@ -20071,7 +20071,7 @@ entities: pos: 8.5,17.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 962 type: Table components: @@ -20129,7 +20129,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 967 type: ComputerMedicalRecords components: @@ -20147,7 +20147,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 969 type: ChairOfficeDark components: @@ -20155,7 +20155,7 @@ entities: pos: -2.5,25.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 970 type: ChairOfficeDark components: @@ -20163,7 +20163,7 @@ entities: pos: -2.5,24.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 971 type: ChairOfficeDark components: @@ -20172,7 +20172,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 972 type: ChairOfficeDark components: @@ -20181,7 +20181,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 973 type: TableWood components: @@ -20295,7 +20295,7 @@ entities: pos: 7.5,25.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 985 type: ChairOfficeDark components: @@ -20304,7 +20304,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 986 type: ComputerComms components: @@ -20328,7 +20328,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 988 type: TableWood components: @@ -20438,7 +20438,7 @@ entities: pos: -1.5,-3.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1001 type: Catwalk components: @@ -20453,7 +20453,7 @@ entities: pos: 22.5,-14.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1003 type: VendingMachineSnack components: @@ -20487,7 +20487,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1008 type: ChairWood components: @@ -20496,7 +20496,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1009 type: ChairWood components: @@ -20505,7 +20505,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1010 type: ChairWood components: @@ -20514,7 +20514,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1011 type: ChairWood components: @@ -20523,7 +20523,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1012 type: ChairWood components: @@ -20532,7 +20532,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1013 type: ChairWood components: @@ -20541,7 +20541,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1014 type: ChairWood components: @@ -20550,7 +20550,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1015 type: TableWood components: @@ -20607,7 +20607,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1022 type: StoolBar components: @@ -20616,7 +20616,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1023 type: StoolBar components: @@ -20625,7 +20625,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1024 type: StoolBar components: @@ -20634,7 +20634,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1025 type: StoolBar components: @@ -20643,7 +20643,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1026 type: StoolBar components: @@ -20652,7 +20652,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1027 type: Catwalk components: @@ -20870,7 +20870,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1053 type: ChairOfficeLight components: @@ -20878,7 +20878,7 @@ entities: pos: -9.5,-17.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1054 type: Table components: @@ -20898,7 +20898,7 @@ entities: pos: -5.5,-23.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1057 type: ChairOfficeLight components: @@ -20906,7 +20906,7 @@ entities: pos: -0.5,-14.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1058 type: BaseResearchAndDevelopmentPointSource components: @@ -21357,7 +21357,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1105 type: Table components: @@ -21956,7 +21956,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1174 type: Chair components: @@ -21965,7 +21965,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1175 type: LockerHeadOfSecurityFilled components: @@ -22060,7 +22060,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1186 type: Table components: @@ -22304,7 +22304,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1213 type: Poweredlight components: @@ -22342,7 +22342,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1217 type: Chair components: @@ -22350,7 +22350,7 @@ entities: pos: -13.5,8.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1218 type: Food4NoRaisins components: @@ -22798,7 +22798,7 @@ entities: pos: -8.5,20.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1260 type: solid_wall components: @@ -23868,7 +23868,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1348 type: ChairOfficeLight components: @@ -23877,7 +23877,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1349 type: Poweredlight components: @@ -24544,7 +24544,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 1409 @@ -25507,7 +25507,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1546 type: Chair components: @@ -25515,7 +25515,7 @@ entities: pos: 38.5,-0.5 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1547 type: Table components: @@ -25772,7 +25772,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1582 type: Catwalk components: @@ -31841,7 +31841,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 2439 type: solid_wall components: @@ -45406,7 +45406,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3959 @@ -45426,7 +45426,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3961 @@ -45437,7 +45437,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3962 @@ -45456,7 +45456,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3964 @@ -45467,7 +45467,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -45480,7 +45480,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -45493,7 +45493,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3967 @@ -45504,7 +45504,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3968 @@ -45515,7 +45515,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3969 @@ -45542,7 +45542,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3972 @@ -45553,7 +45553,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3973 @@ -45564,7 +45564,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3974 @@ -45575,7 +45575,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3975 @@ -45603,7 +45603,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3978 @@ -45614,7 +45614,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3979 @@ -45643,7 +45643,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3982 @@ -45654,7 +45654,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3983 @@ -45687,7 +45687,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3986 @@ -45734,7 +45734,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -45790,7 +45790,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3997 @@ -45801,7 +45801,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 3998 @@ -45821,7 +45821,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -45834,7 +45834,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -45847,7 +45847,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4002 @@ -45858,7 +45858,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4003 @@ -45883,7 +45883,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4006 @@ -45894,7 +45894,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -45907,7 +45907,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4008 @@ -45918,7 +45918,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4009 @@ -45929,7 +45929,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -45942,7 +45942,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4011 @@ -45953,7 +45953,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4012 @@ -45964,7 +45964,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4013 @@ -45975,7 +45975,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4014 @@ -45986,7 +45986,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4015 @@ -45997,7 +45997,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4016 @@ -46031,7 +46031,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4020 @@ -46042,7 +46042,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4021 @@ -46053,7 +46053,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46071,7 +46071,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46091,7 +46091,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4026 @@ -46102,7 +46102,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4027 @@ -46113,7 +46113,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4028 @@ -46124,7 +46124,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4029 @@ -46135,7 +46135,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4030 @@ -46146,7 +46146,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4031 @@ -46157,7 +46157,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46170,7 +46170,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4033 @@ -46181,7 +46181,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4034 @@ -46197,7 +46197,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46210,7 +46210,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4037 @@ -46226,7 +46226,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4039 @@ -46237,7 +46237,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4040 @@ -46248,7 +46248,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4041 @@ -46259,7 +46259,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46272,7 +46272,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46285,7 +46285,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46317,7 +46317,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4048 @@ -46328,7 +46328,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4049 @@ -46339,7 +46339,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4050 @@ -46350,7 +46350,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4051 @@ -46361,7 +46361,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4052 @@ -46372,7 +46372,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4053 @@ -46383,7 +46383,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4054 @@ -46394,7 +46394,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46407,7 +46407,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4056 @@ -46418,7 +46418,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4057 @@ -46429,7 +46429,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4058 @@ -46440,7 +46440,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46453,7 +46453,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46466,7 +46466,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46515,7 +46515,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4066 @@ -46535,7 +46535,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4068 @@ -46555,7 +46555,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4070 @@ -46594,7 +46594,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4075 @@ -46605,7 +46605,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4076 @@ -46625,7 +46625,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46656,7 +46656,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46669,7 +46669,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46691,7 +46691,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46704,7 +46704,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -46717,7 +46717,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -47030,7 +47030,7 @@ entities: rot: 3.141592653589793 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - enabled: False @@ -47043,7 +47043,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4122 @@ -47082,7 +47082,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4127 @@ -47093,7 +47093,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4128 @@ -47104,7 +47104,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4129 @@ -47115,7 +47115,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4130 @@ -47126,7 +47126,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - hard: False - type: Collidable + type: Physics - airBlocked: False type: Airtight - uid: 4131 diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index c6bbc5225c..509128acc1 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -68,7 +68,7 @@ entities: pos: 8.560405,21.456738 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 1 type: solid_wall components: @@ -82,7 +82,7 @@ entities: - parent: 3 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 3 type: Poweredlight components: @@ -104,7 +104,7 @@ entities: pos: 10.577456,21.424059 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 5 type: ChairOfficeLight components: @@ -270,7 +270,7 @@ entities: - parent: 23 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 23 type: PoweredSmallLight components: @@ -299,7 +299,7 @@ entities: - parent: 26 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 26 type: PoweredSmallLight components: @@ -335,14 +335,14 @@ entities: - parent: 27 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 29 type: LightTube components: - parent: 30 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 30 type: Poweredlight components: @@ -363,7 +363,7 @@ entities: - parent: 32 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 32 type: PoweredSmallLight components: @@ -384,7 +384,7 @@ entities: - parent: 34 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 34 type: Poweredlight components: @@ -406,7 +406,7 @@ entities: - parent: 36 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 36 type: Poweredlight components: @@ -443,14 +443,14 @@ entities: - parent: 37 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 39 type: LightTube components: - parent: 40 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 40 type: Poweredlight components: @@ -472,7 +472,7 @@ entities: - parent: 42 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 42 type: Poweredlight components: @@ -1224,7 +1224,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -1239,7 +1239,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -1254,7 +1254,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -1269,7 +1269,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -1284,7 +1284,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -1299,7 +1299,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -1314,7 +1314,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 154 type: Beaker components: @@ -1323,7 +1323,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 155 type: Beaker components: @@ -1332,7 +1332,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 156 type: Beaker components: @@ -1341,7 +1341,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 157 type: Beaker components: @@ -1350,7 +1350,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 158 type: LargeBeaker components: @@ -1359,7 +1359,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 159 type: LargeBeaker components: @@ -1368,7 +1368,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 160 type: LargeBeaker components: @@ -1377,7 +1377,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 161 type: Table components: @@ -1435,7 +1435,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 169 type: Ointment components: @@ -1444,7 +1444,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 170 type: Brutepack components: @@ -1453,7 +1453,7 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 171 type: Brutepack components: @@ -1462,14 +1462,14 @@ entities: rot: 1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 172 type: LightTube components: - parent: 173 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 173 type: Poweredlight components: @@ -1502,7 +1502,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -1515,7 +1515,7 @@ entities: rot: 3.141592653589793 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -1554,7 +1554,7 @@ entities: - parent: 182 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 182 type: Poweredlight components: @@ -1576,7 +1576,7 @@ entities: - parent: 184 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 184 type: Poweredlight components: @@ -1598,7 +1598,7 @@ entities: - parent: 186 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 186 type: Poweredlight components: @@ -1648,7 +1648,7 @@ entities: - parent: 192 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 192 type: Poweredlight components: @@ -1670,7 +1670,7 @@ entities: - parent: 194 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 194 type: Poweredlight components: @@ -1692,7 +1692,7 @@ entities: - parent: 196 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 196 type: Poweredlight components: @@ -1720,7 +1720,7 @@ entities: - parent: 199 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 199 type: Poweredlight components: @@ -1742,7 +1742,7 @@ entities: - parent: 201 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 201 type: Poweredlight components: @@ -1764,7 +1764,7 @@ entities: - parent: 203 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 203 type: Poweredlight components: @@ -1845,7 +1845,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 212 type: Beaker components: @@ -1854,7 +1854,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 213 type: Beaker components: @@ -1863,7 +1863,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 214 type: AirlockMedicalGlass components: @@ -1892,7 +1892,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - startingCharge: 1000 type: PowerCell - containers: @@ -1911,7 +1911,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - startingCharge: 1000 type: PowerCell - containers: @@ -1930,7 +1930,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 220 type: Ointment components: @@ -1939,7 +1939,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 221 type: Spear components: @@ -1948,7 +1948,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 222 type: Spear components: @@ -1957,7 +1957,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 223 type: PowerCellSmallHigh components: @@ -1966,7 +1966,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 224 type: PowerCellSmallHigh components: @@ -1975,7 +1975,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 225 type: OuterclothingVest components: @@ -1984,7 +1984,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 226 type: solid_wall components: @@ -2120,7 +2120,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 244 type: AirlockMedicalGlass components: @@ -2149,7 +2149,7 @@ entities: - parent: 242 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 247 type: AirlockMedicalGlass components: @@ -2480,7 +2480,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 294 type: solid_wall components: @@ -2571,7 +2571,7 @@ entities: - parent: 209 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 307 type: CrateGeneric components: @@ -2580,7 +2580,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -2862,7 +2862,7 @@ entities: pos: 9.435405,21.503613 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 347 type: MetalStack components: @@ -2870,14 +2870,14 @@ entities: pos: 9.654155,21.628613 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 348 type: MagazinePistolSmg components: - parent: 484 type: Transform - anchored: False - type: Collidable + type: Physics - containers: RangedMagazine-magazine: type: Robust.Server.GameObjects.Components.Container.Container @@ -2888,7 +2888,7 @@ entities: - parent: 485 type: Transform - anchored: False - type: Collidable + type: Physics - containers: RangedMagazine-magazine: type: Robust.Server.GameObjects.Components.Container.Container @@ -2901,7 +2901,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 351 type: Catwalk components: @@ -2980,7 +2980,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 362 type: LockerGeneric components: @@ -2989,7 +2989,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -3008,7 +3008,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -3021,7 +3021,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -3034,7 +3034,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -3053,7 +3053,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 367 type: SpawnPointLatejoin components: @@ -3186,21 +3186,21 @@ entities: - parent: 217 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 384 type: PowerCellSmallStandard components: - parent: 218 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 385 type: LightBulb components: - parent: 245 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 386 type: WallLight components: @@ -3292,7 +3292,7 @@ entities: pos: 10.561831,21.767809 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 399 type: solid_wall components: @@ -3314,7 +3314,7 @@ entities: pos: 8.57603,21.566113 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 402 type: Table components: @@ -3489,7 +3489,7 @@ entities: - parent: 427 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 427 type: Poweredlight components: @@ -3542,7 +3542,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 432 type: Stool components: @@ -3584,7 +3584,7 @@ entities: - parent: 466 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 438 type: WardrobeScience components: @@ -3593,7 +3593,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -3692,7 +3692,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 452 type: Catwalk components: @@ -3820,7 +3820,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -3833,7 +3833,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -3846,7 +3846,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: flashlight_cell_container: type: Content.Server.GameObjects.ContainerSlot @@ -3859,7 +3859,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: flashlight_cell_container: type: Content.Server.GameObjects.ContainerSlot @@ -3872,7 +3872,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 473 type: UniformEngineering components: @@ -3881,7 +3881,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 474 type: GasMaskClothing components: @@ -3890,7 +3890,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 475 type: OuterclothingVest components: @@ -3899,7 +3899,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 476 type: UtilityBeltClothingFilled components: @@ -3908,7 +3908,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -3921,7 +3921,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -3934,7 +3934,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: magazine_bullet_container: type: Robust.Server.GameObjects.Components.Container.Container @@ -3949,7 +3949,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: magazine_bullet_container: type: Robust.Server.GameObjects.Components.Container.Container @@ -3964,7 +3964,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: magazine_bullet_container: type: Robust.Server.GameObjects.Components.Container.Container @@ -3979,7 +3979,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -3992,7 +3992,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - containers: storagebase: type: Robust.Server.GameObjects.Components.Container.Container @@ -4005,7 +4005,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 484 type: SmgC20r components: @@ -4016,7 +4016,7 @@ entities: - maxAngle: 59.99999999999999 type: MagazineBarrel - anchored: False - type: Collidable + type: Physics - containers: ballistics_chamber_0: type: Content.Server.GameObjects.ContainerSlot @@ -4039,7 +4039,7 @@ entities: - maxAngle: 59.99999999999999 type: MagazineBarrel - anchored: False - type: Collidable + type: Physics - containers: ballistics_chamber_0: type: Content.Server.GameObjects.ContainerSlot @@ -4172,7 +4172,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -4355,7 +4355,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 528 type: GlovesLeather components: @@ -4364,7 +4364,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 529 type: GlovesLeather components: @@ -4373,7 +4373,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 530 type: LedLightTube components: @@ -4384,14 +4384,14 @@ entities: - color: '#EEEEFFFF' type: Sprite - anchored: False - type: Collidable + type: Physics - uid: 531 type: LightTube components: - parent: 430 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 532 type: Poweredlight components: @@ -4413,7 +4413,7 @@ entities: - parent: 532 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 534 type: Poweredlight components: @@ -4435,7 +4435,7 @@ entities: - parent: 534 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 536 type: WallLight components: @@ -4463,7 +4463,7 @@ entities: - parent: 537 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 539 type: solid_wall components: @@ -4752,7 +4752,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -4767,7 +4767,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -4782,7 +4782,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -4797,7 +4797,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -4812,7 +4812,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - IsPlaceable: False type: PlaceableSurface - containers: @@ -4827,7 +4827,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 585 type: AirlockEngineering components: @@ -4919,7 +4919,7 @@ entities: - parent: 589 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 591 type: Poweredlight components: @@ -4941,7 +4941,7 @@ entities: - parent: 591 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 593 type: Poweredlight components: @@ -4962,7 +4962,7 @@ entities: - parent: 593 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 595 type: Poweredlight components: @@ -4983,7 +4983,7 @@ entities: - parent: 595 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 597 type: Poweredlight components: @@ -5004,7 +5004,7 @@ entities: - parent: 597 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 599 type: PoweredSmallLight components: @@ -5026,7 +5026,7 @@ entities: - parent: 599 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 601 type: ApcExtensionCableStack1 components: @@ -5035,7 +5035,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 602 type: ApcExtensionCableStack1 components: @@ -5044,7 +5044,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 603 type: solid_wall components: @@ -5094,7 +5094,7 @@ entities: - parent: 607 type: Transform - anchored: False - type: Collidable + type: Physics - uid: 609 type: MetalStack components: @@ -5103,7 +5103,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 610 type: MetalStack components: @@ -5112,7 +5112,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 611 type: solid_wall components: @@ -5240,7 +5240,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 629 type: ApcExtensionCableStack1 components: @@ -5249,7 +5249,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 630 type: GlassStack components: @@ -5258,7 +5258,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 631 type: GlassStack components: @@ -5267,7 +5267,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 632 type: GlassStack components: @@ -5276,7 +5276,7 @@ entities: rot: -1.5707963267949 rad type: Transform - anchored: False - type: Collidable + type: Physics - uid: 633 type: VendingMachineEngivend components: diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml index 3cde4a978d..6630242b3d 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml @@ -23,7 +23,7 @@ map: ["enum.DoorVisualLayers.BaseBolted"] - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close diff --git a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml index 843be2711a..58b0c499ee 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml @@ -23,7 +23,7 @@ - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close @@ -88,7 +88,7 @@ fixVacuum: true airBlockedDirection: - East - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.49,-0.49,-0.2,0.49" # don't want this colliding with walls or they won't close diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml index 9a21751026..5622aae3f7 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml @@ -5,7 +5,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite sprite: Constructible/Misc/furniture.rsi state: bed @@ -16,4 +16,4 @@ deadThreshold: 75 resistances: metallicResistances placement: - mode: SnapgridCenter \ No newline at end of file + mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml index e4d81e0cef..200d27930d 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml @@ -10,7 +10,7 @@ - type: InteractionOutline - type: Sprite sprite: Constructible/Misc/bookshelf.rsi - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml b/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml index 976805538a..39d00d82d7 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml @@ -8,7 +8,7 @@ - type: Clickable - type: InteractionOutline - type: Anchorable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb mask: diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml index 32aceaaf65..4feb8f6772 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml @@ -6,7 +6,7 @@ - type: Sprite sprite: Constructible/Misc/furniture.rsi state: shuttle_chair - - type: Collidable + - type: Physics - type: Clickable - type: InteractionOutline - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml index 198ef21fed..fb8cc8c42a 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml @@ -4,7 +4,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite sprite: Constructible/Misc/potted_plants.rsi - type: PottedPlantHide diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml index 46ddfe50ae..9f98b49d36 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml @@ -6,7 +6,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite sprite: Constructible/Misc/furniture.rsi - type: Strap diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml index efbd7f979d..d4f501326a 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml @@ -9,7 +9,7 @@ - type: Sprite sprite: Constructible/Misc/furniture.rsi state: rack - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: @@ -35,7 +35,7 @@ - type: Sprite sprite: Constructible/Misc/furniture.rsi state: shelf - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml index d569b81d0a..00b1e072ca 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml @@ -16,7 +16,7 @@ - type: IconSmooth key: state base: state_ - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml index 70f932672b..a046dbc29c 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml @@ -5,7 +5,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite netsync: false sprite: Constructible/Tiles/catwalk.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml b/Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml index 96c24e9894..d3142f00c6 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml @@ -6,11 +6,11 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite sprite: Constructible/Misc/crayondecals.rsi state: corgi - type: Cleanable - type: Appearance visuals: - - type: CrayonDecalVisualizer \ No newline at end of file + - type: CrayonDecalVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml index 7cfdb46500..61be8748a4 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml @@ -6,7 +6,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center - type: Sprite @@ -27,4 +27,3 @@ - type: Sprite sprite: Constructible/Power/smes.rsi state: smes - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml index cddf2a7550..96c67b69e7 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml @@ -6,7 +6,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center - type: Sprite @@ -24,4 +24,3 @@ - type: Sprite sprite: "Constructible/Power/apc.rsi" state: apc0 - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml b/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml index ab76b8d1c2..6084541cd2 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml @@ -5,7 +5,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb mask: diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml index ae35ad5936..09be1aab5c 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml @@ -8,7 +8,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center - type: Destructible @@ -33,7 +33,7 @@ pipeDirection: Lateral - type: Icon state: pipeStraight2 - + - type: entity parent: PipeBase id: PipeBend diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml index 047ad284fb..74a44e0665 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml @@ -6,7 +6,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml index aea08ba83a..8cb3bd3d2d 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml @@ -6,7 +6,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center diff --git a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml index 618dbc21b6..11e17988d9 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml @@ -6,7 +6,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center diff --git a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml index 673a302c89..258af627e1 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml @@ -10,7 +10,7 @@ - type: Sprite sprite: Constructible/Power/ame_controller.rsi state: control - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml index eaa9fafe2c..9dab23d992 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml @@ -12,7 +12,7 @@ sprite: Constructible/Power/ame_shielding.rsi state: shield_0 - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml index b53d5a508e..01feb634e1 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml @@ -17,7 +17,7 @@ - type: Clickable - type: InteractionOutline - type: Anchorable - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: @@ -56,7 +56,7 @@ - type: Clickable - type: InteractionOutline - type: Anchorable - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml index 9ad7904465..044121cc7a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml @@ -14,7 +14,7 @@ - type: Anchorable - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Constructible/Power/computers.yml index 947fefb4a8..0883283533 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml @@ -2,7 +2,7 @@ id: ComputerFrame name: computer frame components: - - type: Collidable + - type: Physics mass: 25 anchored: false shapes: @@ -33,7 +33,7 @@ description: This computer has seen better days. abstract: true # We don't want this to show up in the entity spawner menu. components: - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: @@ -68,7 +68,7 @@ - type: Construction graph: computer node: computer - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml index 155a596cf2..f6012f54ee 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml @@ -11,7 +11,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.5, 0.5" @@ -40,7 +40,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.5, 0.5" @@ -67,7 +67,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.5, 0.5" @@ -109,7 +109,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.5, 0.5" diff --git a/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml b/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml index 5b9ca5bf54..a1c4822cb0 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml @@ -15,7 +15,7 @@ offset: Center - type: PowerReceiver powerLoad: 500 - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-1.5,-1.5,1.5,1.5" diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index 79164d201a..04fc062267 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -5,7 +5,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: @@ -42,7 +42,7 @@ shader: unshaded map: ["enum.AutolatheVisualLayers.BaseUnlit"] - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: @@ -90,7 +90,7 @@ - state: protolathe map: ["enum.ProtolatheVisualLayers.AnimationLayer"] - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml index 0b4967c6bb..93abfa5aaa 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml @@ -16,7 +16,7 @@ - type: Anchorable - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Power/microwave.yml b/Resources/Prototypes/Entities/Constructible/Power/microwave.yml index cddf073c59..629bcfd5b3 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/microwave.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/microwave.yml @@ -21,7 +21,7 @@ interfaces: - key: enum.MicrowaveUiKey.Key type: MicrowaveBoundUserInterface - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.16,-0.3,0.16,0.3" diff --git a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml index 298696d580..0e16728252 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml @@ -8,7 +8,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.3, 0.5" @@ -36,7 +36,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.5, 0.5" @@ -71,7 +71,7 @@ - type: entity id: BaseSubstation - description: Reduces the voltage of electricity put into it. + description: Reduces the voltage of electricity put into it. name: Base Substation abstract: true placement: @@ -79,7 +79,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.5, -0.5, 0.5, 0.5" @@ -117,7 +117,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.25, -0.25, 0.25, 0.3" @@ -162,7 +162,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: [MobMask, Opaque] diff --git a/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml index b9cab507b8..123732039f 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml @@ -5,7 +5,7 @@ - type: Clickable - type: InteractionOutline - type: Anchorable - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml index 8ff60e1d2a..ce3dbbef53 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/research.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml @@ -9,7 +9,7 @@ - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center - type: ResearchServer @@ -33,7 +33,7 @@ - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index 59e68d8ec8..a9d4c29f22 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -8,7 +8,7 @@ - type: Sprite sprite: Constructible/Power/VendingMachines/empty.rsi netsync: false - - type: Collidable + - type: Physics anchored: true shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Constructible/Power/wires.yml b/Resources/Prototypes/Entities/Constructible/Power/wires.yml index e6253d3c07..25fa68d802 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml @@ -7,7 +7,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: SnapGrid offset: Center - type: Sprite diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml index 37e89a4021..fcdcb58507 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml @@ -21,7 +21,7 @@ - type: DamageOnHighSpeedImpact soundHit: /Audio/Effects/bang.ogg - type: InteractionOutline - - type: Collidable + - type: Physics mass: 25 anchored: false shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml index 872df4514a..2ae0815232 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml @@ -6,7 +6,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 15 anchored: false shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml index fa53797212..d90eb2806d 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml @@ -12,7 +12,7 @@ map: ["enum.StorageVisualLayers.Door"] - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 25 anchored: false shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml index f4ea130c84..1a46eff500 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml @@ -10,7 +10,7 @@ sprite: Constructible/Structures/Walls/asteroid_rock.rsi state: 0 - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: [MobMask] diff --git a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml b/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml index 3146f114e6..cca5f22640 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml @@ -3,7 +3,7 @@ id: PlaqueAtmos name: Atmos Plaque components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.3,-0.3,0.3,0.3" diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml index d533fe5a56..1171aa19af 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml @@ -4,7 +4,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite drawdepth: WallTops sprite: Constructible/Misc/barsign.rsi @@ -20,7 +20,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite drawdepth: WallTops sprite: Constructible/Misc/sylphs.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml index 718717c993..70dccaf301 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml @@ -12,7 +12,7 @@ - type: Sprite sprite: Constructible/Structures/Walls/solid.rsi state: wall_girder - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: [MobMask, Opaque] diff --git a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml index 5de373d28e..feec88e639 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml @@ -4,7 +4,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: LoopingSound - type: Sprite sprite: Constructible/Lighting/light_tube.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml b/Resources/Prototypes/Entities/Constructible/Walls/linking.yml index 88112d33c0..3482f6d3eb 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/linking.yml @@ -4,7 +4,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite sprite: Constructible/Linking/switch.rsi state: on @@ -20,7 +20,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite sprite: Constructible/Linking/switch.rsi state: dead diff --git a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml index f21a70ecf4..f66b00b08b 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml @@ -19,7 +19,7 @@ - type: Icon sprite: Constructible/Structures/Walls/low_wall.rsi state: metal - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml index 00f9af663b..d51a0b5add 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml @@ -6,7 +6,7 @@ - type: Sprite sprite: Constructible/Misc/mirror.rsi state: mirror - - type: Collidable + - type: Physics mass: 25 anchored: true shapes: diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml index 723abbe221..23f1e62eae 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml @@ -5,7 +5,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb - type: Destructible @@ -26,7 +26,7 @@ name: monkey painting description: monky components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -49,7 +49,7 @@ description: A direction sign, pointing out which way Security is. components: - type: Rotatable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -70,7 +70,7 @@ description: A direction sign, pointing out which way evac is. components: - type: Rotatable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -92,7 +92,7 @@ description: A direction sign, pointing out which way the Bridge is. components: - type: Rotatable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -114,7 +114,7 @@ description: A direction sign, pointing out which way the Medical department is. components: - type: Rotatable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -136,7 +136,7 @@ description: A direction sign, pointing out which way the Engineering department is. components: - type: Rotatable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -157,7 +157,7 @@ description: A direction sign, pointing out which way the Science department is. components: - type: Rotatable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -178,7 +178,7 @@ description: A direction sign, pointing to some supplies. components: - type: Rotatable - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.1,-0.4,0.1,0.4" @@ -199,7 +199,7 @@ id: SignArmory name: armory sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -219,7 +219,7 @@ id: SignToolStorage name: tool storage sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -239,7 +239,7 @@ id: SignAnomaly name: anomaly lab sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -259,7 +259,7 @@ id: SignAtmos name: atmos sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -279,7 +279,7 @@ id: SignBar name: bar sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -299,7 +299,7 @@ id: SignLibrary name: library sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -319,7 +319,7 @@ id: SignChapel name: chapel sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -339,7 +339,7 @@ id: SignHead name: head sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -359,7 +359,7 @@ id: SignConference name: conference room sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -379,7 +379,7 @@ id: SignDrones name: drones sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -399,7 +399,7 @@ id: SignEngine name: engine sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -419,7 +419,7 @@ id: SignCloning name: cloning sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -439,7 +439,7 @@ id: SignInterrogation name: interrogation sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -459,7 +459,7 @@ id: SignSurgery name: surgery sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -479,7 +479,7 @@ id: SignTelecomms name: telecomms sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -499,7 +499,7 @@ id: SignCargo name: cargo sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -519,7 +519,7 @@ id: SignCargoDock name: cargo dock sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -539,7 +539,7 @@ id: SignChem name: chemistry sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -559,7 +559,7 @@ id: SignShipDock name: docking sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -579,7 +579,7 @@ id: SignEngineering name: engineering sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -599,7 +599,7 @@ id: SignEVA name: EVA sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -619,7 +619,7 @@ id: SignGravity name: gravity sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -639,7 +639,7 @@ id: SignMedical name: medbay sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -659,7 +659,7 @@ id: SignMorgue name: morgue sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -680,7 +680,7 @@ name: prison sign description: components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -700,7 +700,7 @@ id: SignRND name: research and development sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -720,7 +720,7 @@ id: SignScience name: science sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -740,7 +740,7 @@ id: SignToxins name: toxins sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -760,7 +760,7 @@ id: SignBridge name: bridge sign components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -783,7 +783,7 @@ name: air warning sign description: WARNING! Air flow tube. Ensure the flow is disengaged before working. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.3,0.2,0.3" @@ -804,7 +804,7 @@ name: CO2 warning sign description: WARNING! CO2 flow tube. Ensure the flow is disengaged before working. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.3,0.2,0.3" @@ -825,7 +825,7 @@ name: N2 warning sign description: WARNING! N2 flow tube. Ensure the flow is disengaged before working. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.3,0.2,0.3" @@ -846,7 +846,7 @@ name: N2O warning sign description: WARNING! N2O flow tube. Ensure the flow is disengaged before working. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.3,0.2,0.3" @@ -867,7 +867,7 @@ name: O2 warning sign description: WARNING! O2 flow tube. Ensure the flow is disengaged before working. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.3,0.2,0.3" @@ -888,7 +888,7 @@ name: phoron waste sign description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.3,0.2,0.3" @@ -909,7 +909,7 @@ name: atmos waste sign description: WARNING! Waste flow tube. Ensure the flow is disengaged before working. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.3,0.2,0.3" @@ -930,7 +930,7 @@ name: no smoking sign description: A warning sign which reads 'NO SMOKING' components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -951,7 +951,7 @@ name: old sign description: Technical information of some sort, shame its too worn-out to read. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" @@ -972,7 +972,7 @@ name: old sign description: Looks like a planet crashing by some station above it. Its kinda scary. components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.3,0.4,0.3" diff --git a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml index 521fceece1..11ff98a271 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml @@ -16,7 +16,7 @@ drawdepth: Walls - type: Icon state: full - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml index 6d78166447..0374485367 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml @@ -18,7 +18,7 @@ - type: Icon sprite: Constructible/Structures/Windows/window.rsi state: full - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Constructible/conveyor.yml b/Resources/Prototypes/Entities/Constructible/conveyor.yml index c618be2cef..392722ddca 100644 --- a/Resources/Prototypes/Entities/Constructible/conveyor.yml +++ b/Resources/Prototypes/Entities/Constructible/conveyor.yml @@ -7,7 +7,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics hard: false shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Constructible/disposal.yml b/Resources/Prototypes/Entities/Constructible/disposal.yml index 4beb3ca654..7bf50b731f 100644 --- a/Resources/Prototypes/Entities/Constructible/disposal.yml +++ b/Resources/Prototypes/Entities/Constructible/disposal.yml @@ -8,7 +8,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics anchored: true - type: SnapGrid offset: Center @@ -111,7 +111,7 @@ flushTime: 2 - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics anchored: true shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Constructible/recycler.yml b/Resources/Prototypes/Entities/Constructible/recycler.yml index 8d4b281de7..497cbcfd6a 100644 --- a/Resources/Prototypes/Entities/Constructible/recycler.yml +++ b/Resources/Prototypes/Entities/Constructible/recycler.yml @@ -7,7 +7,7 @@ components: - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics hard: false shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml index 8a93730b3b..c6904d65f4 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml @@ -6,7 +6,7 @@ - type: Sprite color: '#3F38' - type: ConstructionGhost - - type: Collidable + - type: Physics - type: Clickable - type: InteractionOutline @@ -17,6 +17,6 @@ components: - type: Sprite - type: Construction - - type: Collidable + - type: Physics - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml index 18f56d2501..43f8d68482 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml @@ -12,7 +12,7 @@ - type: Marker - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: ConditionalSpawner placement: mode: AlignTileAny diff --git a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml index ad74ee4f86..66c9fa0352 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml @@ -5,7 +5,7 @@ - type: Marker - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: Sprite netsync: false visible: false diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml index 18543063af..897cd496e7 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml @@ -13,7 +13,7 @@ - type: Marker - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics placement: mode: AlignTileAny diff --git a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml index 7972f70cc3..8dafb70910 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml @@ -12,7 +12,7 @@ - type: Marker - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: TimedSpawner placement: mode: AlignTileAny diff --git a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml index f16fa7b6c1..96e9b06f2a 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml @@ -11,7 +11,7 @@ - type: Marker - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: TrashSpawner rarePrototypes: - CarvingHelpMe @@ -48,7 +48,7 @@ - type: Marker - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: TrashSpawner prototypes: - ToyAi diff --git a/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml index c6b389d157..e521e6af69 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml @@ -11,7 +11,7 @@ - type: Marker - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics - type: TrashSpawner rarePrototypes: - PuddleVomit diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index ff43d839d0..1cee22ec48 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -25,7 +25,7 @@ state: monkey sprite: Mobs/Animals/monkey.rsi - type: Clickable - - type: Collidable + - type: Physics anchored: false mass: 50 shapes: @@ -77,7 +77,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: crawling sprite: Mobs/Animals/gorilla.rsi - - type: Collidable + - type: Physics anchored: false mass: 90 shapes: @@ -112,7 +112,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: chicken-0 sprite: Mobs/Animals/chicken.rsi - - type: Collidable + - type: Physics anchored: false mass: 20 shapes: @@ -150,7 +150,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: butterfly sprite: Mobs/Animals/butterfly.rsi - - type: Collidable + - type: Physics anchored: false mass: 5 shapes: @@ -198,7 +198,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: bat sprite: Mobs/Animals/bat.rsi - - type: Collidable + - type: Physics anchored: false mass: 5 shapes: @@ -237,7 +237,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: 0 sprite: Mobs/Animals/bee.rsi - - type: Collidable + - type: Physics anchored: false mass: 5 shapes: @@ -272,7 +272,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goat sprite: Mobs/Animals/goat.rsi - - type: Collidable + - type: Physics anchored: false mass: 20 shapes: @@ -308,7 +308,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goose sprite: Mobs/Animals/goose.rsi - - type: Collidable + - type: Physics anchored: false mass: 20 shapes: @@ -347,7 +347,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: parrot sprite: Mobs/Animals/parrot.rsi - - type: Collidable + - type: Physics anchored: false mass: 20 shapes: @@ -382,7 +382,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: snake sprite: Mobs/Animals/snake.rsi - - type: Collidable + - type: Physics anchored: false mass: 10 shapes: @@ -420,7 +420,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: tarantula sprite: Mobs/Animals/spider.rsi - - type: Collidable + - type: Physics anchored: false mass: 10 shapes: @@ -455,7 +455,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: crab sprite: Mobs/Animals/crab.rsi - - type: Collidable + - type: Physics anchored: false mass: 10 shapes: @@ -490,7 +490,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: penguin sprite: Mobs/Animals/penguin.rsi - - type: Collidable + - type: Physics anchored: false mass: 10 shapes: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 4e4647fe42..14183024ac 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -19,7 +19,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: carp sprite: Mobs/Aliens/Carps/carp_space.rsi - - type: Collidable + - type: Physics anchored: false mass: 50 shapes: @@ -68,7 +68,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: magicarp sprite: Mobs/Aliens/Carps/carp_magic.rsi - - type: Collidable + - type: Physics mass: 60 - type: Appearance visuals: @@ -91,7 +91,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: holocarp sprite: Mobs/Aliens/Carps/carp_holo.rsi - - type: Collidable + - type: Physics mass: 5 - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml index 8e59056820..8a487abc24 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml @@ -23,7 +23,7 @@ - type: Icon sprite: Constructible/Power/VendingMachines/cola.rsi state: normal - - type: Collidable + - type: Physics anchored: false mass: 85 shapes: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index d3ca7ac812..9394671fa2 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -20,7 +20,7 @@ baseSprintSpeed : 5 - type: InteractionOutline - type: Clickable - - type: Collidable + - type: Physics anchored: false mass: 50 shapes: @@ -70,7 +70,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: corgi - - type: Collidable + - type: Physics mass: 10 shapes: - !type:PhysShapeAabb @@ -104,7 +104,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: ian - - type: Collidable + - type: Physics mass: 10 shapes: - !type:PhysShapeAabb @@ -138,7 +138,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cat - - type: Collidable + - type: Physics mass: 10 shapes: - !type:PhysShapeAabb @@ -173,7 +173,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: cat2 - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.50,-0.25,0.30,0.25" @@ -209,7 +209,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: sloth - - type: Collidable + - type: Physics mass: 10 shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 13b71e6116..7000e0c1fa 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -22,7 +22,7 @@ state: running sprite: Mobs/Aliens/Xenos/xeno_hunter.rsi - type: Clickable - - type: Collidable + - type: Physics anchored: false mass: 85 shapes: diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 26885f8a01..fe86c401a3 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -6,7 +6,7 @@ description: Boo! components: - type: Mind - - type: Collidable + - type: Physics anchored: false mass: 5 shapes: diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 86ae603d28..bf1005b501 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -115,7 +115,7 @@ sprite: Mobs/Customization/human_hair.rsi - map: [ "enum.Slots.MASK" ] - map: [ "enum.Slots.HEAD" ] - - type: Collidable + - type: Physics anchored: false mass: 85 shapes: @@ -281,7 +281,7 @@ - map: ["enum.Slots.HEAD"] - map: ["hand-left"] - map: ["hand-right"] - - type: Collidable + - type: Physics anchored: false mass: 85 shapes: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml index 98b4ae05a8..7fd021cf8f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml @@ -193,7 +193,7 @@ - type: Slippery intersectPercentage: 0.2 - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.2,-0.2,0.2,0.2" diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index be256a7896..58864fc217 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -76,7 +76,7 @@ map: ["enum.PDAVisualLayers.Flashlight"] - type: Slippery paralyzeTime: 4 - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.25,-0.25,0.25,0.25" diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index 1956b4ba29..b42e8868fd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -47,7 +47,7 @@ layers: - state: extinguish map: [ "enum.VaporVisualLayers.Base" ] - - type: Collidable + - type: Physics hard: false shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index b680effe4d..0047f8090f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -110,7 +110,7 @@ - state: floodlight_on shader: unshaded visible: false - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: @@ -148,7 +148,7 @@ spawnOnDestroy: SteelSheet1 destroySound: /Audio/Effects/metalbreak.ogg resistances: metallicResistances - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb layer: diff --git a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml index e7249c47b2..dd93b69d70 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml @@ -48,7 +48,7 @@ abstract: true description: "Portal to another location" components: - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb mask: [Impassable, MobImpassable] diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 5658391558..bf577d7475 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -3,7 +3,7 @@ abstract: true parent: BaseItem components: - - type: Collidable + - type: Physics anchored: false shapes: - !type:PhysShapeAabb @@ -106,7 +106,7 @@ - type: Anchorable - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 5 shapes: - !type:PhysShapeAabb @@ -134,7 +134,7 @@ - type: Anchorable - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 5 shapes: - !type:PhysShapeAabb @@ -161,7 +161,7 @@ - type: PowerChargerVisualizer - type: Clickable - type: InteractionOutline - - type: Collidable + - type: Physics mass: 5 shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml index 853f8708ec..c394e7e57c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml @@ -34,7 +34,7 @@ - type: SolutionContainer maxVol: 500 caps: AddTo, RemoveFrom - - type: Collidable + - type: Physics mass: 5 anchored: false shapes: @@ -66,7 +66,7 @@ - type: SolutionContainer maxVol: 500 caps: AddTo, RemoveFrom - - type: Collidable + - type: Physics mass: 5 anchored: false shapes: @@ -101,7 +101,7 @@ sprite: Objects/Specific/Janitorial/soap.rsi - type: Slippery paralyzeTime: 2.5 - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.3,-0.4,0.3,0.4" @@ -175,7 +175,7 @@ layers: - state: chempuff map: [ "enum.VaporVisualLayers.Base" ] - - type: Collidable + - type: Physics anchored: false hard: false shapes: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 1c71739ab5..1b8d1b6810 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -11,7 +11,7 @@ directional: false sprite: Objects/Weapons/Guns/Projectiles/bullet.rsi state: bullet - - type: Collidable + - type: Physics anchored: false edgeslide: false hard: false @@ -96,7 +96,7 @@ layers: - state: spark shader: unshaded - - type: Collidable + - type: Physics edgeslide: false hard: false shapes: diff --git a/Resources/Prototypes/Entities/item_base.yml b/Resources/Prototypes/Entities/item_base.yml index 63b68c5adc..4425aebf80 100644 --- a/Resources/Prototypes/Entities/item_base.yml +++ b/Resources/Prototypes/Entities/item_base.yml @@ -9,7 +9,7 @@ - type: InteractionOutline - type: MovedByPressure - type: DamageOnHighSpeedImpact - - type: Collidable + - type: Physics anchored: false mass: 5 shapes: diff --git a/Resources/Prototypes/Entities/puddle.yml b/Resources/Prototypes/Entities/puddle.yml index 53de374fc9..e14548bfd3 100644 --- a/Resources/Prototypes/Entities/puddle.yml +++ b/Resources/Prototypes/Entities/puddle.yml @@ -16,7 +16,7 @@ - type: InteractionOutline - type: Clickable - type: Slippery - - type: Collidable + - type: Physics shapes: - !type:PhysShapeAabb bounds: "-0.4,-0.4,0.4,0.4"