TG Sync 12/15/17

s s
2017-12-15 06:27:57 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
@@ -20,8 +20,8 @@
 	var/regrowth_time_low = 4800
 	var/regrowth_time_high = 8400

-/obj/structure/flora/ash/New()
-	..()
+/obj/structure/flora/ash/Initialize()
+	. = ..()
 	base_icon = "[icon_state][rand(1, 4)]"
 	icon_state = base_icon
 	if(prob(15))
@@ -153,8 +153,8 @@
 	max_integrity = 100
 	seed = /obj/item/seeds/lavaland/polypore

-/obj/item/reagent_containers/food/snacks/grown/ash_flora/New()
-	..()
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize()
+	. = ..()
 	pixel_x = rand(-4, 4)
 	pixel_y = rand(-4, 4)