Modified TK to be more effective and polished. You can use the TK grab to interact with machines and stuff from far away (but you cannot pick them up!). This means you can also bonk people with items you are holding with your TK grab.

Changed the energy gun sprites to a better-looking version, made by Khodoque!

More work on NTSL. Including the ability to create comments by using // and /* insert comment here */.

Removed the traffic control machine from telecomms, as requested by Urist. NTSL is still a work in progress, and needs to be completely fool-proof before players can get anywhere near it.

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

code/modules/projectiles/guns/energy.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/gun/energy
 	icon_state = "energy"
 	name = "energy gun"
-	desc = "A basic energy-based gun with two settings: Stun and kill."
+	desc = "A basic energy-based gun."
 	fire_sound = 'Taser.ogg'
 
 	var
@@ -9,6 +9,7 @@
 		charge_cost = 100 //How much energy is needed to fire.
 		cell_type = "/obj/item/weapon/cell"
 		projectile_type = "/obj/item/projectile/energy"
+		modifystate
 
 	emp_act(severity)
 		power_supply.use(round(power_supply.maxcharge / severity))
@@ -23,6 +24,7 @@
 		else
 			power_supply = new(src)
 		power_supply.give(power_supply.maxcharge)
+		modifystate = icon_state
 		return
 
 
@@ -38,7 +40,7 @@
 	update_icon()
 		var/ratio = power_supply.charge / power_supply.maxcharge
 		ratio = round(ratio, 0.25) * 100
-		icon_state = text("[][]", initial(icon_state), ratio)
+		icon_state = text("[][]", modifystate, ratio)
 
 
 

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

@@ -1,5 +1,5 @@
 /obj/item/weapon/gun/energy/gun
-	icon_state = "energy"
+	icon_state = "energystun100"
 	name = "energy gun"
 	desc = "A basic energy-based gun with two settings: Stun and kill."
 	fire_sound = 'Taser.ogg'
@@ -20,12 +20,14 @@
 				fire_sound = 'Laser.ogg'
 				user << "\red [src.name] is now set to kill."
 				projectile_type = "/obj/item/projectile/beam"
+				modifystate = "energykill"
 			if(1)
 				mode = 0
 				charge_cost = 100
 				fire_sound = 'Taser.ogg'
 				user << "\red [src.name] is now set to stun."
 				projectile_type = "/obj/item/projectile/energy/electrode"
+				modifystate = "energystun"
 		update_icon()
 		return