Merge branch 'master' into upstream-merge-26705

2017-05-07 22:53:14 -07:00
parent 52a8aacd00 bd8bfe1327
commit 9ca8b570b2
522 changed files with 16989 additions and 10041 deletions
@@ -24,8 +24,8 @@
 	icon_state = "datadisk1"
 	max_blueprints = 1

-/obj/item/weapon/disk/design_disk/golem_shell/New()
-	..()
+/obj/item/weapon/disk/design_disk/golem_shell/Initialize()
+	. = ..()
 	var/datum/design/golem_shell/G = new
 	blueprints[1] = G

@@ -45,7 +45,7 @@
 	anchored = FALSE
 	density = TRUE

-/obj/structure/cursed_money/New()
+/obj/structure/cursed_money/Initialize()
 	. = ..()
 	addtimer(CALLBACK(src, .proc/collapse), 600)