From 1a95418e94f695bb9c0a9f816ab97b0c56171bb9 Mon Sep 17 00:00:00 2001 From: Will-Oliver-Br <164823659+Will-Oliver-Br@users.noreply.github.com> Date: Mon, 14 Apr 2025 20:27:46 -0300 Subject: [PATCH] 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> --- .../Structures/Machines/chem_master.yml | 9 ++++++++- .../Structures/Machines/mixer.rsi/meta.json | 2 +- .../Machines/mixer.rsi/mixer_loaded.png | Bin 803 -> 189 bytes 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml index d78ed1182c..7578820bd8 100644 --- 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 5c3cd75b2c..5621dea1f9 100644 --- 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 GIT binary patch delta 161 zcmV;S0ABy22E750B!7fSL_t(og=1hC1*2f314d+y#rd!QVeAuz+>DsYsSj9?E%%k> zs({O!|N5UEj$nc@PQ3Zbz`(#@kH)7tK=tA7SMVrcIJ1v|p)!Il(EtJMEB+H!M18=7 z%xQh|e_QLD|K+W3{%@m~gHVGQ*;2X&|0oy*qhJ(_f>AIEMjF8=7(f636lx~h0{za7 P00000NkvXXu0mjfY?DjS delta 780 zcmV+n1M~d70iypHxJg7oR9HvFmobkLK@`W|DTG8K5F}Zn7~n!^NC<|8#1LsM?6$Bo zw$jj$oUt}uLSrf4z{Kk;>XnhL&$Nb6mlXt5iSzA;D5YfW)Jq3+1d5fU-I(y z?dkdkqEmhN4MLhbzoKlYYplBiB|E!7msOY6hMSPu~=j+auf;$Oe`+| zlRvz3ZHI;M?tjba?yo2J!0-1%yWOVuMxzn+W_Uav>SM7O42MH#G#VQPXf;qBOwiq@ z0fEID)9DmSr4rvbB7 zOqTPZdHH6c*7jJiq|@nWQ-D7jkH?|aYOz)^^ZDG`6n`LhU%!1%YzO^bN@aJ?kxgy| zO<6vlU%XP%EFwI6w3SRI7kmWVZZ~U?V=|dYjlf!is;X-n&*~KX69IZwN5JWHvb%E3 zW;5$GAYwcoTQXUs1sHwrB9lcp1-KWaQYjYMqgJcQ?*)4JW`xCvd^&Z2H@poehX>#z z{s-}E@qf`Fctc?bA1{~gXf%2`2a;?yOTC9AIs5(JjXNea(<6LaT=n z4jxMWs0a}h!7gnfN{(!7#8nXeU@)MuT>^ms^?#dIL!kitjH=ZtT~h6UOL#h+rl0X9 z0m35WXM5ZaRxOc87@Gb$#O(ip=~uvqkb^&1E|(2WpG@D^2-6xc0;dMSoetq|%U4Vz zY}LT(P;&4s`MRLTs0~Gmwq#QQdT_2q;GtEIZ2|1^QZN<(@EdM8iI@Hlm_`5q002ov KP6b4+LSTZzhF)+0 -- 2.51.2