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
@@ -109,8 +109,8 @@
 /obj/item/reagent_containers/food/snacks/egg/loaded
 	containsPrize = TRUE

-/obj/item/reagent_containers/food/snacks/egg/loaded/New()
-	..()
+/obj/item/reagent_containers/food/snacks/egg/loaded/Initialize()
+	. = ..()
 	var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow")
 	icon_state = "egg-[eggcolor]"
 	item_color = "[eggcolor]"
@@ -146,7 +146,7 @@
 		timer = rand(1,15)

 /mob/living/simple_animal/shade/howling_ghost/proc/EtherealMove(direction)
-	loc = get_step(src, direction)
+	forceMove(get_step(src, direction))
 	setDir(direction)

 /mob/living/simple_animal/shade/howling_ghost/proc/roam()
@@ -220,7 +220,7 @@
 		timer = rand(5,15)
 		playsound(M.loc, pick('sound/spookoween/scary_horn.ogg','sound/spookoween/scary_horn2.ogg', 'sound/spookoween/scary_horn3.ogg'), 300, 1)
 		spawn(12)
-			loc = M.loc
+			forceMove(M.loc)

 /mob/living/simple_animal/hostile/retaliate/clown/insane/MoveToTarget()
 	stalk(target)