Merge pull request #1254 from Citadel-Station-13/upstream-merge-27743

[MIRROR] Ports cable structures to Initialize
This commit is contained in:
LetterJay
2017-05-28 14:32:31 -05:00
committed by GitHub
+3 -4
View File
@@ -66,9 +66,8 @@ By design, d1 is the smallest direction and d2 is the highest
icon = 'icons/obj/power_cond/power_cond_white.dmi'
// the power cable object
/obj/structure/cable/New()
..()
/obj/structure/cable/Initialize()
. = ..()
// ensure d1 & d2 reflect the icon_state for entering and exiting cable
var/dash = findtext(icon_state, "-")
@@ -529,7 +528,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
return(OXYLOSS)
/obj/item/stack/cable_coil/New(loc, new_amount = null, var/param_color = null)
..()
. = ..()
if(new_amount) // MAXCOIL by default
amount = new_amount
if(param_color)