diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index ebeec9c281a..f873daa5d96 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -328,8 +328,36 @@ RFD Service-Class desc = "A RFD, modified to deploy service items." icon_state = "rfd-s" item_state = "rfd-s" - modes = list("Cigarette", "Drinking Glass","Paper","Pen","Dice Pack") - number_of_modes = 5 + var/list/radial_modes = list() + +/obj/item/rfd/service/Initialize() + . = ..() + radial_modes = list( + "Cigarette" = image(icon = 'icons/obj/clothing/masks.dmi', icon_state = "cigoff"), + "Drinking Glass" = image(icon = 'icons/obj/drinks.dmi', icon_state = "glass_empty"), + "Paper" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper"), + "Pen" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "pen"), + "Dice Pack" = image(icon = 'icons/obj/dice.dmi', icon_state = "dicebag"), + ) + +/obj/item/rfd/service/attack_self(mob/user) + var/current_mode = RADIAL_INPUT(user, radial_modes) + switch(current_mode) + if("Cigarette") + mode = 1 + if("Drinking Glass") + mode = 2 + if("Paper") + mode = 3 + if("Pen") + mode = 4 + if("Dice Pack") + mode = 5 + if(current_mode) + to_chat(user, SPAN_NOTICE("You switch the selection dial to \"[current_mode]\".")) + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) + if(prob(20)) + spark(get_turf(src), 3, alldirs) /obj/item/rfd/service/resolve_attackby(atom/A, mob/user as mob, var/click_parameters) if(istype(user,/mob/living/silicon/robot)) @@ -638,4 +666,4 @@ RFD Piping-Class #undef RFD_FLOORS_AND_WALL #undef RFD_AIRLOCK -#undef RFD_DECONSTRUCT \ No newline at end of file +#undef RFD_DECONSTRUCT diff --git a/html/changelogs/rfd_radials.yml b/html/changelogs/rfd_radials.yml new file mode 100644 index 00000000000..cf0b2ab6dfa --- /dev/null +++ b/html/changelogs/rfd_radials.yml @@ -0,0 +1,41 @@ +################################ +# 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: Wowzewow (Wezzy) + +# 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: "Adds radials for the RFD-S."