Merge pull request #506 from Hubblenaut/master

Fixes Cable Merging and Floor Placing
This commit is contained in:
Neerti
2015-12-10 12:45:02 -05:00
4 changed files with 10 additions and 2 deletions
+8
View File
@@ -871,26 +871,34 @@ obj/structure/cable/proc/cableColor(var/colorC)
update_wclass()
/obj/item/stack/cable_coil/yellow
stacktype = /obj/item/stack/cable_coil
color = COLOR_YELLOW
/obj/item/stack/cable_coil/blue
stacktype = /obj/item/stack/cable_coil
color = COLOR_BLUE
/obj/item/stack/cable_coil/green
stacktype = /obj/item/stack/cable_coil
color = COLOR_LIME
/obj/item/stack/cable_coil/pink
stacktype = /obj/item/stack/cable_coil
color = COLOR_PINK
/obj/item/stack/cable_coil/orange
stacktype = /obj/item/stack/cable_coil
color = COLOR_ORANGE
/obj/item/stack/cable_coil/cyan
stacktype = /obj/item/stack/cable_coil
color = COLOR_CYAN
/obj/item/stack/cable_coil/white
stacktype = /obj/item/stack/cable_coil
color = COLOR_WHITE
/obj/item/stack/cable_coil/random/New()
stacktype = /obj/item/stack/cable_coil
color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
..()