Merge pull request #9293 from xxalpha/cable_color

Engineering Cyborgs can now change their cable coil color.
This commit is contained in:
Jordie
2015-05-08 22:10:58 +10:00
4 changed files with 15 additions and 2 deletions
@@ -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
+6 -1
View File
@@ -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("<span class='suicide'>[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide.</span>")