diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm
index 6f6cdd18a2f..c861601e919 100644
--- a/code/game/asteroid.dm
+++ b/code/game/asteroid.dm
@@ -97,7 +97,7 @@ var/global/max_secret_rooms = 6
 			theme = "xenoden"
 			walltypes = list(/turf/simulated/mineral/random/high_chance=1)
 			floortypes = list(/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/floor/beach/sand)
-			treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2)
+			treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2,/obj/item/weapon/guardiancreator/biological=4)
 			fluffitems = list(/obj/effect/decal/remains/human=1,/obj/effect/decal/cleanable/blood/xeno=5)
 
 		if("hitech")
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index a3be6b8cd0d..24a5da77704 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -264,12 +264,11 @@
 
 /mob/living/simple_animal/hostile/guardian/punch/AttackingTarget()
 	..()
-	if(istype(target, /mob/living))
-		if(length(battlecry) > 5)
-			src.say("[src.battlecry][src.battlecry][src.battlecry][src.battlecry]")
+	if(iscarbon(target) && target != summoner)
+		if(length(battlecry) > 11)//no more then 11 letters in a battle cry.
+			src.visible_message("<span class='danger'><B>[src] punches [target]!</B></span>")
 		else
-			src.say("[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]\
-			[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]")
+			src.say("[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]")
 		playsound(loc, src.attack_sound, 50, 1, 1)
 		playsound(loc, src.attack_sound, 50, 1, 1)
 		playsound(loc, src.attack_sound, 50, 1, 1)
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 2e3d39e8f9f..36642747502 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ