diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index de544cc9ae..9c1dfbab0f 100644
--- a/code/datums/mind.dm
+++ b/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"
-
-
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index 1436e4e4a2..23ba1d0c55 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/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")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/suit.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi',
- )
+ species_restricted = list("Vox")
+ sprite_sheets = list("Vox" = 'icons/mob/species/vox/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")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/head.dmi',
- )
+ species_restricted = list("Vox")
+ sprite_sheets = list("Vox" = 'icons/mob/species/vox/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")
- sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/gloves.dmi',
- "Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi',
- )
+ species_restricted = list("Vox")
+ sprite_sheets = list("Vox" = 'icons/mob/species/vox/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","Vox Armalis")
- sprite_sheets = list(
- "Vox Armalis" = 'icons/mob/species/armalis/feet.dmi'
- )
+ species_restricted = list("Vox")
action_button_name = "Toggle the magclaws"
diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
index 051ef214f4..50f575228e 100644
--- a/code/modules/mob/living/carbon/human/human_species.dm
+++ b/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")
diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
index bf007450e3..ff99a53995 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm
+++ b/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
- )
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index 797d0b07c2..0f0a64a27f 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/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 << "\The [src] does not respond to you!"
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 << "\The [src] is far too large for you to pick up."
- 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
diff --git a/icons/mob/species/armalis/feet.dmi b/icons/mob/species/armalis/feet.dmi
deleted file mode 100644
index cbd83be702..0000000000
Binary files a/icons/mob/species/armalis/feet.dmi and /dev/null differ
diff --git a/icons/mob/species/armalis/gloves.dmi b/icons/mob/species/armalis/gloves.dmi
deleted file mode 100644
index 7d3eed317a..0000000000
Binary files a/icons/mob/species/armalis/gloves.dmi and /dev/null differ
diff --git a/icons/mob/species/armalis/head.dmi b/icons/mob/species/armalis/head.dmi
deleted file mode 100644
index ddb8859fd0..0000000000
Binary files a/icons/mob/species/armalis/head.dmi and /dev/null differ
diff --git a/icons/mob/species/armalis/held.dmi b/icons/mob/species/armalis/held.dmi
deleted file mode 100644
index 517709f33c..0000000000
Binary files a/icons/mob/species/armalis/held.dmi and /dev/null differ
diff --git a/icons/mob/species/armalis/mask.dmi b/icons/mob/species/armalis/mask.dmi
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/icons/mob/species/armalis/suit.dmi b/icons/mob/species/armalis/suit.dmi
deleted file mode 100644
index 05f9b082cf..0000000000
Binary files a/icons/mob/species/armalis/suit.dmi and /dev/null differ