From b8abae2eba5588cf1ba63944720bb2818e22799a Mon Sep 17 00:00:00 2001
From: n3ophyt3 <n3ophyt3@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 2 Dec 2011 00:33:21 +0000
Subject: [PATCH] Fixed the recharge rates on the captain's laser, energy
 crossbow, and advanced energy gun.

pulse rifles can once again switch between stun, kill, and destroy (outside of the pulse destroyer, which has three settings, and they are all destroy)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2588 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/modules/projectiles/guns/energy/laser.dm |  4 +--
 .../projectiles/guns/energy/nuclear.dm        |  4 +--
 code/modules/projectiles/guns/energy/pulse.dm | 26 +++++++++++++++++++
 code/modules/projectiles/guns/energy/stun.dm  |  5 ++--
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 4624c000b25..39e9c169d9e 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -36,9 +36,9 @@ obj/item/weapon/gun/energy/laser/retro
 
 	process()
 		charge_tick++
-		if(!charge_tick >= 10)	return 0
+		if(charge_tick < 4) return 0
 		charge_tick = 0
-		if(!power_supply)	return 0
+		if(!power_supply) return 0
 		power_supply.give(100)
 		update_icon()
 		return 1
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 445c4cd5a05..7b791c15775 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -51,9 +51,9 @@
 
 	process()
 		charge_tick++
-		if(!charge_tick >= 10)	return 0
+		if(charge_tick < 4) return 0
 		charge_tick = 0
-		if(!power_supply)	return 0
+		if(!power_supply) return 0
 		if((power_supply.charge / power_supply.maxcharge) != 1)
 			if(!failcheck())	return 0
 			power_supply.give(100)
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 0c484f4fc9e..449ac729797 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -7,14 +7,40 @@
 	charge_cost = 200
 	projectile_type = "/obj/item/projectile/beam/pulse"
 	cell_type = "/obj/item/weapon/cell/super"
+	var/mode = 2
 
 
+	attack_self(mob/living/user as mob)
+		switch(mode)
+			if(2)
+				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"
+			if(0)
+				mode = 1
+				charge_cost = 100
+				fire_sound = 'Laser.ogg'
+				user << "\red [src.name] is now set to kill."
+				projectile_type = "/obj/item/projectile/beam"
+			if(1)
+				mode = 2
+				charge_cost = 200
+				fire_sound = 'pulse.ogg'
+				user << "\red [src.name] is now set to DESTROY."
+				projectile_type = "/obj/item/projectile/beam/pulse"
+		return
+
 
 /obj/item/weapon/gun/energy/pulse_rifle/destroyer
 	name = "pulse destroyer"
 	desc = "A heavy-duty, pulse-based energy weapon."
 	cell_type = "/obj/item/weapon/cell/infinite"
 
+	attack_self(mob/living/user as mob)
+		user << "\red [src.name] has three settings, and they are all DESTROY."
+
 
 
 /obj/item/weapon/gun/energy/pulse_rifle/M1911
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 2b573450dc4..65af7edf66f 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -62,9 +62,8 @@
 
 	process()
 		charge_tick++
-		if(!charge_tick >= 10)	return 0
-		charge_tick = 0
-		if(!power_supply)	return 0
+		if(charge_tick < 4) return 0
+		if(!power_supply) return 0
 		power_supply.give(100)
 		return 1