hotplate, kitcken grille bugfixes (#34776)

* commit

* cleanup

diff --git a/Resources/Prototypes/Entities/Structures/Machines/grill.yml b/Resources/Prototypes/Entities/Structures/Machines/grill.yml
index 9c4c67b95114658bf1418d567f21bf4f1cac42ed..f9e482f6747de29dd90571ca674f446448eec872 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/grill.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/grill.yml
@@ -17,7 +17,7 @@
   - type: ApcPowerReceiver
     powerLoad: 0 # off by default
   - type: EntityHeater
-    settingSound: 
+    settingSound:
       path: /Audio/Weapons/click.ogg
       params:
         volume: -6
@@ -29,6 +29,7 @@
   - type: PlaceableSurface
   - type: Machine
     board: ElectricGrillMachineCircuitboard
+  - type: Appearance
   - type: GenericVisualizer
     visuals:
       enum.EntityHeaterVisuals.Setting:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
index 3764f13591562f42eb8f212564a7f51250150ccc..5ef0deb154874b36101cb517ebe5d8ddfea7ccba 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
@@ -1,31 +1,29 @@
 # heats an entity or solution placed on it
 - type: entity
   abstract: true
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   id: BaseHeaterMachine
   components:
-  - type: Transform
-    anchored: true
+  - type: ItemPlacer
   - type: Fixtures
     fixtures:
+      itemcollide:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.14,-0.05,0.15,0.25"
+        layer:
+        - HighImpassable
+        hard: false
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.08,-0.35,0.15,0.25"
+          bounds: "-0.14,-0.05,0.15,0.25"
         mask:
         - TabletopMachineMask
         layer:
-        - Impassable
-        - MidImpassable
-        - LowImpassable
-        hard: false
+        - TabletopMachineLayer
   - type: ApcPowerReceiver
     powerLoad: 300
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      machine_board: !type:Container
-      machine_parts: !type:Container
 
 - type: entity
   parent: BaseHeaterMachine
@@ -53,6 +51,7 @@
     positionOffset: 0, 0.25
   - type: Machine
     board: HotplateMachineCircuitboard
+  - type: Appearance
   - type: GenericVisualizer
     visuals:
       enum.SolutionHeaterVisuals.IsOn: