Pulse Rifles are now more robust, doing excellent melee damage.

Restricted monkeys from picking up guns since that code didn't seem to work/runtime error.
Commented out boardgame since it was crashing.
More work on CentCom.
Fixed aliens receiving two messages when interacting with other aliens.

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

code/game/objects/items/item.dm

@@ -114,12 +114,17 @@
 	user.update_clothing()
 	return
 
+
 /obj/item/attack_paw(mob/user as mob)
 
 	if(isalien(user)) // -- TLE
 		user << "Your claws aren't capable of such fine manipulation."
 		return
 
+	if(istype(src, /obj/item/weapon/gun)) //Temporary fix until I figure out what's going with monkey/add_blood code./N
+		user << "Sorry Mr. Monkey, guns aren't for you."
+		return
+
 	if (istype(src.loc, /obj/item/weapon/storage))
 		for(var/mob/M in range(1, src.loc))
 			if (M.s_active == src.loc)

code/game/objects/items/weapons/game_kit.dm

@@ -1,8 +1,9 @@
 /*
 CONTAINS:
 THAT STUPID GAME KIT
-
+Which I am commenting out /N
 */
+/*
 /obj/item/weapon/game_kit/New()
 	src.board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
 	src.selected = "CR"
@@ -134,3 +135,4 @@ THAT STUPID GAME KIT
 		for(var/mob/M in viewers(1, src))
 			if ((M.client && M.machine == src))
 				src.attack_hand(M)
+*/

code/game/objects/items/weapons/guns_ammo.dm

@@ -34,10 +34,10 @@ TELEPORT GUN
 	icon_state = "pulse"
 	force = 15
 
-	var/mode = 1
+	var/mode = 1//I guess I'll leave this here in case another mode to the weapon is added./N
 
 	afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
-		if ((usr.mutations & 16) && prob(50))
+		if ((user.mutations & 16) && prob(50))
 			usr << "\red The pulse rifle blows up in your face."
 			usr.fireloss += 20
 			usr.drop_item()
@@ -45,7 +45,7 @@ TELEPORT GUN
 			return
 		if (flag)
 			return
-		if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+		if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 			usr << "\red You don't have the dexterity to do this!"
 			return
 
@@ -86,6 +86,26 @@ TELEPORT GUN
 				if(O.client)	O.show_message(text("\red <B>[] has been knocked unconscious!</B>", M), 1, "\red You hear someone fall", 2)
 
 
+/obj/item/weapon/gun/energy/pulse_rifle/attack(mob/M as mob, mob/user as mob)
+	src.add_fingerprint(user)
+
+	if ((istype(M, /mob/living/carbon/human) && istype(M, /obj/item/clothing/head) && M.flags & 8 && prob(80)))
+		M << "\blue The helmet protects you from being hit hard in the head!"
+		return
+	if (prob(50))
+		if (M.paralysis < 60)
+			M.paralysis = 60
+	else
+		if (M.weakened < 60)
+			M.weakened = 60
+	src.force = 35
+	..()
+	if(M.stat != 2)	M.stat = 1
+	for(var/mob/O in viewers(M, null))
+		if (O.client)
+			O.show_message(text("\red <B>[] has been rifle butted by []!</B>", M, user), 1, "\red You hear someone fall", 2)
+	return
+
 // AMMO
 
 
@@ -187,7 +207,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
 // ******* Check
 
 	if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
-		M << "\red The helmet protects you from being hit hard in the head!"
+		M << "\blue The helmet protects you from being hit hard in the head!"
 		return
 	if ((user.a_intent == "hurt" && src.bullets > 0))
 		if (prob(20))
@@ -635,12 +655,6 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
 
 	return
 
-
-
-
-
-
-
 // TASER GUN