diff --git a/code/modules/asset_cache/assets/microwave.dm b/code/modules/asset_cache/assets/microwave.dm new file mode 100644 index 0000000000..2d006072a7 --- /dev/null +++ b/code/modules/asset_cache/assets/microwave.dm @@ -0,0 +1,5 @@ +/datum/asset/simple/microwave + assets = list( + "microwave.png" = 'icons/obj/microwave_ui/base.png', + "microwave.gif" = 'icons/obj/microwave_ui/microwave.gif', + ) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index d7bcdfbbeb..dfe89c1079 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -253,7 +253,8 @@ /obj/machinery/microwave/ui_assets(mob/user) return list( - get_asset_datum(/datum/asset/spritesheet_batched/kitchen_recipes) + get_asset_datum(/datum/asset/spritesheet_batched/kitchen_recipes), + get_asset_datum(/datum/asset/simple/microwave) ) /obj/machinery/microwave/tgui_static_data(mob/user) diff --git a/icons/obj/microwave_ui/base.png b/icons/obj/microwave_ui/base.png new file mode 100644 index 0000000000..9ca65b17e2 Binary files /dev/null and b/icons/obj/microwave_ui/base.png differ diff --git a/icons/obj/microwave_ui/microwave.gif b/icons/obj/microwave_ui/microwave.gif new file mode 100644 index 0000000000..5ac5e47873 Binary files /dev/null and b/icons/obj/microwave_ui/microwave.gif differ diff --git a/tgui/packages/tgui/interfaces/Microwave.tsx b/tgui/packages/tgui/interfaces/Microwave.tsx index 29ae6f3436..43384acead 100644 --- a/tgui/packages/tgui/interfaces/Microwave.tsx +++ b/tgui/packages/tgui/interfaces/Microwave.tsx @@ -1,9 +1,12 @@ +import { resolveAsset } from 'tgui/assets'; import { useBackend } from 'tgui/backend'; import { Window } from 'tgui/layouts'; import { Box, Button, DmIcon, + Icon, + Image, Section, Stack, Tooltip, @@ -44,30 +47,78 @@ export const Microwave = (props) => { let inner; + const first_item = items[0] || null; + if (broken) { inner = (
- Bzzzzttttt!! + + + + Bzzzzttttt!! + + + + + + + + + + + + + + + +
); } else if (operating) { inner = (
- - Microwaving in progress! -
- Please wait...! -
+ + + + + {first_item ? ( + + + + ) : null} + + + +
); } else if (dirty) { inner = ( -
- - This microwave is dirty! -
- Please clean it before use! -
+
+ + + + This microwave is dirty! +
+ Please clean it before use! +
+
+
); } else if (items.length) { @@ -75,14 +126,20 @@ export const Microwave = (props) => { } else { inner = (
- {config.title} is empty. + + + + {config.title} is empty. + + +
); } return ( - {inner} + {inner} ); }; @@ -96,6 +153,7 @@ const MicrowaveContents = (props) => {
@@ -201,6 +259,10 @@ const MicrowaveContents = (props) => { ml="16px" mt="16px" className={classes(['kitchen_recipes32x32', recipe])} + style={{ + transform: 'scale(3)', + imageRendering: 'pixelated', + }} /> ) : (