Updates a bunch of entities physics yaml. (#2404)

* Initial

* Reverts firelocks

Resources/Prototypes/Entities/Constructible/Furniture/beds.yml

@@ -6,6 +6,21 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    mass: 25
+    anchored: true
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.3, 0.5"
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: Sprite
     sprite: Constructible/Misc/furniture.rsi
     state: bed

Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml

@@ -7,7 +7,7 @@
   components:
   - type: Clickable
   - type: Sprite
-    drawdepth: FloorTiles
+    drawdepth: BelowFloor
   - type: Icon
     state: full
   - type: SnapGrid

Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml

@@ -5,9 +5,25 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    mass: 25
+    anchored: true
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.2, 0.5, 0.2"
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: Sprite
     sprite: Constructible/Misc/potted_plants.rsi
   - type: PottedPlantHide
+  - type: Anchorable
   - type: Pullable
 
 - type: entity

Resources/Prototypes/Entities/Constructible/Power/power_base.yml

@@ -9,10 +9,21 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    mass: 25
+    anchored: false
     shapes:
     - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.3, 0.5"
+      bounds: "-0.5, -0.4, 0.3, 0.4"
-      layer: [MobMask, Opaque]
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: SnapGrid
     offset: Center
   - type: Sprite
@@ -25,6 +36,7 @@
   - type: PowerSupplier
     supplyRate: 3000
   - type: Anchorable
+  - type: Pullable
 
 - type: entity
   id: BaseSmes
@@ -37,10 +49,20 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    mass: 25
+    anchored: true
     shapes:
     - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+      mask:
-      layer: [MobMask, Opaque]
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: SnapGrid
     offset: Center
   - type: Sprite
@@ -68,6 +90,7 @@
   - type: BatteryDischarger
     activeSupplyRate: 1000
   - type: Anchorable
+  - type: Pullable
 
 - type: entity
   id: BaseSubstation
@@ -80,10 +103,20 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    mass: 25
+    anchored: true
     shapes:
     - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+      mask:
-      layer: [MobMask, Opaque]
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: SnapGrid
     offset: Center
   - type: Sprite
@@ -106,6 +139,7 @@
   - type: BatteryDischarger
     activeSupplyRate: 1000
   - type: Anchorable
+  - type: Pullable
 
 - type: entity
   id: BaseApc
@@ -163,9 +197,20 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    mass: 25
+    anchored: false
     shapes:
     - !type:PhysShapeAabb
-      layer: [MobMask, Opaque]
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: Sprite
     sprite: Constructible/Power/solar_panel.rsi
     state: normal
@@ -181,3 +226,5 @@
   - type: Breakable
     deadThreshold: 100
     resistances: metallicResistances
+  - type: Anchorable
+  - type: Pullable

Resources/Prototypes/Entities/Constructible/Power/research.yml

@@ -9,6 +9,20 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    mass: 25
+    anchored: true
+    shapes:
+    - !type:PhysShapeAabb
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: SnapGrid
     offset: Center
   - type: ResearchServer
@@ -16,6 +30,8 @@
   - type: PowerReceiver
     powerLoad: 200
     priority: Low
+  - type: Pullable
+  - type: Anchorable
 
 - type: entity
   id: BaseResearchAndDevelopmentPointSource
@@ -36,9 +52,13 @@
     anchored: true
     shapes:
     - !type:PhysShapeAabb
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
       layer:
       - Opaque
-      - Impassable
       - MobImpassable
       - VaultImpassable
       - SmallImpassable
@@ -55,4 +75,5 @@
     visuals:
     - type: PowerDeviceVisualizer
   - type: PowerReceiver
+  - type: Pullable
   - type: Anchorable

Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml

@@ -7,14 +7,22 @@
     - type: Clickable
     - type: InteractionOutline
     - type: Physics
+      mass: 25
       anchored: true
       hard: false
       shapes:
-        - !type:PhysShapeAabb
+      - !type:PhysShapeAabb
-          mask:
+        bounds: "-0.5, -0.5, 0.1, 0.5"
-            - Impassable
+        mask:
-            - MobImpassable
+        - Impassable
-            - VaultImpassable
+        - MobImpassable
+        - VaultImpassable
+        - SmallImpassable
+        layer:
+        - Opaque
+        - MobImpassable
+        - VaultImpassable
+        - SmallImpassable
     - type: Destructible
       deadThreshold: 50
       resistances: metallicResistances
@@ -38,6 +46,9 @@
   parent: hydroponicsSoil
   id: hydroponicsTray
   components:
+    - type: Physics
+      mass: 25
+      hard: true
     - type: Anchorable
       snap: true
     - type: Sprite

Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml

@@ -25,7 +25,6 @@
     drawdepth: WallTops
     sprite: Constructible/Misc/sylphs.rsi
     state: sylph
-
   - type: PowerReceiver
   - type: BarSign
 
@@ -44,3 +43,5 @@
   components:
   - type: BarSign
     current: CyberSylph
+  - type: Sprite
+    drawdepth: Ghosts

Resources/Prototypes/Entities/Constructible/Walls/girder.yml

@@ -13,9 +13,21 @@
     sprite: Constructible/Structures/Walls/solid.rsi
     state: wall_girder
   - type: Physics
+    mass: 25
+    anchored: true
     shapes:
     - !type:PhysShapeAabb
-      layer: [MobMask, Opaque]
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+  - type: Pullable
   - type: Destructible
     deadThreshold: 50
     resistances: metallicResistances

Resources/Prototypes/Entities/Objects/tiles.yml

@@ -7,7 +7,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_steel
-
   - type: FloorTile
     output: floor_steel
   - type: Stack
@@ -24,23 +23,6 @@
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_steel
 
-- type: entity
-  name: carpet floor tile
-  parent: FloorTileItemBase
-  id: FloorTileItemCarpet
-  components:
-  - type: Sprite
-    sprite: Objects/Tiles/tile.rsi
-    state: tile_carpet
-
-  - type: Item
-    sprite: Objects/Tiles/tile.rsi
-    HeldPrefix: tile_carpet
-  - type: FloorTile
-    output: floor_carpet
-  - type: Stack
-    stacktype: FloorTileCarpet
-
 - type: entity
   name: wood floor tile
   parent: FloorTileItemBase
@@ -49,7 +31,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_wood
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_wood
@@ -68,7 +49,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_white
@@ -87,7 +67,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_dark
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_dark
@@ -106,7 +85,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_dark_techfloor_grid
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_dark
@@ -121,7 +99,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_showroom
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_showroom
@@ -136,7 +113,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_showroom
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_showroom
@@ -151,7 +127,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_snow
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_silver
@@ -166,7 +141,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_gcircuit
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_silver
@@ -181,7 +155,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_gold
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_gold
@@ -196,7 +169,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_reinforced
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_reinforced
@@ -211,7 +183,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_rockvault
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_steel
@@ -226,7 +197,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white_monofloor
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_steel
@@ -241,7 +211,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white_monofloor
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_steel
@@ -256,7 +225,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_white
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_brown
@@ -271,7 +239,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_hydro
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_hydro
@@ -286,7 +253,6 @@
   - type: Sprite
     sprite: Objects/Tiles/tile.rsi
     state: tile_dirty
-
   - type: Item
     sprite: Objects/Tiles/tile.rsi
     HeldPrefix: tile_brown