Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

code/game/gamemodes/heist/heist.dm

@@ -102,6 +102,9 @@ var/global/vox_kills = 0 //Used to check the Inviolate.
 		vox.set_species("Vox")
 		vox.add_language("Vox-pidgin")
 		vox.h_style = "Short Vox Quills"
+		vox.flavor_text = ""
+		for(var/datum/organ/external/limb in vox.organs)
+			limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
 		vox.equip_vox_raider()
 		vox.regenerate_icons()
 

code/modules/admin/verbs/vox_raiders.dm

@@ -32,7 +32,7 @@ var/global/vox_tick = 1
 			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/pressure(src), slot_head)
 			equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(src), slot_belt)
 			equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
-			equip_to_slot_or_del(new /obj/item/weapon/storage/box/emps(src), slot_l_store)
+			equip_to_slot_or_del(new /obj/item/weapon/storage/box/emps(src), slot_r_hand)
 			equip_to_slot_or_del(new /obj/item/device/multitool(src), slot_l_hand)
 
 

code/modules/clothing/spacesuits/alien.dm

@@ -92,6 +92,9 @@
 
 	return ..()
 
+/obj/item/clothing/under/vox
+	has_sensor = 0
+
 /obj/item/clothing/under/vox/vox_casual
 	name = "alien clothing"
 	desc = "This doesn't look very comfortable."

code/modules/mob/new_player/sprite_accessories.dm

@@ -66,9 +66,9 @@
 		name = "Shoulder-length Hair Alt"
 		icon_state = "hair_longfringe"
 
-	longish
+	/*longish
 		name = "Longer Hair"
-		icon_state = "hair_b2"
+		icon_state = "hair_b2"*/
 
 	longer
 		name = "Long Hair"