mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
Merge pull request #9293 from xxalpha/cable_color
Engineering Cyborgs can now change their cable coil color.
This commit is contained in:
@@ -158,3 +158,4 @@
|
||||
#define FUZZY_CHANCE_HIGH 85
|
||||
#define FUZZY_CHANCE_LOW 50
|
||||
#define CHANCE_TALK 15
|
||||
#define MAXCOIL 30
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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>")
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
author: xxalpha
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "Engineering cyborgs can now pick their cable coil color whenever they want."
|
||||
|
||||
Reference in New Issue
Block a user