TG Sync 12/15/17

s s
2017-12-15 03:28:09 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
@@ -341,8 +341,8 @@
 	icon_state = "banana"
 	range = 200

-/obj/item/projectile/bullet/honker/New()
-	..()
+/obj/item/projectile/bullet/honker/Initialize()
+	. = ..()
 	SpinAnimation()

 // Mime
@@ -364,8 +364,8 @@
 	damage = 6
 	var/piercing = FALSE

-/obj/item/projectile/bullet/dart/New()
-	..()
+/obj/item/projectile/bullet/dart/Initialize()
+	. = ..()
 	create_reagents(50)
 	reagents.set_reacting(FALSE)

@@ -388,8 +388,8 @@
 	reagents.handle_reactions()
 	return TRUE

-/obj/item/projectile/bullet/dart/metalfoam/New()
-	..()
+/obj/item/projectile/bullet/dart/metalfoam/Initialize()
+	. = ..()
 	reagents.add_reagent("aluminium", 15)
 	reagents.add_reagent("foaming_agent", 5)
 	reagents.add_reagent("facid", 5)
@@ -100,7 +100,7 @@

 /obj/item/projectile/meteor/Collide(atom/A)
 	if(A == firer)
-		loc = A.loc
+		forceMove(A.loc)
 		return
 	A.ex_act(EXPLODE_HEAVY)
 	playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
@@ -612,4 +612,3 @@
 		knockdown = 0
 		nodamage = TRUE
 	return ..()
-