Merge branch 'master' into mapsyncs43293845982

This commit is contained in:
deathride58
2018-01-07 20:23:00 +00:00
committed by GitHub
29 changed files with 207 additions and 153 deletions
+1 -2
View File
@@ -76,6 +76,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/cable/white
cable_color = "white"
color = "#ffffff"
// the power cable object
/obj/structure/cable/Initialize(mapload, param_color)
@@ -493,8 +494,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/Initialize(mapload, new_amount = null, param_color = null)
. = ..()
if(new_amount) // MAXCOIL by default
amount = new_amount
var/list/cable_colors = GLOB.cable_colors
item_color = param_color || item_color || pick(cable_colors)