From 661ac975f11671b8d7430d7d4356b20a9ed4b197 Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 13 Jan 2018 09:58:42 -0200 Subject: [PATCH 1/2] Merge pull request #34346 from AutomaticFrenzy/patch/slot-machine-icon Fix slot machine design icon --- code/modules/client/asset_cache.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 8825ce0933..f1eba2dac4 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -397,6 +397,7 @@ GLOBAL_LIST_EMPTY(asset_datums) if (machine) item = machine var/icon_file = initial(item.icon) + var/all_states = icon_states(icon_file) var/icon/I = icon(icon_file, initial(item.icon_state), SOUTH) // computers (and snowflakes) get their screen and keyboard sprites @@ -404,9 +405,9 @@ GLOBAL_LIST_EMPTY(asset_datums) var/obj/machinery/computer/C = item var/screen = initial(C.icon_screen) var/keyboard = initial(C.icon_keyboard) - if (screen) + if (screen && (screen in all_states)) I.Blend(icon(icon_file, screen, SOUTH), ICON_OVERLAY) - if (keyboard) + if (keyboard && (keyboard in all_states)) I.Blend(icon(icon_file, keyboard, SOUTH), ICON_OVERLAY) assets["design_[initial(D.id)].png"] = I