Adds snapgrid to a bunch of constructible entities. (#2445)

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

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

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

@@ -10,14 +10,23 @@
     sprite: Constructible/Misc/furniture.rsi
     state: rack
   - type: Physics
+    mass: 25
+    anchored: true
     shapes:
     - !type:PhysShapeAabb
+      bounds: "-0.4,-0.4,0.4,0.4"
       layer:
       - Opaque
       - Impassable
       - MobImpassable
       - VaultImpassable
       - SmallImpassable
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+  - type: Pullable
+  - type: Anchorable
   - type: Destructible
     deadThreshold: 30
     destroySound: /Audio/Effects/metalbreak.ogg
@@ -39,14 +48,23 @@
     sprite: Constructible/Misc/furniture.rsi
     state: shelf
   - type: Physics
+    mass: 25
+    anchored: true
     shapes:
     - !type:PhysShapeAabb
+      bounds: "-0.4,-0.4,0.4,0.4"
       layer:
       - Opaque
       - Impassable
       - MobImpassable
       - VaultImpassable
       - SmallImpassable
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+  - type: Pullable
+  - type: Anchorable
   - type: Destructible
     deadThreshold: 30
     destroySound: /Audio/Effects/metalbreak.ogg

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

@@ -2,6 +2,8 @@
   id: CloningPod
   name: Cloning Pod
   description: A Cloning Pod. 50% reliable.
+  placement:
+    mode: SnapgridCenter
   components:
     - type: Sprite
       netsync: false
@@ -10,7 +12,6 @@
         - state: pod_0
           map: ["enum.CloningPodVisualLayers.Machine"]
     - type: PowerReceiver
-
     - type: Anchorable
     - type: Clickable
     - type: InteractionOutline

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

@@ -1,25 +1,29 @@
 - type: entity
   id: ComputerFrame
   name: computer frame
+  placement:
+    mode: SnapgridCenter
   components:
     - type: Physics
       mass: 25
-      anchored: false
+      anchored: true
       shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
-          layer:
-            - Impassable
-            - MobImpassable
-            - VaultImpassable
-            - Opaque
-          mask:
-            - Impassable
-            - MobImpassable
-            - VaultImpassable
+      - !type:PhysShapeAabb
+        bounds: "-0.5,-0.25,0.5,0.25"
+        layer:
+        - Impassable
+        - MobImpassable
+        - VaultImpassable
+        - Opaque
+        mask:
+        - Impassable
+        - MobImpassable
+        - VaultImpassable
     - type: Clickable
     - type: InteractionOutline
     - type: Anchorable
+    - type: Rotatable
+    - type: Pullable
     - type: Construction
       graph: computer
       node: frameUnsecured
@@ -33,21 +37,21 @@
   description: This computer has seen better days.
   abstract: true # We don't want this to show up in the entity spawner menu.
   components:
-    - type: Physics
-      mass: 25
-      anchored: true
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
-          layer:
-            - Impassable
-            - MobImpassable
-            - VaultImpassable
-            - Opaque
-          mask:
-            - Impassable
-            - MobImpassable
-            - VaultImpassable
+  - type: Physics
+    mass: 25
+    anchored: true
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5,-0.25,0.5,0.25"
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - Opaque
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
     - type: Clickable
     - type: InteractionOutline
     - type: Anchorable
@@ -62,12 +66,15 @@
   id: ComputerBase
   name: computer
   abstract: true
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Clickable
   - type: InteractionOutline
   - type: Construction
     graph: computer
     node: computer
+  - type: Rotatable
   - type: Physics
     mass: 25
     anchored: true
@@ -86,9 +93,9 @@
   - type: Computer
   - type: PowerReceiver
   - type: Anchorable
+  - type: Pullable
   - type: BreakableConstruction
     node: monitorBroken
-
   - type: Sprite
     sprite: Constructible/Power/computers.rsi
     layers:
@@ -102,14 +109,12 @@
     - state: generic_key
       shader: unshaded
       map: ["enum.ComputerVisualizer+Layers.KeyboardOn"]
-
   - type: Appearance
     visuals:
     - type: ComputerVisualizer
       key: generic_key
       screen: generic
 
-
 - type: entity
   id: ComputerAlert
   parent: ComputerBase
@@ -122,7 +127,6 @@
       key: atmos_key
       screen: "alert-2"
 
-
 - type: entity
   id: ComputerPowerMonitoring
   parent: ComputerBase
@@ -135,7 +139,6 @@
       key: power_key
       screen: power_monitor
 
-
 - type: entity
   id: ComputerSupplyOrdering
   parent: ComputerBase
@@ -199,7 +202,6 @@
       key: med_key
       screen: medcomp
 
-
 - type: entity
   id: ComputerResearchAndDevelopment
   parent: ComputerBase

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

@@ -2,6 +2,8 @@
   id: BaseLathe
   name: "lathe"
   abstract: true
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -10,7 +12,12 @@
     anchored: true
     shapes:
     - !type:PhysShapeAabb
-      bounds: "-0.4,-0.25,0.4,0.25"
+      bounds: "-0.4,-0.4,0.4,0.4"
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
       layer:
       - Opaque
       - Impassable
@@ -21,6 +28,7 @@
   - type: Lathe
   - type: MaterialStorage
   - type: Anchorable
+  - type: Pullable
   - type: UserInterface
     interfaces:
     - key: enum.LatheUiKey.Key
@@ -41,18 +49,6 @@
     - state: autolathe_unlit
       shader: unshaded
       map: ["enum.AutolatheVisualLayers.BaseUnlit"]
-
-  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-  - type: SnapGrid
-    offset: Center
-  - type: Lathe
   - type: LatheDatabase
     static: true
     recipes:
@@ -89,17 +85,6 @@
       map: ["enum.ProtolatheVisualLayers.BaseUnlit"]
     - state: protolathe
       map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
-
-  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-  - type: SnapGrid
-    offset: Center
   - type: ResearchClient
   - type: TechnologyDatabase
   - type: ProtolatheDatabase

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

@@ -2,6 +2,8 @@
   id: VendingMachine
   name: vending machine
   abstract: true
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Clickable
   - type: InteractionOutline

Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml

@@ -9,8 +9,6 @@
     state: booze_dispenser
   - type: ReagentDispenser
     pack: BoozeDispenserInventory
-  - type: Anchorable
-  - type: Pullable
 
 - type: reagentDispenserInventory
   id: BoozeDispenserInventory

Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml

@@ -13,8 +13,6 @@
   - type: ReagentDispenser
     pack: ChemDispenserStandardInventory
   - type: PowerReceiver
-  - type: Anchorable
-  - type: Pullable
 
 - type: reagentDispenserInventory
   id: ChemDispenserStandardInventory

Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml

@@ -1,16 +1,22 @@
 - type: entity
   abstract: true
   id: ReagentDispenserBase
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Clickable
   - type: InteractionOutline
-  - type: Anchorable
   - type: Physics
     mass: 25
     anchored: true
     shapes:
     - !type:PhysShapeAabb
-      bounds: "-0.4,-0.25,0.4,0.25"
+      bounds: "-0.3,-0.4,0.3,0.4"
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
       layer:
       - Opaque
       - Impassable
@@ -25,4 +31,5 @@
     - key: enum.ReagentDispenserUiKey.Key
       type: ReagentDispenserBoundUserInterface
   - type: LoopingSound
-
+  - type: Anchorable
+  - type: Pullable

Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml

@@ -9,8 +9,6 @@
     state: soda_dispenser
   - type: ReagentDispenser
     pack: SodaDispenserInventory
-  - type: Anchorable
-  - type: Pullable
 
 - type: reagentDispenserInventory
   id: SodaDispenserInventory

Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml

@@ -8,11 +8,20 @@
   - type: InteractionOutline
   - type: Clickable
   - type: Physics
+    mass: 25
     anchored: true
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer: [MobMask, Opaque]
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - Opaque
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
   - type: SnapGrid
     offset: Center
   - type: Sprite
@@ -35,6 +44,8 @@
   - type: Anchorable
   - type: Pullable
   - type: Appearance
+#  - type: Rotatable
+# Idk why but the emitter breaks when I apply this.
     visuals:
     - type: EmitterVisualizer
   - type: AccessReader

Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml

@@ -2,6 +2,8 @@
   id: ResearchAndDevelopmentServer
   name: "R&D server"
   description: 'Thats a R&D server.'
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Sprite
     sprite: Constructible/Power/server.rsi
@@ -37,6 +39,8 @@
 - type: entity
   id: BaseResearchAndDevelopmentPointSource
   name: "base R&D point source"
+  placement:
+    mode: SnapgridCenter
   # We should make this abstract once there are actual point sources.
   components:
   - type: Sprite

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

@@ -2,6 +2,8 @@
   id: chem_master
   name: ChemMaster 4000
   description: An industrial grade chemical manipulator with pill and bottle production included.
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Sprite
     sprite: Constructible/Power/mixer.rsi
@@ -46,6 +48,7 @@
   id: chem_master_broken
   name: ChemMaster 4000 [Broken]
   description: A broken industrial grade chemical manipulator.
+  abstract: true
   components:
   - type: Sprite
     sprite: Constructible/Power/mixer.rsi