Merge branch 'master' of https://github.com/ZomgPonies/Paradise

code/modules/clothing/under/miscellaneous.dm

@@ -434,6 +434,65 @@
 /obj/item/clothing/under/bane
 	name = "Bane Harness"
 	desc = "Wear this harness to become the bane of the station."
-	icon_state = "bane_harness"
+	icon_state = "bane"
 	item_state = "bane"
-	_color = "bane"
+	_color = "bane"
+
+/obj/item/clothing/under/vox_grey
+	name = "Grey Vox Jumpsuit"
+	desc = "An assistant's jumpsuit ripped to better fit a vox."
+	icon_state = "vgrey"
+	item_state = "vgrey"
+	_color = "vgrey"
+
+/obj/item/clothing/under/vox_robotics
+	name = "Vox Robotics Jumpsuit"
+	desc = "A roboticist's jumpsuit ripped to better fit a vox."
+	icon_state = "vrobotics"
+	item_state = "vrobotics"
+	_color = "vrobotics"
+
+/obj/item/clothing/under/vox_toxins
+	name = "Vox Toxins Jumpsuit"
+	desc = "A Toxin Researcher's jumpsuit ripped to better fit a vox."
+	icon_state = "vtoxinswhite"
+	item_state = "vtoxinswhite"
+	_color = "vtoxinswhite"
+
+/obj/item/clothing/under/vox_atmos
+	name = "Vox Atmos Jumpsuit"
+	desc = "An Atmos Tech's jumpsuit ripped to better fit a vox."
+	icon_state = "vatmos"
+	item_state = "vatmos"
+	_color = "vatmos"
+
+/obj/item/clothing/under/vox_engi
+	name = "Vox Engineer Jumpsuit"
+	desc = "An Engineer's jumpsuit ripped to better fit a vox."
+	icon_state = "vengine"
+	item_state = "vengine"
+	_color = "vengine"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
+
+/obj/item/clothing/under/vox_toxins
+	name = "Vox Security Jumpsuit"
+	desc = "A Security Uniform ripped to better fit a vox."
+	icon_state = "vred"
+	item_state = "vred"
+	_color = "vred"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/under/vox_toxins
+	name = "Vox Chemist Jumpsuit"
+	desc = "A Security Uniform ripped to better fit a vox."
+	icon_state = "vchem"
+	item_state = "vchem"
+	_color = "vchem"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+
+/obj/item/clothing/under/psyjump
+	name = "Psychic Amp Jumpsuit"
+	desc = "A suit made of strange materials."
+	icon_state = "psyamp"
+	item_state = "psyamp"
+	_color = "psyamp"

code/modules/recycling/sortingmachinery.dm

@@ -162,9 +162,6 @@
 	//The whole system for the sorttype var is determined based on the order of this list,
 	//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude
 
-	//If you don't want to fuck up disposals, add to this list, and don't change the order.
-	//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
-
 	w_class = 1
 	item_state = "electronic"
 	flags = FPRINT | TABLEPASS | CONDUCT