Cryo and grinder cleanup (#34842)

* cryopod and grinder cleanup

* lower case name

* 4 spaces

* prototype clean

* looks like there is some kind of test that prevents removing this

* grinder too

* both should be empty

* cleanup
This commit is contained in:
Łukasz Lindert
2025-03-12 23:44:05 +01:00
committed by GitHub
parent 9005183e6e
commit 8f81e55711
15 changed files with 29 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -16,7 +16,7 @@ public sealed partial class CryoPodComponent : Component
public string PortName { get; set; } = "port"; public string PortName { get; set; } = "port";
/// <summary> /// <summary>
/// Specifies the name of the atmospherics port to draw gas from. /// Specifies the name of the slot that holds beaker with medicine.
/// </summary> /// </summary>
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("solutionContainerName")] [DataField("solutionContainerName")]

View File

@@ -12,15 +12,15 @@
id: DummyGrind id: DummyGrind
verbText: mixing-verb-default-grind verbText: mixing-verb-default-grind
icon: icon:
sprite: Structures/Machines/juicer.rsi sprite: Structures/Machines/grinder.rsi
state: juicer0 state: grinder_empty
- type: mixingCategory - type: mixingCategory
id: DummyJuice id: DummyJuice
verbText: mixing-verb-default-juice verbText: mixing-verb-default-juice
icon: icon:
sprite: Structures/Machines/juicer.rsi sprite: Structures/Machines/grinder.rsi
state: juicer0 state: grinder_empty
- type: mixingCategory - type: mixingCategory
id: DummyCondense id: DummyCondense

View File

@@ -1,11 +1,11 @@
- type: entity - type: entity
parent: [BaseStructure, ConstructibleMachine] # Not a BaseMachinePowered since we don't want the anchorable component parent: [BaseStructure, ConstructibleMachine] # Not a BaseMachinePowered since we don't want the anchorable component
id: CryoPod id: CryoPod
name: cryo pod name: cryo pod
description: A special machine intended to create a safe environment for the use of chemicals that react in cold environments. description: A special machine intended to create a safe environment for the use of chemicals that react in cold environments.
components: components:
- type: Sprite - type: Sprite
sprite: Structures/Machines/cryogenics.rsi sprite: Structures/Machines/Medical/cryopod.rsi
drawdepth: Mobs drawdepth: Mobs
noRot: true noRot: true
offset: 0, 0.5 offset: 0, 0.5

View File

@@ -5,8 +5,6 @@
description: From BlenderTech. Will It Blend? Let's find out! description: From BlenderTech. Will It Blend? Let's find out!
suffix: grinder/juicer suffix: grinder/juicer
components: components:
- type: Transform
anchored: true
- type: ReagentGrinder - type: ReagentGrinder
- type: ActivatableUI - type: ActivatableUI
key: enum.ReagentGrinderUiKey.Key key: enum.ReagentGrinderUiKey.Key
@@ -19,8 +17,8 @@
visuals: visuals:
enum.ReagentGrinderVisualState.BeakerAttached: enum.ReagentGrinderVisualState.BeakerAttached:
grinder: grinder:
True: {state: "juicer1"} True: {state: "grinder_beaker_attached"}
False: {state: "juicer0"} False: {state: "grinder_empty"}
- type: Physics - type: Physics
- type: Fixtures - type: Fixtures
fixtures: fixtures:
@@ -33,13 +31,13 @@
layer: layer:
- TabletopMachineLayer - TabletopMachineLayer
- type: Sprite - type: Sprite
sprite: Structures/Machines/juicer.rsi sprite: Structures/Machines/grinder.rsi
drawdepth: SmallObjects drawdepth: SmallObjects
snapCardinals: true snapCardinals: true
offset: "0.0,0.4" offset: "0.0,0.4"
layers: layers:
- map: [ "grinder" ] - map: [ "grinder" ]
state: "juicer0" state: "grinder_empty"
- type: ApcPowerReceiver - type: ApcPowerReceiver
powerLoad: 300 powerLoad: 300
- type: ItemSlots - type: ItemSlots

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

View File

@@ -0,0 +1,17 @@
{
"license":"CC-BY-SA-3.0",
"copyright":"https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d",
"version":1,
"size":{
"x":32,
"y":32
},
"states":[
{
"name":"grinder_empty"
},
{
"name":"grinder_beaker_attached"
}
]
}

View File

@@ -1 +0,0 @@
{"license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d","version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "juicer0", "delays": [[1.0]]}, {"name": "juicer1", "delays": [[1.0]]}]}