diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png index d475325657..783cf8af95 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png index 1bcfc8675b..75081085a9 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json index f5374af616..b34b3c2a11 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, off.png taken from /tg/station commit ede31369cfa5ea1bed9262b5ef4bbef85f60fe26 and edited by @Flareguy", "size": { "x": 32, "y": 32 @@ -10,18 +10,26 @@ { "name": "broken" }, + { + "name": "panel" + }, { "name": "deny-unshaded", "delays": [ [ - 0.1, 0.1, 0.1 ] ] }, { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 0.1, + 0.1 + ] + ] }, { "name": "off" diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png index cc142068da..c94e7ba266 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png index 18ab63da21..fb933b8612 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png new file mode 100644 index 0000000000..851c8b7893 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave.rsi/meta.json index 8028ee6ac1..34142b73ef 100644 --- a/Resources/Textures/Structures/Machines/microwave.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/microwave.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", + "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14", "states": [ { "name": "mw" @@ -17,13 +17,7 @@ "name": "mw0" }, { - "name": "mw_running_unlit", - "delays": [ - [ - 1.0, - 1.0 - ] - ] + "name": "mw_running_unlit" }, { "name": "mwb" @@ -35,31 +29,13 @@ "name": "mwbloody0" }, { - "name": "mwbloody1", - "delays": [ - [ - 0.1, - 0.1 - ] - ] + "name": "mwbloody1" }, { - "name": "mwbloodyo", - "delays": [ - [ - 0.1, - 0.1 - ] - ] + "name": "mwbloodyo" }, { - "name": "mwo", - "delays": [ - [ - 0.1, - 0.1 - ] - ] + "name": "mwo" } - ] -} \ No newline at end of file + ] + } \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw.png index 88e285a134..5b661378ca 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png index da9b07a55b..d1ca3eb19c 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png index d259712b6d..8571824e7c 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png index 4ad790b4e8..11e691d031 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png index fd933b346b..d0f9885c9c 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png index 3b144ce310..5ec61e55bb 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png index 3b144ce310..3bd4401547 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png index c62ca8560a..8136ad7a96 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png index 4d90ec33cc..9960164562 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png index 35ed2e9bae..55f6617617 100644 Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png differ