Now you can see if there's a beaker in the chemmaster (#36472)

* fix

* fix

* Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index d78ed1182cd725a8cb84c89d7630e456f7969223..7578820bd81b037e2fc4c455a86a8f69e40a5793 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -16,7 +16,14 @@
       map: ["enum.PowerDeviceVisualLayers.Powered"]
   - type: Icon
     sprite: Structures/Machines/mixer.rsi
-    state: mixer_loaded
+    state: mixer_empty
+  - type: ItemMapper
+    containerWhitelist: [beakerSlot]
+    mapLayers:
+      mixer_loaded:
+        whitelist:
+          components:
+          - FitsInDispenser
   - type: ChemMaster
     pillDosageLimit: 20
   - type: Physics

diff --git a/Resources/Textures/Structures/Machines/mixer.rsi/meta.json b/Resources/Textures/Structures/Machines/mixer.rsi/meta.json
index 5c3cd75b2c5f1836cd1ba27f7d895c4c41814bff..5621dea1f9382e095b637ddd2900bfbc6026d960 100644 (file)
--- a/Resources/Textures/Structures/Machines/mixer.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/mixer.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi and modified by Will-Oliver-Br",
   "states": [
     {
       "name": "mixer_empty",

diff --git a/Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png
index abef17b1d508988218a91a1a9aeba76189988b0a..e5312e7f97f39b2d084a161ea28a51087cfff0dc 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png and b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png differ