Merge pull request #1960 from KasparoVy/master

Adds Vox Sprites for all Remaining Clothing/Under/ + Ghost Uniform

code/modules/clothing/clothing.dm

@@ -371,6 +371,10 @@ BLIND     // can't see anything
 	permeability_coefficient = 0.90
 	slot_flags = SLOT_ICLOTHING
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		)
 	var/has_sensor = 1//For the crew computer 2 = unable to change mode
 	var/sensor_mode = 0
 		/*

code/modules/clothing/under/color.dm

@@ -1,9 +1,5 @@
 /obj/item/clothing/under/color
 	desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 
 /obj/item/clothing/under/color/random/New()

code/modules/clothing/under/jobs/civilian.dm

@@ -7,10 +7,6 @@
 	item_state = "ba_suit"
 	_color = "ba_suit"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
@@ -19,11 +15,6 @@
 	item_state = "caparmor"
 	_color = "captain"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
-
 
 /obj/item/clothing/under/rank/cargo
 	name = "quartermaster's jumpsuit"
@@ -32,10 +23,6 @@
 	item_state = "lb_suit"
 	_color = "qm"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 
 /obj/item/clothing/under/rank/cargotech
@@ -45,10 +32,6 @@
 	item_state = "lb_suit"
 	_color = "cargo"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 
 /obj/item/clothing/under/rank/chaplain
@@ -58,11 +41,6 @@
 	item_state = "bl_suit"
 	_color = "chapblack"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
-
 
 /obj/item/clothing/under/rank/chef
 	desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
@@ -70,11 +48,6 @@
 	icon_state = "chef"
 	_color = "chef"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
-
 
 /obj/item/clothing/under/rank/clown
 	name = "clown suit"
@@ -92,10 +65,6 @@
 	item_state = "b_suit"
 	_color = "hop"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/head_of_personnel_whimsy
 	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
@@ -113,11 +82,6 @@
 	_color = "hydroponics"
 	permeability_coefficient = 0.50
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
-
 
 /obj/item/clothing/under/rank/internalaffairs
 	desc = "The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
@@ -126,10 +90,6 @@
 	item_state = "internalaffairs"
 	_color = "internalaffairs"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/ntrep
 	desc = "A well-ironed dress shirt and matching set of black pants."
@@ -138,11 +98,6 @@
 	item_state = "internalaffairs"
 	_color = "internalaffairs"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
-
 
 /obj/item/clothing/under/rank/janitor
 	desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
@@ -151,10 +106,6 @@
 	_color = "janitor"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 
 /obj/item/clothing/under/lawyer
@@ -166,37 +117,21 @@
 	icon_state = "lawyer_black"
 	item_state = "lawyer_black"
 	_color = "lawyer_black"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/lawyer/female
 	icon_state = "black_suit_fem"
 	item_state = "black_suit_fem"
 	_color = "black_suit_fem"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/lawyer/red
 	icon_state = "lawyer_red"
 	item_state = "lawyer_red"
 	_color = "lawyer_red"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/lawyer/blue
 	icon_state = "lawyer_blue"
 	item_state = "lawyer_blue"
 	_color = "lawyer_blue"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/lawyer/bluesuit
 	name = "Blue Suit"
@@ -204,20 +139,12 @@
 	icon_state = "bluesuit"
 	item_state = "bluesuit"
 	_color = "bluesuit"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/lawyer/purpsuit
 	name = "Purple Suit"
 	icon_state = "lawyer_purp"
 	item_state = "lawyer_purp"
 	_color = "lawyer_purp"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/lawyer/oldman
 	name = "Old Man's Suit"
@@ -225,10 +152,6 @@
 	icon_state = "oldman"
 	item_state = "oldman"
 	_color = "oldman"
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 
 /obj/item/clothing/under/librarian
@@ -238,11 +161,6 @@
 	item_state = "red_suit"
 	_color = "red_suit"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
-
 
 /obj/item/clothing/under/mime
 	name = "mime's outfit"
@@ -260,14 +178,10 @@
 	item_state = "miner"
 	_color = "miner"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/barber
 	desc = "It's a barber's uniform."
 	name = "barber's uniform"
 	icon_state = "barber"
 	item_state = "barber"
-	_color = "barber"
+	_color = "barber"

code/modules/clothing/under/jobs/engineering.dm

@@ -7,10 +7,6 @@
 	_color = "chief"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -19,10 +15,6 @@
 	item_state = "atmos_suit"
 	_color = "atmos"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/engineer
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -32,10 +24,6 @@
 	_color = "engine"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/roboticist
 	desc = "It's a slimming black with reinforced seams; great for industrial work."
@@ -44,14 +32,10 @@
 	item_state = "robotics"
 	_color = "robotics"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/mechanic
 	desc = "It's a pair of overalls worn by mechanics."
 	name = "mechanic's overalls"
 	icon_state = "mechanic"
 	item_state = "mechanic"
-	_color = "mechanic"
+	_color = "mechanic"

code/modules/clothing/under/jobs/medsci.dm

@@ -9,10 +9,6 @@
 	_color = "director"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/scientist
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -23,10 +19,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/chemist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
@@ -37,10 +29,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /*
  * Medical
@@ -54,10 +42,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/geneticist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
@@ -68,10 +52,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/virologist
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -82,10 +62,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/nursesuit
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
@@ -96,10 +72,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/nurse
 	desc = "A dress commonly worn by the nursing staff in the medical department."
@@ -110,10 +82,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/orderly
 	desc = "A white suit to be worn by orderly people who love orderly things."
@@ -124,10 +92,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
@@ -138,10 +102,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/medical/blue
 	name = "medical scrubs"
@@ -149,10 +109,6 @@
 	icon_state = "scrubsblue"
 	_color = "scrubsblue"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/medical/green
 	name = "medical scrubs"
@@ -160,10 +116,6 @@
 	icon_state = "scrubsgreen"
 	_color = "scrubsgreen"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/medical/purple
 	name = "medical scrubs"
@@ -171,10 +123,6 @@
 	icon_state = "scrubspurple"
 	_color = "scrubspurple"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/medical/mortician
 	name = "coroner's scrubs"
@@ -182,10 +130,6 @@
 	icon_state = "scrubsblack"
 	_color = "scrubsblack"
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 //paramedic
 /obj/item/clothing/under/rank/medical/paramedic
@@ -197,10 +141,6 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
 	flags = ONESIZEFITSALL
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /obj/item/clothing/under/rank/psych
 	desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."

code/modules/clothing/under/jobs/security.dm

@@ -5,14 +5,6 @@
  *		Head of Security
  */
 
-/*
- * Making everything but the jackets fit Vox
- */
-/obj/item/clothing/under/rank
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
-		)
 
 /*
  * Security

code/modules/clothing/under/miscellaneous.dm

@@ -209,7 +209,7 @@
 	desc = "A formal black suit and red tie, intended for the station's finest."
 	icon_state = "really_black_suit"
 	item_state = "bl_suit"
-	_color = "black_suit"
+	_color = "really_black_suit"
 
 /obj/item/clothing/under/suit_jacket/female
 	name = "executive suit"
@@ -224,7 +224,6 @@
 	icon_state = "red_suit"
 	item_state = "r_suit"
 	_color = "red_suit"
-	species_fit = list("Vox")
 	flags = ONESIZEFITSALL
 
 /obj/item/clothing/under/suit_jacket/navy
@@ -563,17 +562,17 @@
 	_color = "vengine"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 
-/obj/item/clothing/under/vox_toxins
+/obj/item/clothing/under/vox_sec
 	name = "Vox Security Jumpsuit"
-	desc = "A Security Uniform ripped to better fit a vox."
+	desc = "A Security officer's jumpsuit 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
+/obj/item/clothing/under/vox_chem
 	name = "Vox Chemist Jumpsuit"
-	desc = "A Security Uniform ripped to better fit a vox."
+	desc = "A Chemist's jumpsuit ripped to better fit a vox."
 	icon_state = "vchem"
 	item_state = "vchem"
 	_color = "vchem"