diff --git a/code/__DEFINES/nanites.dm b/code/__DEFINES/nanites.dm index 496a902fac..388b049ad0 100644 --- a/code/__DEFINES/nanites.dm +++ b/code/__DEFINES/nanites.dm @@ -50,4 +50,3 @@ #define NES_SCAN_TYPE "Scan Type" #define NES_BUTTON_NAME "Button Name" #define NES_ICON "Icon" -#define NES_COLOR "Color" diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 2fad582ea3..9fe696dbfb 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -308,16 +308,14 @@ /datum/nanite_program/dermal_button/register_extra_settings() extra_settings[NES_SENT_CODE] = new /datum/nanite_extra_setting/number(1, 1, 9999) extra_settings[NES_BUTTON_NAME] = new /datum/nanite_extra_setting/text("Button") - extra_settings[NES_ICON] = new /datum/nanite_extra_setting/type("power", list("one","two","three","four","five","plus","minus","power")) - extra_settings[NES_COLOR] = new /datum/nanite_extra_setting/type("green", list("green","red","yellow","blue")) + extra_settings[NES_ICON] = new /datum/nanite_extra_setting/type("power", list("blank","one","two","three","four","five","plus","minus","exclamation","question","cross","info","heart","skull","brain","brain_damage","injection","blood","shield","reaction","network","power","radioactive","electricity","magnetism","scan","repair","id","wireless","say","sleep","bomb")) /datum/nanite_program/dermal_button/enable_passive_effect() . = ..() var/datum/nanite_extra_setting/bn_name = extra_settings[NES_BUTTON_NAME] var/datum/nanite_extra_setting/bn_icon = extra_settings[NES_ICON] - var/datum/nanite_extra_setting/bn_color = extra_settings[NES_COLOR] if(!button) - button = new(src, bn_name.get_value(), bn_icon.get_value(), bn_color.get_value()) + button = new(src, bn_name.get_value(), bn_icon.get_value()) button.target = host_mob button.Grant(host_mob) @@ -341,14 +339,14 @@ name = "Button" icon_icon = 'icons/mob/actions/actions_items.dmi' check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS - button_icon_state = "power_green" + button_icon_state = "nanite_power" var/datum/nanite_program/dermal_button/program -/datum/action/innate/nanite_button/New(datum/nanite_program/dermal_button/_program, _name, _icon, _color) +/datum/action/innate/nanite_button/New(datum/nanite_program/dermal_button/_program, _name, _icon) ..() program = _program name = _name - button_icon_state = "[_icon]_[_color]" + button_icon_state = "nanite_[_icon]" /datum/action/innate/nanite_button/Activate() program.press() diff --git a/icons/mob/actions/actions_items.dmi b/icons/mob/actions/actions_items.dmi index 8b21c32d6b..10627cf66d 100644 Binary files a/icons/mob/actions/actions_items.dmi and b/icons/mob/actions/actions_items.dmi differ