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
@@ -284,8 +284,8 @@
 	icon_state = "cshell"
 	projectile_type = /obj/item/projectile/bullet/dart

-/obj/item/ammo_casing/shotgun/dart/New()
-	..()
+/obj/item/ammo_casing/shotgun/dart/Initialize()
+	. = ..()
 	container_type |= OPENCONTAINER_1
 	create_reagents(30)
 	reagents.set_reacting(TRUE)
@@ -296,10 +296,10 @@
 /obj/item/ammo_casing/shotgun/dart/bioterror
 	desc = "A shotgun dart filled with deadly toxins."

-/obj/item/ammo_casing/shotgun/dart/bioterror/New()
-	..()
+/obj/item/ammo_casing/shotgun/dart/bioterror/Initialize()
+	. = ..()
 	reagents.add_reagent("neurotoxin", 6)
 	reagents.add_reagent("spore", 6)
 	reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT
 	reagents.add_reagent("coniine", 6)
-	reagents.add_reagent("sodium_thiopental", 6)
+	reagents.add_reagent("sodium_thiopental", 6)
@@ -7,7 +7,7 @@

 /obj/item/ammo_casing/caseless/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread)
 	if (..()) //successfully firing
-		loc = null
+		moveToNullspace()
 		return 1
 	else
 		return 0