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

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

diff --git a/Resources/Prototypes/Chemistry/mixing_types.yml b/Resources/Prototypes/Chemistry/mixing_types.yml
index fd73256410830c929a2237ad78cdb30a072734e3..86239fce069cf45b129fc555fed0e412515d929a 100644 (file)
--- a/Resources/Prototypes/Chemistry/mixing_types.yml
+++ b/Resources/Prototypes/Chemistry/mixing_types.yml
@@ -12,15 +12,15 @@
   id: DummyGrind
   verbText: mixing-verb-default-grind
   icon:
-    sprite: Structures/Machines/juicer.rsi
-    state: juicer0
+    sprite: Structures/Machines/grinder.rsi
+    state: grinder_empty
 
 - type: mixingCategory
   id: DummyJuice
   verbText: mixing-verb-default-juice
   icon:
-    sprite: Structures/Machines/juicer.rsi
-    state: juicer0
+    sprite: Structures/Machines/grinder.rsi
+    state: grinder_empty
 
 - type: mixingCategory
   id: DummyCondense

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

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

diff --git a/Resources/Textures/Structures/Machines/cryogenics.rsi/cover-off.png b/Resources/Textures/Structures/Machines/Medical/cryopod.rsi/cover-off.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/cryogenics.rsi/cover-off.png
rename to Resources/Textures/Structures/Machines/Medical/cryopod.rsi/cover-off.png

diff --git a/Resources/Textures/Structures/Machines/cryogenics.rsi/cover-on.png b/Resources/Textures/Structures/Machines/Medical/cryopod.rsi/cover-on.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/cryogenics.rsi/cover-on.png
rename to Resources/Textures/Structures/Machines/Medical/cryopod.rsi/cover-on.png

diff --git a/Resources/Textures/Structures/Machines/cryogenics.rsi/meta.json b/Resources/Textures/Structures/Machines/Medical/cryopod.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Structures/Machines/cryogenics.rsi/meta.json
rename to Resources/Textures/Structures/Machines/Medical/cryopod.rsi/meta.json

diff --git a/Resources/Textures/Structures/Machines/cryogenics.rsi/pod-off.png b/Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-off.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/cryogenics.rsi/pod-off.png
rename to Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-off.png

diff --git a/Resources/Textures/Structures/Machines/cryogenics.rsi/pod-on.png b/Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-on.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/cryogenics.rsi/pod-on.png
rename to Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-on.png

diff --git a/Resources/Textures/Structures/Machines/cryogenics.rsi/pod-open.png b/Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-open.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/cryogenics.rsi/pod-open.png
rename to Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-open.png

diff --git a/Resources/Textures/Structures/Machines/cryogenics.rsi/pod-panel.png b/Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-panel.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/cryogenics.rsi/pod-panel.png
rename to Resources/Textures/Structures/Machines/Medical/cryopod.rsi/pod-panel.png

diff --git a/Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png b/Resources/Textures/Structures/Machines/grinder.rsi/grinder_beaker_attached.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png
rename to Resources/Textures/Structures/Machines/grinder.rsi/grinder_beaker_attached.png

diff --git a/Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png b/Resources/Textures/Structures/Machines/grinder.rsi/grinder_empty.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png
rename to Resources/Textures/Structures/Machines/grinder.rsi/grinder_empty.png

diff --git a/Resources/Textures/Structures/Machines/grinder.rsi/meta.json b/Resources/Textures/Structures/Machines/grinder.rsi/meta.json
new file mode 100644 (file)
index 0000000..9b9ed1d
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/grinder.rsi/meta.json
@@ -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"
+        }
+    ]
+}
\ No newline at end of file

diff --git a/Resources/Textures/Structures/Machines/juicer.rsi/meta.json b/Resources/Textures/Structures/Machines/juicer.rsi/meta.json
deleted file mode 100644 (file)
index 6048f25..0000000
--- a/Resources/Textures/Structures/Machines/juicer.rsi/meta.json
+++ /dev/null
@@ -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]]}]}