diff --git a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs index e120a3e43e..b3a9927a38 100644 --- a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs @@ -101,26 +101,21 @@ namespace Content.Server.GameObjects.Components.Kitchen { if(_contents.ReagentList.Count > 0) { - DetermineRecipe(); - } - - } - - private void DetermineRecipe() - { - foreach (var r in _allRecipes) - { - if(CheckReagents(r)) + foreach (var r in _allRecipes) { - var outputFromRecipe = r.OutPutPrototype; - _entityManager.SpawnEntity(outputFromRecipe, Owner.Transform.GridPosition); - return; - } + if (CanSatisfyRecipe(r)) + { + var outputFromRecipe = r.OutPutPrototype; + _entityManager.SpawnEntity(outputFromRecipe, Owner.Transform.GridPosition); + return; + } + } } + } - private bool CheckReagents(MicrowaveMealRecipePrototype recipe) + private bool CanSatisfyRecipe(MicrowaveMealRecipePrototype recipe) { foreach(var ingredient in recipe.Ingredients) { diff --git a/Resources/Prototypes/Entities/kitchen.yml b/Resources/Prototypes/Entities/kitchen.yml index a3daf036b4..d7d9f9803b 100644 --- a/Resources/Prototypes/Entities/kitchen.yml +++ b/Resources/Prototypes/Entities/kitchen.yml @@ -18,13 +18,9 @@ IsScrapingFloor: true - type: Sprite netsync: false - sprite: Buildings/medical_scanner.rsi - layers: - - state: scanner_open - map: ["enum.MedicalScannerVisualLayers.Machine"] - - state: scanner_terminal_blue - map: ["enum.MedicalScannerVisualLayers.Terminal"] + sprite: Objects/Kitchen/microwave.rsi + state: mw0 - type: PowerDevice - type: Icon - sprite: Buildings/medical_scanner.rsi - state: scanner_open + sprite: Objects/Kitchen/microwave.rsi + state: mw0 diff --git a/Resources/Textures/Objects/Kitchen/microwave.dmi b/Resources/Textures/Objects/Kitchen/microwave.dmi new file mode 100644 index 0000000000..0b96c553c0 Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.dmi differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/meta.json b/Resources/Textures/Objects/Kitchen/microwave.rsi/meta.json new file mode 100644 index 0000000000..b03b51e24c --- /dev/null +++ b/Resources/Textures/Objects/Kitchen/microwave.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "AGPL v3", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris", "states": [{"name": "mw", "directions": 1, "delays": [[1.0]]}, {"name": "mw0", "directions": 1, "delays": [[1.0]]}, {"name": "mw1", "directions": 1, "delays": [[0.1, 0.1]]}, {"name": "mwb", "directions": 1, "delays": [[1.0]]}, {"name": "mwbloody", "directions": 1, "delays": [[1.0]]}, {"name": "mwbloody0", "directions": 1, "delays": [[1.0]]}, {"name": "mwbloody1", "directions": 1, "delays": [[0.1, 0.1]]}, {"name": "mwbloodyo", "directions": 1, "delays": [[0.1, 0.1]]}, {"name": "mwo", "directions": 1, "delays": [[0.1, 0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mw.png new file mode 100644 index 0000000000..88e285a134 Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mw.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw0.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mw0.png new file mode 100644 index 0000000000..da9b07a55b Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mw0.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mw1.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mw1.png new file mode 100644 index 0000000000..7525b08a80 Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mw1.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwb.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwb.png new file mode 100644 index 0000000000..fd933b346b Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwb.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody.png new file mode 100644 index 0000000000..3b144ce310 Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody0.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody0.png new file mode 100644 index 0000000000..3b144ce310 Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody0.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody1.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody1.png new file mode 100644 index 0000000000..c62ca8560a Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloody1.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloodyo.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloodyo.png new file mode 100644 index 0000000000..4d90ec33cc Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwbloodyo.png differ diff --git a/Resources/Textures/Objects/Kitchen/microwave.rsi/mwo.png b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwo.png new file mode 100644 index 0000000000..35ed2e9bae Binary files /dev/null and b/Resources/Textures/Objects/Kitchen/microwave.rsi/mwo.png differ