From 4acb92791a44ce6c66f79291c8092b1fb97625d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C4=81da?= Date: Mon, 21 Apr 2025 10:38:23 -0500 Subject: [PATCH] hotplate, kitcken grille bugfixes (#34776) * commit * cleanup --- .../Entities/Structures/Machines/grill.yml | 3 ++- .../Entities/Structures/Machines/hotplate.yml | 25 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/grill.yml b/Resources/Prototypes/Entities/Structures/Machines/grill.yml index 9c4c67b951..f9e482f674 100644 --- 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 3764f13591..5ef0deb154 100644 --- 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: -- 2.51.2