Corrected CentCom Officer suit and added the Commander suit.

Minor adjustments to alien health icons.
Fixed aliens hissing when they were doing their regular emotes.
Added death sound to aliens.
Aliens can now properly attack/interact with space carp.
Adjusted alien damage to monkeys.
A few wip sprites.
Fixed pulse rifles, again.

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

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

@@ -68,30 +68,30 @@ TELEPORT GUN
 		spawn()
 			A.process()
 		return
-	attack(mob/M as mob, mob/user as mob)
-		..()
-		src.add_fingerprint(user)
-		if ((prob(50) && M.stat < 2))
-			var/mob/living/carbon/human/H = M
-			if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
-				M << "\blue The helmet protects you from being hit hard in the head!"
-				for(var/mob/O in viewers(M, null))
-					if(O.client)
-						O.show_message(text("\red <B>[] blocked a hit from []!</B>", M, user), 1)
-				return
-			var/time = rand(20, 60)
-			if (prob(90))
-				M.paralysis = max(time, M.paralysis)
-			else
-				M.weakened = max(time, M.weakened)
-			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
 
+/obj/item/weapon/gun/energy/pulse_rifle/attack(mob/M as mob, mob/user as mob)
+	src.add_fingerprint(user)
+	var/mob/living/carbon/human/H = M
+
+	if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
+		M << "\blue The helmet protects you from being hit hard in the head!"
+		for(var/mob/O in viewers(M, null))
+			if(O.client)
+				O.show_message(text("\red <B>[] blocked a hit from []!</B>", M, user), 1)
+		return
+	else
+		var/time = rand(20, 60)
+		if (prob(90))
+			M.paralysis = max(time, M.paralysis)
+		else
+			M.weakened = max(time, M.weakened)
+		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
 
@@ -539,10 +539,6 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
 			if (O.client)	O.show_message(text("\red <B>[] has been pistol whipped with the detectives revolver by []!</B>", M, user), 1, "\red You hear someone fall", 2)
 	return
 
-
-
-
-
 // ENERGY GUN
 
 /obj/item/weapon/gun/energy/proc/update_icon()

code/game/objects/livestock.dm

@@ -72,6 +72,39 @@
 	attack_hand(user as mob)
 		return
 
+	attack_alien(var/mob/living/carbon/alien/user as mob) //So aliums can attack and potentially eat space carp.
+		if(src.alive)
+			if (user.a_intent == "help")
+				for(var/mob/O in viewers(src, null))
+					if ((O.client && !( O.blinded )))
+						O.show_message(text("\blue [user] caresses [src.name] with its scythe like arm."), 1)
+			else
+				src.health -= rand(15,30)
+				if(src.aggressive)
+					src.target = user
+					src.state = 1
+				for(var/mob/O in viewers(src, null))
+					if ((O.client && !( O.blinded )))
+						O.show_message(text("\red <B>[] has slashed [src.name]!</B>", user), 1)
+				playsound(src.loc, 'slice.ogg', 25, 1, -1)
+				if(prob(10)) new /obj/decal/cleanable/blood(src.loc)
+				if (src.health <= 0)
+					src.death()
+		else
+			if (user.a_intent == "grab")
+				for(var/mob/N in viewers(user, null))
+					if(N.client)
+						N.show_message(text("\red <B>[user] is attempting to devour the carp!</B>"), 1)
+				if(!do_after(user, 50))	return
+				for(var/mob/N in viewers(user, null))
+					if(N.client)
+						N.show_message(text("\red <B>[user] hungrily devours the carp!</B>"), 1)
+				user.health += rand(10,25)
+				del(src)
+			else
+				user << "\green The creature is already dead."
+		return
+
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(src.alive)
 			switch(W.damtype)