Armalis additions, tweaks.

code/modules/mob/living/living_defense.dm

@@ -86,7 +86,7 @@
 
 			// Begin BS12 momentum-transfer code.
 
-			if(speed > 20)
+			if(speed >= 20)
 				var/obj/item/weapon/W = O
 				var/momentum = speed/2
 				var/dir = get_dir(M,src)

code/modules/mob/living/simple_animal/vox.dm

@@ -8,7 +8,7 @@
 	icon_living = "armalis"
 	maxHealth = 500
 	health = 500
-	response_harm = "flails ineffectually at the"
+	response_harm = "slashes at the"
 	harm_intent_damage = 0
 	melee_damage_lower = 30
 	melee_damage_upper = 40
@@ -17,6 +17,22 @@
 	wall_smash = 1
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	status_flags = 0
+	universal_speak = 1
+	vox_talk_understand = 1
+
+	var/armour = null
+	var/amp = null
+	var/quills = 3
+
+/mob/living/simple_animal/vox/armalis/Die()
+
+	living_mob_list -= src
+	dead_mob_list += src
+	stat = DEAD
+	visible_message("\red <B>[src] shudders violently and explodes!</B>","\red <B>You feel your body rupture!</B>")
+	explosion(get_turf(loc), -1, -1, 3, 5)
+	src.gib()
+	return
 
 /mob/living/simple_animal/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(O.force)
@@ -44,6 +60,9 @@
 	set desc = "Fires a viciously pointed quill at a high speed."
 	set category = "Alien"
 
+	if(quills<=0)
+		return
+
 	src << "\red You launch a razor-sharp quill at [target]!"
 	for(var/mob/O in oviewers())
 		if ((O.client && !( O.blinded )))
@@ -51,7 +70,12 @@
 
 	var/obj/item/weapon/arrow/quill/Q = new(loc)
 	Q.fingerprintslast = src.ckey
-	Q.throw_at(target,10,15)
+	Q.throw_at(target,10,20)
+	quills--
+
+	spawn(100)
+		src << "\red You feel a fresh quill slide into place."
+		quills++
 
 /mob/living/simple_animal/vox/armalis/verb/message_mob()
 	set category = "Alien"
@@ -81,4 +105,57 @@
 		if(H.dna.mutantrace == "vox")
 			return
 		H << "\red Your nose begins to bleed..."
-		H.drip(1)
+		H.drip(1)
+
+/mob/living/simple_animal/vox/armalis/verb/shriek()
+	set category = "Alien"
+	set name = "Shriek"
+	set desc = "Give voice to a psychic shriek."
+
+/mob/living/simple_animal/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O,/obj/item/vox/armalis_armour))
+		user.drop_item()
+		armour = O
+		speed = 1
+		maxHealth += 200
+		health += 200
+		O.loc = src
+		visible_message("\blue [src] is quickly outfitted in [O] by [user].","\blue You quickly outfit [src] in [O].")
+		regenerate_icons()
+		return
+	if(istype(O,/obj/item/vox/armalis_amp))
+		user.drop_item()
+		amp = O
+		O.loc = src
+		visible_message("\blue [src] is quickly outfitted in [O] by [user].","\blue You quickly outfit [src] in [O].")
+		regenerate_icons()
+		return
+	return ..()
+
+/mob/living/simple_animal/vox/armalis/regenerate_icons()
+
+	overlays = list()
+	if(armour)
+		var/icon/armour = image('icons/mob/vox.dmi',"armour")
+		speed = 1
+		overlays += armour
+	if(amp)
+		var/icon/amp = image('icons/mob/vox.dmi',"amplifier")
+		overlays += amp
+	return
+
+/obj/item/vox/armalis_armour
+
+	name = "strange armour"
+	desc = "Hulking reinforced armour for something huge."
+	icon = 'icons/obj/clothing/suits.dmi'
+	icon_state = "armalis_armour"
+	item_state = "armalis_armour"
+
+/obj/item/vox/armalis_amp
+
+	name = "strange lenses"
+	desc = "A series of metallic lenses and chains."
+	icon = 'icons/obj/clothing/hats.dmi'
+	icon_state = "amp"
+	item_state = "amp"