Merge pull request #64 from skull132/master

15APR part 2

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

@@ -31,6 +31,14 @@
 	var/force_unwielded = 0 //Force modification, because striking someone with a rifle held in two hands -hurts-
 	var/force_wielded = 0
 
+	update_icon()
+		var/ratio = power_supply.charge / power_supply.maxcharge
+		ratio = round(ratio, 0.25) * 100
+		if(modifystate)
+			icon_state = "[modifystate][ratio]"
+		else
+			icon_state = "[initial(icon_state)][ratio]"
+
 /obj/item/weapon/gun/energy/rifle/proc/unwield()
 	wielded = 0
 	fire_delay = fire_delay_unwielded
@@ -273,25 +281,35 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	fire_delay_wielded = 25
 	fire_delay_unwielded = 75
 
-	attack_self(mob/living/user as mob)
+//	attack_self(mob/living/user as mob)
+//Let's do some magical things, make this a verb, yes?
+//Needs some testing done, primary concerns: useability (when restrained, etc.) and icon updating
+	verb/toggle()
+		set name = "Switch weapon mode"
+		set category = "Object"
+		set src in usr
+
+		if(!usr.canmove || usr.stat || usr.restrained())
+			return 0
+
 		switch(mode)
 			if(2)
 				mode = 0
 				charge_cost = 100
 				fire_sound = 'sound/weapons/Taser.ogg'
-				user << "\red [src.name] is now set to stun."
+				usr << "\red [src.name] is now set to stun."
 				projectile_type = "/obj/item/projectile/energy/electrode"
 			if(0)
 				mode = 1
 				charge_cost = 100
 				fire_sound = 'sound/weapons/Laser.ogg'
-				user << "\red [src.name] is now set to kill."
+				usr << "\red [src.name] is now set to kill."
 				projectile_type = "/obj/item/projectile/beam"
 			if(1)
 				mode = 2
 				charge_cost = 200
 				fire_sound = 'sound/weapons/pulse.ogg'
-				user << "\red [src.name] is now set to DESTROY."
+				usr << "\red [src.name] is now set to DESTROY."
 				projectile_type = "/obj/item/projectile/beam/pulse"
 		return
 
@@ -329,20 +347,28 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	var/mode = 0 //0 = stun, 1 = kill
 
 
-	attack_self(mob/living/user as mob)
+//	attack_self(mob/living/user as mob)
+	verb/toggle()
+		set name = "Switch weapon mode"
+		set category = "Object"
+		set src in usr
+
+		if(!usr.canmove || usr.stat || usr.restrained())
+			return 0
+
 		switch(mode)
 			if(0)
 				mode = 1
 				charge_cost = 50
 				fire_sound = 'sound/weapons/Laser.ogg'
-				user << "\red [src.name] is now set to kill."
+				usr << "\red [src.name] is now set to kill."
 				projectile_type = "/obj/item/projectile/beam"
 				modifystate = "eriflekill"
 			if(1)
 				mode = 0
 				charge_cost = 50
 				fire_sound = 'sound/weapons/Taser.ogg'
-				user << "\red [src.name] is now set to stun."
+				usr << "\red [src.name] is now set to stun."
 				projectile_type = "/obj/item/projectile/energy/electrode"
 				modifystate = "eriflestun"
 		update_icon()

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

@@ -93,7 +93,7 @@
 		if(charge_tick < 4) return 0
 		charge_tick = 0
 		if(!power_supply) return 0
-		power_supply.give(100)
+		power_supply.give(25)
 		return 1
 
 

code/modules/projectiles/projectile/energy.dm

@@ -42,9 +42,10 @@
 	icon_state = "cbbolt"
 	damage = 10
 	damage_type = TOX
+	irradiate = 50
 	nodamage = 0
-	weaken = 10
-	stutter = 10
+//	weaken = 10
+//	stutter = 10
 
 
 /obj/item/projectile/energy/bolt/large