Merge pull request #626 from Fox-McCloud/Guns-Fixes

Teleporter Gun, Fixes, and Tweaks

code/modules/projectiles/projectile/bullets.dm

@@ -39,6 +39,9 @@
 /obj/item/projectile/bullet/pellet/weak
 	damage = 3
 
+/obj/item/projectile/bullet/pellet/random/New()
+	damage = rand(10)
+
 /obj/item/projectile/bullet/midbullet
 	damage = 20
 	stamina = 65 //two rounds from the c20r knocks people down

code/modules/projectiles/projectile/energy.dm

@@ -41,18 +41,6 @@
 		proj_hit = 1
 	..()
 
-/obj/item/projectile/energy/electrode/revolver
-	name = "electrode"
-	icon_state = "spark"
-	nodamage = 1
-/*	stun = 2
-	weaken = 2
-	stutter = 10 */
-	agony = 50
-	damage_type = HALLOSS
-	hitsound = 'sound/weapons/tase.ogg'
-	//Damage will be handled on the MOB side, to prevent window shattering.
-
 /obj/item/projectile/energy/declone
 	name = "declone"
 	icon_state = "declone"

code/modules/projectiles/projectile/special.dm

@@ -12,6 +12,12 @@
 		return 1
 
 
+/obj/item/projectile/ion/weak
+
+/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = 0)
+	empulse(target, 0, 0)
+	return 1
+
 /obj/item/projectile/bullet/gyro
 	name ="explosive bolt"
 	icon_state= "bolter"
@@ -206,8 +212,30 @@ obj/item/projectile/kinetic/New()
 /obj/item/effect/kinetic_blast/New()
 	spawn(4)
 		del(src)
-		
+
 /obj/item/projectile/bullet/frag12
 	name ="explosive slug"
 	damage = 25
 	weaken = 5
+
+/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0)
+	explosion(target, -1, 0, 1)
+	return 1
+
+/obj/item/projectile/energy/teleport
+	name = "teleportation burst"
+	icon_state = "bluespace"
+	damage = 0
+	nodamage = 1
+
+/obj/item/projectile/energy/teleport/on_hit(var/atom/target, var/blocked = 0)
+	if(isliving(target))
+		var/obj/item/device/radio/beacon/teletarget = null
+		for(var/obj/machinery/computer/teleporter/com in machines)
+			if(com.target)
+				teletarget = com.target
+		if(teletarget)
+			do_teleport(target, teletarget, 0)//teleport what's in the tile to the beacon
+		else
+			do_teleport(target, target, 15) //Otherwise it just warps you off somewhere.
+