Merge pull request #8638 from Zuhayr/vox

Removes the vox armalis.

code/datums/mind.dm

@@ -72,7 +72,7 @@ datum/mind
 				current.remove_changeling_powers()
 				current.verbs -= /datum/changeling/proc/EvolutionMenu
 			current.mind = null
-			
+
 			nanomanager.user_transferred(current, new_character) // transfer active NanoUI instances to new user
 		if(new_character.mind)		//remove any mind currently in our new body's mind variable
 			new_character.mind.current = null
@@ -1289,10 +1289,3 @@ datum/mind
 	..()
 	mind.assigned_role = "Juggernaut"
 	mind.special_role = "Cultist"
-
-/mob/living/simple_animal/vox/armalis/mind_initialize()
-	..()
-	mind.assigned_role = "Armalis"
-	mind.special_role = "Vox Raider"
-
-

code/modules/clothing/spacesuits/alien.dm

@@ -45,21 +45,15 @@
 	siemens_coefficient = 0.6
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list("Vox", "Vox Armalis")
+	species_restricted = list("Vox")
-	sprite_sheets = list(
+	sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
-		"Vox" = 'icons/mob/species/vox/suit.dmi',
-		"Vox Armalis" = 'icons/mob/species/armalis/suit.dmi',
-		)
 
 /obj/item/clothing/head/helmet/space/vox
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
 	siemens_coefficient = 0.6
 	flags = HEADCOVERSEYES|STOPPRESSUREDAMAGE
-	species_restricted = list("Vox","Vox Armalis")
+	species_restricted = list("Vox")
-	sprite_sheets = list(
+	sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi')
-		"Vox" = 'icons/mob/species/vox/head.dmi',
-		"Vox Armalis" = 'icons/mob/species/armalis/head.dmi',
-		)
 
 /obj/item/clothing/head/helmet/space/vox/pressure
 	name = "alien helmet"
@@ -137,22 +131,15 @@
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	item_color = "gloves-vox"
-	species_restricted = list("Vox","Vox Armalis")
+	species_restricted = list("Vox")
-	sprite_sheets = list(
+	sprite_sheets = list("Vox" = 'icons/mob/species/vox/gloves.dmi')
-		"Vox" = 'icons/mob/species/vox/gloves.dmi',
-		"Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi',
-		)
 /obj/item/clothing/shoes/magboots/vox
 
 	desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor."
 	name = "vox magclaws"
 	item_state = "boots-vox"
 	icon_state = "boots-vox"
-
+	species_restricted = list("Vox")
-	species_restricted = list("Vox","Vox Armalis")
-	sprite_sheets = list(
-		"Vox Armalis" = 'icons/mob/species/armalis/feet.dmi'
-		)
 
 	action_button_name = "Toggle the magclaws"
 

code/modules/mob/living/carbon/human/human_species.dm

@@ -22,10 +22,6 @@
 	h_style = "Short Vox Quills"
 	..(new_loc, "Vox")
 
-/mob/living/carbon/human/voxarmalis/New(var/new_loc)
-	h_style = "Bald"
-	..(new_loc, "Vox Armalis")
-
 /mob/living/carbon/human/diona/New(var/new_loc)
 	..(new_loc, "Diona")
 

code/modules/mob/living/carbon/human/species/outsider/vox.dm

@@ -54,44 +54,3 @@
 /datum/species/vox/get_random_name(var/gender)
 	var/datum/language/species_language = all_languages[default_language]
 	return species_language.get_random_name(gender)
-
-/datum/species/vox/armalis
-	name = "Vox Armalis"
-	name_plural = "Vox"
-	icobase = 'icons/mob/human_races/r_armalis.dmi'
-	deform = 'icons/mob/human_races/r_armalis.dmi'
-	rarity_value = 10
-
-	warning_low_pressure = 50
-	hazard_low_pressure = 0
-
-	cold_level_1 = 80
-	cold_level_2 = 50
-	cold_level_3 = 0
-
-	heat_level_1 = 2000
-	heat_level_2 = 3000
-	heat_level_3 = 4000
-
-	brute_mod = 0.2
-	burn_mod = 0.2
-
-	eyes = "blank_eyes"
-	breath_type = "nitrogen"
-	poison_type = "oxygen"
-
-	flags = IS_RESTRICTED | NO_SCAN | NO_BLOOD | NO_PAIN | HAS_EYE_COLOR
-
-	blood_color = "#2299FC"
-	flesh_color = "#808D11"
-
-	tail = "armalis_tail"
-	icon_template = 'icons/mob/human_races/r_armalis.dmi'
-
-	reagent_tag = IS_VOX
-
-	inherent_verbs = list(
-		/mob/living/carbon/human/proc/leap,
-		/mob/living/carbon/human/proc/gut,
-		/mob/living/carbon/human/proc/commune
-		)

code/modules/projectiles/guns/alien.dm

@@ -39,7 +39,7 @@
 /obj/item/weapon/gun/launcher/spikethrower/special_check(user)
 	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
-		if(H.species && H.species.name != "Vox" && H.species.name != "Vox Armalis")
+		if(H.species && H.species.name != "Vox")
 			user << "<span class='warning'>\The [src] does not respond to you!</span>"
 			return 0
 	return ..()
@@ -51,56 +51,3 @@
 	if(spikes < 1) return null
 	spikes--
 	return new /obj/item/weapon/spike(src)
-
-//This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites.
-/obj/item/weapon/gun/energy/noisecannon
-	name = "alien heavy cannon"
-	desc = "It's some kind of enormous alien weapon, as long as a man is tall."
-
-	icon = 'icons/obj/gun.dmi' //Actual on-sprite is handled by icon_override.
-	icon_state = "noisecannon"
-	item_state = "noisecannon"
-	recoil = 1
-
-	force = 10
-	projectile_type = /obj/item/projectile/energy/sonic
-	cell_type = /obj/item/weapon/cell/super
-	fire_delay = 40
-	fire_sound = 'sound/effects/basscannon.ogg'
-
-	var/mode = 1
-
-	sprite_sheets = list(
-		"Vox Armalis" = 'icons/mob/species/armalis/held.dmi'
-		)
-
-/obj/item/weapon/gun/energy/noisecannon/attack_hand(mob/user as mob)
-	if(loc != user)
-		var/mob/living/carbon/human/H = user
-		if(istype(H))
-			if(H.species.name == "Vox Armalis")
-				..()
-				return
-		user << "<span class='warning'>\The [src] is far too large for you to pick up.</span>"
-		return
-
-/obj/item/weapon/gun/energy/noisecannon/update_icon()
-	return
-
-//Projectile.
-/obj/item/projectile/energy/sonic
-	name = "distortion"
-	icon = 'icons/obj/machines/particle_accelerator2.dmi'
-	icon_state = "particle"
-	damage = 60
-	damage_type = BRUTE
-	check_armour = "bullet"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-
-	embed = 0
-	weaken = 5
-	stun = 5
-
-/obj/item/projectile/energy/sonic/proc/split()
-	//TODO: create two more projectiles to either side of this one, fire at targets to the side of target turf.
-	return