Merge pull request #3970 from Anewbe/vox_scrap

Ports Bay's Vox Scrap armor, moves some clothing files

code/modules/clothing/suits/alien.dm

@@ -1,28 +0,0 @@
-//Unathi clothing.
-/obj/item/clothing/suit/unathi/robe
-	name = "roughspun robes"
-	desc = "A traditional Unathi garment."
-	icon_state = "robe-unathi"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
-	flags_inv = HIDETIE|HIDEHOLSTER
-
-/obj/item/clothing/suit/unathi/mantle
-	name = "hide mantle"
-	desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle."
-	icon_state = "mantle-unathi"
-	body_parts_covered = UPPER_TORSO
-
-//Taj clothing.
-/obj/item/clothing/suit/tajaran/furs
-	name = "heavy furs"
-	desc = "A traditional Zhan-Khazan garment."
-	icon_state = "zhan_furs"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
-
-/obj/item/clothing/head/tajaran/scarf
-	name = "headscarf"
-	desc = "A scarf of coarse fabric. Seems to have ear-holes."
-	icon_state = "zhan_scarf"
-	item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white")
-	body_parts_covered = HEAD|FACE

code/modules/clothing/suits/aliens/tajara.dm

@@ -0,0 +1,13 @@
+/obj/item/clothing/suit/tajaran/furs
+	name = "heavy furs"
+	desc = "A traditional Zhan-Khazan garment."
+	icon_state = "zhan_furs"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
+
+/obj/item/clothing/head/tajaran/scarf	//This stays in /suits because it goes with the furs above
+	name = "headscarf"
+	desc = "A scarf of coarse fabric. Seems to have ear-holes."
+	icon_state = "zhan_scarf"
+	item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white")
+	body_parts_covered = HEAD|FACE

code/modules/clothing/suits/aliens/unathi.dm

@@ -0,0 +1,13 @@
+//Unathi clothing.
+/obj/item/clothing/suit/unathi/robe
+	name = "roughspun robes"
+	desc = "A traditional Unathi garment."
+	icon_state = "robe-unathi"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+	flags_inv = HIDETIE|HIDEHOLSTER
+
+/obj/item/clothing/suit/unathi/mantle
+	name = "hide mantle"
+	desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle."
+	icon_state = "mantle-unathi"
+	body_parts_covered = UPPER_TORSO

code/modules/clothing/suits/aliens/vox.dm

@@ -0,0 +1,10 @@
+/obj/item/clothing/suit/armor/vox_scrap
+	name = "rusted metal armor"
+	desc = "A hodgepodge of various pieces of metal scrapped together into a rudimentary vox-shaped piece of armor."
+	allowed = list(/obj/item/weapon/gun, /obj/item/weapon/tank)
+	armor = list(melee = 70, bullet = 30, laser = 20,energy = 5, bomb = 40, bio = 0, rad = 0) //Higher melee armor versus lower everything else.
+	icon_state = "vox-scrap"
+	icon_state = "vox-scrap"
+	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS
+	species_restricted = list("Vox")
+	siemens_coefficient = 1 //Its literally metal

polaris.dme

@@ -1293,7 +1293,6 @@
 #include "code\modules\clothing\spacesuits\void\station.dm"
 #include "code\modules\clothing\spacesuits\void\void.dm"
 #include "code\modules\clothing\spacesuits\void\wizard.dm"
-#include "code\modules\clothing\suits\alien.dm"
 #include "code\modules\clothing\suits\armor.dm"
 #include "code\modules\clothing\suits\bio.dm"
 #include "code\modules\clothing\suits\jobs.dm"
@@ -1304,7 +1303,10 @@
 #include "code\modules\clothing\suits\toggles.dm"
 #include "code\modules\clothing\suits\utility.dm"
 #include "code\modules\clothing\suits\wiz_robe.dm"
-#include "code\modules\clothing\suits\xenos\seromi.dm"
+#include "code\modules\clothing\suits\aliens\seromi.dm"
+#include "code\modules\clothing\suits\aliens\tajara.dm"
+#include "code\modules\clothing\suits\aliens\unathi.dm"
+#include "code\modules\clothing\suits\aliens\vox.dm"
 #include "code\modules\clothing\under\color.dm"
 #include "code\modules\clothing\under\miscellaneous.dm"
 #include "code\modules\clothing\under\pants.dm"