diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 558538d97ef..0081c384bd5 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -158,3 +158,4 @@ #define FUZZY_CHANCE_HIGH 85 #define FUZZY_CHANCE_LOW 50 #define CHANCE_TALK 15 +#define MAXCOIL 30 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 0dd8e573b71..e9bd8434232 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -157,7 +157,7 @@ R.source = metstore modules += R - var/obj/item/stack/cable_coil/cyborg/W = new /obj/item/stack/cable_coil/cyborg(src) + var/obj/item/stack/cable_coil/cyborg/W = new /obj/item/stack/cable_coil/cyborg(src,MAXCOIL,pick("red","yellow","green","blue","pink","orange","cyan","white")) W.source = wirestore modules += W diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 03c2ace4c12..1413ba421b7 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -453,7 +453,7 @@ obj/structure/cable/proc/avail() // Definitions //////////////////////////////// -#define MAXCOIL 30 + /obj/item/stack/cable_coil name = "cable coil" @@ -481,6 +481,11 @@ obj/structure/cable/proc/avail() g_amt = 0 cost = 1 +/obj/item/stack/cable_coil/cyborg/attack_self(mob/user) + var/cable_color = input(user,"Pick a cable color.","Cable Color") in list("red","yellow","green","blue","pink","orange","cyan","white") + item_color = cable_color + update_icon() + /obj/item/stack/cable_coil/suicide_act(mob/user) if(locate(/obj/structure/stool) in user.loc) user.visible_message("[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide.") diff --git a/html/changelogs/xxalpha-cable_color.yml b/html/changelogs/xxalpha-cable_color.yml new file mode 100644 index 00000000000..7b8ff4ce302 --- /dev/null +++ b/html/changelogs/xxalpha-cable_color.yml @@ -0,0 +1,7 @@ +author: xxalpha + +delete-after: True + +changes: + - rscadd: "Engineering cyborgs can now pick their cable coil color whenever they want." +