Compiles, and guns work™

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -96,7 +96,7 @@
 	icon_state = "gshell"
 	projectile_type = /obj/item/projectile/bullet/pellet
 	pellets = 6
-	deviation = 25
+	variance = 25
 
 /obj/item/ammo_casing/shotgun/rubbershot
 	name = "rubber shot"
@@ -104,7 +104,7 @@
 	icon_state = "bshell"
 	projectile_type = /obj/item/projectile/bullet/rpellet
 	pellets = 6
-	deviation = 25
+	variance = 25
 	materials = list(MAT_METAL=4000)
 
 /obj/item/ammo_casing/shotgun/beanbag
@@ -121,17 +121,17 @@
 	projectile_type = /obj/item/projectile/bullet/pellet/weak
 	materials = list(MAT_METAL=250)
 	pellets = 5
-	deviation = 25
+	variance = 25
 
 /obj/item/ammo_casing/shotgun/improvised/overload
 	name = "overloaded improvised shell"
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
 	propellant. It's like playing russian roulette, with a shotgun."
 	icon_state = "improvshell"
-	projectile_type = /obj/item/projectile/bullet/pellet/random
+	projectile_type = /obj/item/projectile/bullet/pellet/overload
 	materials = list(MAT_METAL=250)
 	pellets = 5
-	deviation = 40
+	variance = 40
 
 /obj/item/ammo_casing/shotgun/improvised/overload/New()
 	..()
@@ -191,7 +191,7 @@
 	icon_state = "ionshell"
 	projectile_type = /obj/item/projectile/ion/weak
 	pellets = 4
-	deviation = 35
+	variance = 35
 
 /obj/item/ammo_casing/shotgun/laserslug
 	name = "laser slug"

code/modules/projectiles/ammunition/energy.dm

@@ -110,7 +110,8 @@
 
 /obj/item/ammo_casing/energy/temp/newshot()
 	..()
-	BB.temperature = temperature
+	var/obj/item/projectile/temp/T = BB
+	T.temperature = temperature
 
 /obj/item/ammo_casing/energy/meteor
 	projectile_type = /obj/item/projectile/meteor
@@ -202,7 +203,7 @@
 	projectile_type = /obj/item/projectile/energy/shock_revolver
 
 /obj/item/ammo_casing/energy/toxplasma
-	projectile_type = /obj/item/projectile/toxplasma
+	projectile_type = /obj/item/projectile/energy/toxplasma
 	fire_sound = "sound/weapons/taser2.ogg"
 	select_name = "plasma dart"
 
@@ -214,7 +215,7 @@
 /obj/item/ammo_casing/energy/sniper
 	projectile_type = /obj/item/projectile/beam/sniper
 	fire_sound = 'sound/weapons/marauder.ogg'
-	fire_delay = 50
+	delay = 50
 	select_name = "sniper beam"
 
 /obj/item/ammo_casing/energy/teleport
@@ -222,3 +223,8 @@
 	fire_sound = 'sound/weapons/wave.ogg'
 	e_cost = 1250
 	select_name = "teleport beam"
+	var/teleport_target
+
+/obj/item/ammo_casing/energy/teleport/newshot()
+	var/obj/item/projectile/energy/teleport/T = BB
+	T.teleport_target = teleport_target

code/modules/projectiles/ammunition/magazines.dm

@@ -50,7 +50,7 @@
 			R.loc = src
 
 			if(bullet)
-				bullet.loc = get_turf(src.loc)
+				bullet.loc = get_turf(loc)
 			return 1
 
 	return 0