New WIP TK system added. To activate your TK click the throw button with an empty hand. This will bring up a tkgrab item. Click on a non-anchored (currently) non mob Object to select it as your "focus". Once a focus is selected so long as you are in range of the focus you can now click somewhere to throw the focus at the target. To quit using TK just drop the tkgrab item.

The captains laser, aegun, and xbow recharge a bit slower now, they recharged so fast that you almost never had to stop shooting. 
Cleaned up the cyborg_modules file
Medical and Security borgs have a hud item.
Medical bots bottles hold 60 of their chemical (up from 30).
Medical bots now have three syringes that are labeled "Syringe-(Inaprovaline)", "Syringe-(Anti-Toxin)",  and "Syringe-(Mixed)".
Medical bots now have two kelotane/dexalin pills (up from 1/ea).
Engineering bots got a new RCD thats just like the old one but the code is cleaner and meant for borgs only.
Husks brains can no longer be cut out.
Healing hands code has been removed till whoever wants to finish it adds it to a place that is NOT the base click procs.
Added veyveyr's nuke team weapon.  Its more or less the Uzi with a new icon.
Nuke teams also got a bit of extra ammo and a few more pinpointers/eguns in their locker.
Glass doors will not set opacity to 1 after they close.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2431 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/projectiles/ammunition/boxes.dm

@@ -46,7 +46,7 @@
 /obj/item/ammo_magazine/c9mm
 	name = "Ammunition Box (9mm)"
 	icon_state = "9mm"
-	origin_tech = "combat=3;materials=2"
+	origin_tech = "combat=2"
 	ammo_type = "/obj/item/ammo_casing/c9mm"
 	max_ammo = 30
 
@@ -55,6 +55,24 @@
 /obj/item/ammo_magazine/c45
 	name = "Ammunition Box (.45)"
 	icon_state = "9mm"
-	origin_tech = "combat=3;materials=2"
+	origin_tech = "combat=2"
 	ammo_type = "/obj/item/ammo_casing/c45"
 	max_ammo = 30
+
+
+
+/obj/item/ammo_magazine/a12mm
+	name = "magazine (12mm)"
+	icon_state = "12mm"
+	origin_tech = "combat=2"
+	ammo_type = "/obj/item/ammo_casing/a12mm"
+	max_ammo = 20
+	multiple_sprites = 1
+
+
+
+/obj/item/ammo_magazine/a12mm/empty
+	name = "magazine (12mm)"
+	icon_state = "12mm"
+	ammo_type = "/obj/item/ammo_casing/12mm"
+	max_ammo = 0

code/modules/projectiles/ammunition/bullets.dm

@@ -40,6 +40,12 @@
 	projectile_type = "/obj/item/projectile/bullet/midbullet"
 
 
+/obj/item/ammo_casing/a12mm
+	desc = "A 12mm bullet casing."
+	caliber = "12mm"
+	projectile_type = "/obj/item/projectile/bullet/midbullet"
+
+
 /obj/item/ammo_casing/shotgun
 	name = "shotgun shell"
 	desc = "A 12 gauge shell."

code/modules/projectiles/guns/energy/laser.dm

@@ -9,7 +9,6 @@
 
 
 
-
 /obj/item/weapon/gun/energy/laser/captain
 	icon_state = "caplaser"
 	desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
@@ -30,7 +29,7 @@
 
 	process()
 		charge_tick++
-		if(!charge_tick >= 5)	return 0
+		if(!charge_tick >= 10)	return 0
 		charge_tick = 0
 		if(!power_supply)	return 0
 		power_supply.give(100)
@@ -38,12 +37,13 @@
 		return 1
 
 
+
 /obj/item/weapon/gun/energy/laser/cyborg/load_into_chamber()
 	if(in_chamber)	return 1
 	if(isrobot(src.loc))
 		var/mob/living/silicon/robot/R = src.loc
 		if(R && R.cell)
-			R.cell.use(40)
+			R.cell.use(100)
 			in_chamber = new/obj/item/projectile/beam(src)
 			return 1
 	return 0

code/modules/projectiles/guns/energy/nuclear.dm

@@ -51,7 +51,7 @@
 
 	process()
 		charge_tick++
-		if(!charge_tick >= 5)	return 0
+		if(!charge_tick >= 10)	return 0
 		charge_tick = 0
 		if(!power_supply)	return 0
 		if(!failcheck())	return 0

code/modules/projectiles/guns/energy/stun.dm

@@ -62,7 +62,7 @@
 
 	process()
 		charge_tick++
-		if(!charge_tick >= 5)	return 0
+		if(!charge_tick >= 10)	return 0
 		charge_tick = 0
 		if(!power_supply)	return 0
 		power_supply.give(100)

code/modules/projectiles/guns/projectile.dm

@@ -11,13 +11,16 @@
 		ammo_type = "/obj/item/ammo_casing/a357"
 		list/loaded = list()
 		max_shells = 7
-		load_method = 0 //0 = Single shells or quick loader, 1 = magazine
+		load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine
+		obj/item/ammo_magazine/empty_mag = null
 
 
 	New()
+		..()
 		for(var/i = 1, i <= max_shells, i++)
 			loaded += new ammo_type(src)
 		update_icon()
+		return
 
 
 	load_into_chamber()
@@ -37,6 +40,7 @@
 	attackby(var/obj/item/A as obj, mob/user as mob)
 		var/num_loaded = 0
 		if(istype(A, /obj/item/ammo_magazine))
+			if((load_method == 2) && loaded.len)	return
 			var/obj/item/ammo_magazine/AM = A
 			for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
 				if(loaded.len >= max_shells)
@@ -46,7 +50,11 @@
 					AM.stored_ammo -= AC
 					loaded += AC
 					num_loaded++
-		else if(istype(A, /obj/item/ammo_casing) && !load_method)
+			if(load_method == 2)
+				user.remove_from_mob(AM)
+				empty_mag = AM
+				empty_mag.loc = src
+		if(istype(A, /obj/item/ammo_casing) && !load_method)
 			var/obj/item/ammo_casing/AC = A
 			if(AC.caliber == caliber && loaded.len < max_shells)
 				user.drop_item()
@@ -56,8 +64,11 @@
 		if(num_loaded)
 			user << text("\blue You load [] shell\s into the gun!", num_loaded)
 		A.update_icon()
+		update_icon()
 		return
 
+
 	update_icon()
 		desc = initial(desc) + text(" Has [] rounds remaining.", loaded.len)
+		return
 

code/modules/projectiles/guns/projectile/automatic.dm

@@ -12,7 +12,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
 	name = "Mini-Uzi"
-	desc = "A lightweight, fast firing gun, for when you REALLY need someone dead. Uses .45 rounds."
+	desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
 	icon_state = "mini-uzi"
 	w_class = 3.0
 	max_shells = 20
@@ -20,3 +20,51 @@
 	origin_tech = "combat=5;materials=2;syndicate=8"
 	ammo_type = "/obj/item/ammo_casing/c45"
 
+
+
+/obj/item/weapon/gun/projectile/automatic/c20r
+	name = "C-20r SMG"
+	desc = "A lightweight, fast firing gun, for when you REALLY need someone dead. Uses .12mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp"
+	icon_state = "c20r"
+	item_state = "c20r"
+	w_class = 3.0
+	max_shells = 20
+	caliber = "12mm"
+	origin_tech = "combat=5;materials=2;syndicate=8"
+	ammo_type = "/obj/item/ammo_casing/a12mm"
+	fire_sound = 'Gunshot_smg.ogg'
+	load_method = 2
+
+
+	New()
+		..()
+		empty_mag = new /obj/item/ammo_magazine/a12mm/empty(src)
+		update_icon()
+		return
+
+
+	afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+		..()
+		if(!loaded.len && empty_mag)
+			empty_mag.loc = get_turf(src.loc)
+			empty_mag = null
+			playsound(user, 'smg_empty_alarm.ogg', 40, 1)
+			update_icon()
+		return
+
+
+	update_icon()
+		..()
+		overlays = null
+		if(empty_mag)
+			overlays += "c20r-[round(loaded.len,4)]"
+		return
+
+
+
+
+
+
+
+
+

code/modules/projectiles/projectile/bullets.dm

@@ -1,7 +1,6 @@
 /obj/item/projectile/bullet
 	name = "bullet"
 	icon_state = "bullet"
-
 	damage = 60
 	damage_type = BRUTE
 	nodamage = 0