diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 41b2f538322..783ce41a372 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -312,4 +312,4 @@ var/global/list/radial_menus = list() radial_menus -= uniqueid return answer -#define RADIAL_INPUT(user, choices) show_radial_menu(user, user, choices) +#define RADIAL_INPUT(user, choices) show_radial_menu(user, user, choices, tooltips = TRUE) diff --git a/code/game/machinery/kitchen/cooking_machines/_appliance.dm b/code/game/machinery/kitchen/cooking_machines/_appliance.dm index 76d9d4faecb..802e8fd8e0f 100644 --- a/code/game/machinery/kitchen/cooking_machines/_appliance.dm +++ b/code/game/machinery/kitchen/cooking_machines/_appliance.dm @@ -535,18 +535,21 @@ /obj/machinery/appliance/proc/removal_menu(var/mob/user) if (can_remove_items(user)) + var/list/choices = list() var/list/menuoptions = list() for (var/a in cooking_objs) var/datum/cooking_item/CI = a - if (CI.container) + if(CI.container) menuoptions[CI.container.label(menuoptions.len)] = CI + choices[CI.container.label(menuoptions.len)] = image(CI.container.icon, icon_state = CI.container.icon_state) - var/selection = input(user, "Which item would you like to remove?", "Remove ingredients") as null|anything in menuoptions - if (selection) + var/selection = RADIAL_INPUT(user, choices) + if(selection) var/datum/cooking_item/CI = menuoptions[selection] - eject(CI, user) - update_icon() - return TRUE + if(Adjacent(user)) + eject(CI, user) + update_icon() + return TRUE return FALSE /obj/machinery/appliance/proc/can_remove_items(var/mob/user) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 92c54a83ca9..b8484e9221c 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -681,8 +681,6 @@ . = ..() color = color_rotation(rand(-11, 12) * 15) -//combitool - /obj/item/combitool name = "combi-tool" desc = "It even has one of those nubbins for doing the thingy." @@ -708,43 +706,42 @@ var/current_tool = 1 /obj/item/combitool/Initialize() - desc = "[initial(desc)] ([tools.len]. [tools.len] possibilit[tools.len == 1 ? "y" : "ies"])" + desc = "[initial(desc)] It has [tools.len] possibilit[tools.len == 1 ? "y" : "ies"]." + for(var/tool in tools) + tools[tool] = image('icons/obj/tools.dmi', icon_state = "[icon_state]-[tool]") . = ..() /obj/item/combitool/examine(var/mob/user) . = ..() if(. && tools.len) - to_chat(user, "It has the following fittings:") - for(var/tool in tools) - to_chat(user, "- [tool][tools[current_tool] == tool ? " (selected)" : ""]") + to_chat(user, "It has the following fittings: [english_list(tools)].") /obj/item/combitool/iswrench() - return tools[current_tool] == "wrench" + return current_tool == "wrench" /obj/item/combitool/isscrewdriver() - return tools[current_tool] == "screwdriver" + return current_tool == "screwdriver" /obj/item/combitool/iswirecutter() - return tools[current_tool] == "wirecutters" + return current_tool == "wirecutters" /obj/item/combitool/iscrowbar() - return tools[current_tool] == "crowbar" + return current_tool == "crowbar" /obj/item/combitool/ismultitool() - return tools[current_tool] == "multitool" + return current_tool == "multitool" /obj/item/combitool/proc/update_tool() - icon_state = "[initial(icon_state)]-[tools[current_tool]]" + icon_state = "[initial(icon_state)]-[current_tool]" /obj/item/combitool/attack_self(var/mob/user) if(++current_tool > tools.len) current_tool = 1 - var/tool = tools[current_tool] - if(!tool) - to_chat(user, "You can't seem to find any fittings in \the [src].") - else - to_chat(user, "You switch \the [src] to the [tool] fitting.") - update_tool() + var/tool = RADIAL_INPUT(user, tools) + if(tool) + playsound(user, 'sound/items/penclick.ogg', 25) + current_tool = tool + update_tool() return 1 /obj/item/powerdrill diff --git a/html/changelogs/mattatlas-radials.yml b/html/changelogs/mattatlas-radials.yml new file mode 100644 index 00000000000..44321e23ca3 --- /dev/null +++ b/html/changelogs/mattatlas-radials.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Removing trays and stuff from cooking appliances now has a sweet radial menu." + - rscadd: "Combitools now have a radial menu." diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index b0d00dacf10..9d123c76f85 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -11575,10 +11575,6 @@ /area/centcom/holding) "aNI" = ( /obj/structure/table/reinforced, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, /turf/simulated/floor/tiled, /area/merchant_station) "aNJ" = (