Rename last usages of Collidable to Physics

2020-10-14 20:16:57 +02:00
parent bd6697b9bb
commit 41cbcc85e0
80 changed files with 473 additions and 475 deletions
--- 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
        /// </summary>
        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();
--- 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
--- 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
 ...
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
--- 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
--- 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
--- 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
+    mode: SnapgridCenter
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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
--- 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
+    - type: CrayonDecalVisualizer
--- 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
-    
--- 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
-    
--- 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:
--- 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
--- 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
--- 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

--- 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

--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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"
--- 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"
--- 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:
--- 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:
--- 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"
--- 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]
--- 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:
--- 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:
--- 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
--- 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
--- 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:
--- 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:
--- 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:
--- 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]
--- 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"
--- 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
--- 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]
--- 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
--- 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
--- 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:
--- 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:
--- 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"
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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:
--- 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
--- 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:
--- 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:
--- 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:
--- 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"
--- 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"
--- 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
--- 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:
--- 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]
--- 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
--- 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:
--- 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:
--- 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:
--- 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"