WIP

code/game/machinery/vending/vendor_types/crew/medical.dm

@@ -158,7 +158,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
 		list("Researcher Uniform", 0, /obj/item/clothing/under/boiler/offwhite, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
 
 		list("ARMOR (CHOOSE 1)", 0, null, null, null),
-		list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat/researcher, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
 		list("Snowcoat", 0, /obj/item/clothing/suit/storage/snow_suit/doctor, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
 
 		list("HELMET", 0, null, null, null),

code/modules/clothing/suits/bio.dm

@@ -75,57 +75,3 @@
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_HANDS|BODY_FLAG_FEET
 	flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
 
-//Virology biosuit, green stripe
-/obj/item/clothing/head/bio_hood/virology
-	icon_state = "bio_virology"
-
-/obj/item/clothing/suit/bio_suit/virology
-	icon_state = "bio_virology"
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
-	flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
-
-//Security biosuit, grey with red stripe across the chest
-/obj/item/clothing/head/bio_hood/security
-	icon_state = "bio_security"
-
-/obj/item/clothing/suit/bio_suit/security
-	icon_state = "bio_security"
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
-	flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
-
-//Janitor's biosuit, grey with purple arms
-/obj/item/clothing/head/bio_hood/janitor
-	icon_state = "bio_janitor"
-
-/obj/item/clothing/suit/bio_suit/janitor
-	icon_state = "bio_janitor"
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
-	flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
-
-
-//Scientist's biosuit, white with a pink-ish hue
-/obj/item/clothing/head/bio_hood/scientist
-	icon_state = "bio_scientist"
-
-/obj/item/clothing/suit/bio_suit/scientist
-	icon_state = "bio_scientist"
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
-	flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
-
-//CMO's biosuit, blue stripe
-/obj/item/clothing/suit/bio_suit/cmo
-	icon_state = "bio_cmo"
-	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS
-	flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
-
-/obj/item/clothing/head/bio_hood/cmo
-	icon_state = "bio_cmo"
-
-
-//Plague Dr mask can be found in clothing/masks/gasmask.dm
-/obj/item/clothing/suit/bio_suit/plaguedoctorsuit
-	name = "Plague doctor suit"
-	desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
-	icon_state = "plaguedoctor"
-	item_state = "bio_suit"
-	flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL

code/modules/clothing/suits/civilian_suit.dm

@@ -0,0 +1,223 @@
+//==================Corporate Liaison==================\\
+
+/obj/item/clothing/suit/storage/jacket/marine/vest
+	name = "casual vest"
+	desc = "A brown vest."
+	icon_state = "vest_brown"
+	item_state = "vest_brown"
+	has_buttons = FALSE
+	flags_atom = NO_SNOW_TYPE
+
+/obj/item/clothing/suit/storage/jacket/marine/vest/tan
+	name = "casual vest"
+	desc = "A tan vest."
+	icon_state = "vest_tan"
+	item_state = "vest_tan"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/vest/grey
+	name = "casual vest"
+	desc = "A casual grey vest."
+	icon_state = "vest_grey"
+	item_state = "vest_grey"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/corporate
+	name = "suit jacket"
+	desc = "A khaki suit jacket."
+	icon_state = "corporate_ivy"
+	item_state = "corporate_ivy"
+	has_buttons = FALSE
+	flags_atom = NO_SNOW_TYPE
+
+/obj/item/clothing/suit/storage/jacket/marine/corporate/formal
+	name = "suit jacket"
+	desc = "An ivory suit jacket; a Weyland-Yutani corporate badge is attached to the right lapel."
+	icon_state = "corporate_formal"
+	item_state = "corporate_formal"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/corporate/black
+	name = "suit jacket"
+	desc = "A black suit jacket."
+	icon_state = "corporate_black"
+	item_state = "corporate_black"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/corporate/brown
+	name = "suit jacket"
+	desc = "A brown suit jacket."
+	icon_state = "corporate_brown"
+	item_state = "corporate_brown"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/corporate/blue
+	name = "suit jacket"
+	desc = "A blue suit jacket."
+	icon_state = "corporate_blue"
+	item_state = "corporate_blue"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/bomber
+	name = "bomber jacket"
+	desc = "A khaki bomber jacket popular among stationeers and blue-collar workers everywhere."
+	icon_state = "jacket_khaki"
+	item_state = "jacket_khaki"
+	has_buttons = FALSE
+	flags_atom = NO_SNOW_TYPE
+
+/obj/item/clothing/suit/storage/jacket/marine/bomber/red
+	name = "bomber jacket"
+	desc = "A reddish-brown bomber jacket popular among stationeers and blue-collar workers everywhere."
+	icon_state = "jacket_red"
+	item_state = "jacket_red"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/jacket/marine/bomber/grey
+	name = "bomber jacket"
+	desc = "A blue-grey bomber jacket popular among stationeers and blue-collar workers everywhere."
+	icon_state = "jacket_grey"
+	item_state = "jacket_grey"
+	has_buttons = FALSE
+
+/obj/item/clothing/suit/storage/apron/overalls
+	name = "coveralls"
+	desc = "A pair of denim overalls. With a large pocket in the front these overalls are popular with workers of all kinds."
+	icon_state = "overalls"
+	item_state = "overalls"
+	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
+	allowed = list(
+		/obj/item/weapon/gun,
+		/obj/item/ammo_magazine,
+		/obj/item/ammo_casing,
+		/obj/item/weapon/baton,
+		/obj/item/handcuffs,
+		/obj/item/storage/fancy/cigarettes,
+		/obj/item/tool/lighter,
+		/obj/item/device/taperecorder,
+
+		/obj/item/device/flashlight,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio,
+		/obj/item/tank/emergency_oxygen,
+		/obj/item/tool/crowbar,
+		/obj/item/tool/pen,
+	)
+	valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL)
+
+/obj/item/clothing/suit/storage/apron/overalls/tan
+	name = "coveralls"
+	desc = "A pair of tan overalls. With a large pocket in the front these overalls are popular with workers of all kinds."
+	icon_state = "overalls_tan"
+	item_state = "overalls_tan"
+
+/obj/item/clothing/suit/storage/apron/overalls/red
+	name = "coveralls"
+	desc = "A pair of reddish-brown overalls. With a large pocket in the front these overalls are popular with workers of all kinds."
+	icon_state = "overalls_red"
+	item_state = "overalls_red"
+
+
+/obj/item/clothing/suit/apron
+	name = "apron"
+	desc = "A basic blue apron."
+	icon_state = "apron"
+	item_state = "apron"
+	blood_overlay_type = "armor"
+	flags_armor_protection = 0
+	allowed = list (
+		/obj/item/reagent_container/spray/plantbgone,
+		/obj/item/device/analyzer/plant_analyzer,
+		/obj/item/seeds,/obj/item/reagent_container/glass/fertilizer,
+		/obj/item/tool/minihoe,
+
+		/obj/item/device/flashlight,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio,
+		/obj/item/tank/emergency_oxygen,
+		/obj/item/tool/crowbar,
+		/obj/item/tool/pen,
+	)
+
+/obj/item/clothing/suit/chef/classic
+	name = "A classic chef's apron."
+	desc = "A basic, dull, white chef's apron."
+	icon_state = "apronchef"
+	item_state = "apronchef"
+	blood_overlay_type = "armor"
+	flags_armor_protection = 0
+	allowed = list (
+		/obj/item/tool/kitchen/knife,
+		/obj/item/tool/kitchen/knife/butcher,
+
+		/obj/item/device/flashlight,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio,
+		/obj/item/tank/emergency_oxygen,
+		/obj/item/tool/crowbar,
+		/obj/item/tool/pen,
+	)
+
+//Engineering
+/obj/item/clothing/suit/storage/hazardvest
+	name = "orange hazard vest"
+	desc = "An orange high-visibility vest used in work zones."
+	icon_state = "hazard"
+	item_state = "hazard"
+	blood_overlay_type = "armor"
+	allowed = list (
+		/obj/item/device/analyzer,
+		/obj/item/device/multitool,
+		/obj/item/device/pipe_painter,
+		/obj/item/device/radio,
+		/obj/item/device/t_scanner,
+		/obj/item/tool/crowbar,
+		/obj/item/tool/screwdriver,
+		/obj/item/tool/weldingtool,
+		/obj/item/tool/wirecutters,
+		/obj/item/tool/wrench,
+		/obj/item/clothing/mask/gas,
+
+		/obj/item/weapon/gun,
+		/obj/item/storage/fancy/cigarettes,
+		/obj/item/tool/lighter,
+		/obj/item/weapon/baton,
+		/obj/item/handcuffs,
+		/obj/item/device/binoculars,
+		/obj/item/attachable/bayonet,
+		/obj/item/storage/belt/gun/m4a3,
+		/obj/item/storage/belt/gun/m44,
+		/obj/item/storage/belt/gun/mateba,
+		/obj/item/storage/belt/gun/smartpistol,
+
+		/obj/item/device/flashlight,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio,
+		/obj/item/tank/emergency_oxygen,
+		/obj/item/tool/crowbar,
+		/obj/item/tool/crew_monitor,
+		/obj/item/tool/pen,
+		/obj/item/storage/large_holster/machete,
+		/obj/item/storage/large_holster/katana,
+		/obj/item/device/motiondetector,
+	)
+	flags_armor_protection = BODY_FLAG_CHEST
+	valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL)
+
+/obj/item/clothing/suit/storage/hazardvest/blue
+	name = "blue hazard vest"
+	desc = "A blue high-visibility vest used in work zones."
+	icon_state = "hazard_blue"
+	item_state = "hazard_blue"
+
+/obj/item/clothing/suit/storage/hazardvest/yellow
+	name = "yellow hazard vest"
+	desc = "A yellow high-visibility vest used in work zones."
+	icon_state = "hazard_yellow"
+	item_state = "hazard_yellow"
+
+/obj/item/clothing/suit/storage/hazardvest/black
+	name = "black hazard vest"
+	desc = "A niche-market, black, allegedly high-visibility vest supposedly used in work zones. Features extra-reflective tapes. The etiquette on the vest insists that it's fully compliant with all the United American workplace safety standards."
+	icon_state = "hazard_black"
+	item_state = "hazard_black"