From 5ffb4a15ed3235ad64cd594f2c04a6a4281e3058 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Wed, 14 May 2014 23:00:13 -0400
Subject: [PATCH] Moar armalis fixes

---
 code/modules/customitems/item_spawning.dm     | 2 +-
 code/modules/mob/living/carbon/human/human.dm | 2 +-
 code/modules/mob/living/carbon/human/life.dm  | 6 +++---
 code/modules/mob/living/carbon/species.dm     | 2 +-
 code/modules/mob/new_player/new_player.dm     | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index 6dd1c1ce683..41764f87c7e 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -1,5 +1,5 @@
 /proc/EquipRacialItems(mob/living/carbon/human/M)
-	if(istype(M,/mob/living/carbon/human/vox))
+	if(M.species.name == "Vox" || M.species.name == "Vox Armalis")
 		M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(M), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
 		M.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(M), slot_wear_mask)
 		M.equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(M), slot_back)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3b105cacf0c..a95b44460d7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -29,7 +29,7 @@
 	h_style = "Short Vox Quills"
 	..(new_loc, "Vox")
 
-/mob/living/carbon/human/vox/armalis/New(var/new_loc)
+/mob/living/carbon/human/voxarmalis/New(var/new_loc)
 	h_style = "Bald"
 	..(new_loc, "Vox Armalis")
 
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 5727ceaa815..eee1cf5aa46 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -488,7 +488,7 @@
 		// Nitrogen, for Vox.
 		var/Nitrogen_pp = (breath.nitrogen/breath.total_moles())*breath_pressure
 
-		if(O2_pp < safe_oxygen_min && !istype(src,/mob/living/carbon/human/vox)) 	// Too little oxygen
+		if(O2_pp < safe_oxygen_min && (species != "Vox" || species != "Vox Armalis")) 	// Too little oxygen
 			if(prob(20))
 				spawn(0) emote("gasp")
 			if(O2_pp > 0)
@@ -506,7 +506,7 @@
 			oxyloss += 5*ratio
 			oxygen_used = breath.oxygen*ratio/6
 			oxygen_alert = max(oxygen_alert, 1)*/
-		else if(Nitrogen_pp < safe_oxygen_min && istype(src,/mob/living/carbon/human/vox))  //Vox breathe nitrogen, not oxygen.
+		else if(Nitrogen_pp < safe_oxygen_min && (species == "Vox" || species == "Vox Armalis"))  //Vox breathe nitrogen, not oxygen.
 
 			if(prob(20))
 				spawn(0) emote("gasp")
@@ -551,7 +551,7 @@
 			if(reagents)
 				reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
 			toxins_alert = max(toxins_alert, 1)
-		else if(O2_pp > vox_oxygen_max && istype(src,/mob/living/carbon/human/vox)) //Oxygen is toxic to vox.
+		else if(O2_pp > vox_oxygen_max && (species == "Vox" || species == "Vox Armalis")) //Oxygen is toxic to vox.
 			var/ratio = (breath.oxygen/vox_oxygen_max) * 1000
 			adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
 			toxins_alert = max(toxins_alert, 1)
diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm
index 6c14a86adec..930115dc694 100644
--- a/code/modules/mob/living/carbon/species.dm
+++ b/code/modules/mob/living/carbon/species.dm
@@ -218,7 +218,7 @@
 	icobase = 'icons/mob/human_races/r_armalis.dmi'
 	deform = 'icons/mob/human_races/r_armalis.dmi'
 	language = "Vox-pidgin"
-
+	path = /mob/living/carbon/human/voxarmalis
 	warning_low_pressure = 50
 	hazard_low_pressure = 0
 
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 4c41c209e81..bf0e4e49420 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -388,6 +388,8 @@
 						new_character = new /mob/living/carbon/human/diona(loc)
 					if("Vox")
 						new_character = new /mob/living/carbon/human/vox(loc)
+					if("Vox Armalis")
+						new_character = new /mob/living/carbon/human/voxarmalis(loc)
 					if("Kidan")
 						new_character = new /mob/living/carbon/human/kidan(loc)
 					if("Grey")