1.6.3 Ports of Bay's suit clothing

- Whole scale port of clothing items from bay.
- Solgov armor vests, as well as a 'tactical vest' (None avail. in game)
- Alternate atmos, engineering, mining, medical, and security suits. (Due to their stats, only available through cargo).
- Three new hazard vest colors, blue, green, white. (Load out option)
- 'Service jackets' Black and Green (Load out option).
- Solgov fleet dress uniforms, surgical apron, marshal jacket (None avail. in game, may change with the surgical apron in the future.)
- As a side change the Construction, HAZMAT, Biohazard, and EMT voidsuits are also now available from cargo. HAZMAT and Biohzard come with slightly adjusted stats to sort of reflect what they are designed for.

code/datums/supplypacks/voidsuits.dm

@@ -21,6 +21,20 @@
 	containername = "Atmospheric voidsuit crate"
 	access = access_atmospherics
 
+/datum/supply_packs/voidsuits/atmos/alt
+	name = "Heavy Duty Atmospheric voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/atmos/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/atmos/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2,
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Heavy Duty Atmospheric voidsuit crate"
+	access = access_atmospherics
+
 /datum/supply_packs/voidsuits/engineering
 	name = "Engineering voidsuits"
 	contains = list(
@@ -35,6 +49,48 @@
 	containername = "Engineering voidsuit crate"
 	access = access_engine_equip
 
+/datum/supply_packs/voidsuits/engineering/construction
+	name = "Engineering Construction voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/engineering/construction = 2,
+			/obj/item/clothing/head/helmet/space/void/engineering/construction = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Engineering Construction voidsuit crate"
+	access = access_engine_equip
+
+/datum/supply_packs/voidsuits/engineering/hazmat
+	name = "Engineering Hazmat voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/engineering/hazmat = 2,
+			/obj/item/clothing/head/helmet/space/void/engineering/hazmat = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 45
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Engineering Hazmat voidsuit crate"
+	access = access_engine_equip
+
+/datum/supply_packs/voidsuits/engineering/alt
+	name = "Reinforced Engineering voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/engineering/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/engineering/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Reinforced Engineering voidsuit crate"
+	access = access_engine_equip
+
 /datum/supply_packs/voidsuits/medical
 	name = "Medical voidsuits"
 	contains = list(
@@ -49,6 +105,48 @@
 	containername = "Medical voidsuit crate"
 	access = access_medical_equip
 
+/datum/supply_packs/voidsuits/medical/emt
+	name = "Medical EMT voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/medical/emt = 2,
+			/obj/item/clothing/head/helmet/space/void/medical/emt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Medical EMT voidsuit crate"
+	access = access_medical_equip
+
+/datum/supply_packs/voidsuits/medical/bio
+	name = "Medical Biohazard voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/medical/bio = 2,
+			/obj/item/clothing/head/helmet/space/void/medical/bio = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 45
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Medical Biohazard voidsuit crate"
+	access = access_medical_equip
+
+/datum/supply_packs/voidsuits/medical/alt
+	name = "Vey-Med Medical voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/medical/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/medical/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Vey-Med Medical voidsuit crate"
+	access = access_medical_equip
+
 /datum/supply_packs/voidsuits/security
 	name = "Security voidsuits"
 	contains = list(
@@ -62,6 +160,32 @@
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security voidsuit crate"
 
+/datum/supply_packs/voidsuits/security/crowd
+	name = "Security Crowd Control voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/security/riot = 2,
+			/obj/item/clothing/head/helmet/space/void/security/riot = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Security Crowd Control voidsuit crate"
+
+/datum/supply_packs/voidsuits/security/alt
+	name = "Security EVA Riot voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/security/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/security/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Security EVA Riot voidsuit crate"
+
 /datum/supply_packs/voidsuits/supply
 	name = "Mining voidsuits"
 	contains = list(
@@ -73,4 +197,17 @@
 	cost = 40
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Mining voidsuit crate"
+	access = access_mining
+
+/datum/supply_packs/voidsuits/supply/alt
+	name = "Frontier Mining voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/mining/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/mining/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Frontier Mining voidsuit crate"
 	access = access_mining

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -87,9 +87,17 @@
 	path = /obj/item/clothing/suit/storage/trench/grey
 
 /datum/gear/suit/hazard_vest
-	display_name = "hazard vest"
+	display_name = "hazard vest selection"
 	path = /obj/item/clothing/suit/storage/hazardvest
 
+/datum/gear/suit/hazard_vest/New()
+	..()
+	var/list/hazards = list()
+	for(var/hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest))
+		var/obj/item/clothing/suit/storage/hazardvest/hazardvest = hazard_style
+		hazards[initial(hazardvest.name)] = hazardvest
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hazards))
+
 /datum/gear/suit/hoodie
 	display_name = "hoodie selection"
 	path = /obj/item/clothing/suit/storage/toggle/hoodie
@@ -327,3 +335,16 @@
 /datum/gear/suit/denim_vest/corporate
 	display_name = "denim vest, corporate"
 	path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
+
+/datum/gear/suit/service
+	display_name = "service jacket selection"
+	path = /obj/item/clothing/suit/storage/service
+
+/datum/gear/suit/service/New()
+	..()
+	var/list/services = list()
+	for(var/service_style in typesof(/obj/item/clothing/suit/storage/service))
+		var/obj/item/clothing/suit/storage/service/service = service_style
+		services[initial(service.name)] = service
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(services))
+

code/modules/clothing/spacesuits/void/station.dm

@@ -7,16 +7,6 @@
 	item_state_slots = list(slot_r_hand_str = "eng_helm", slot_l_hand_str = "eng_helm")
 	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
 
-/obj/item/clothing/head/helmet/space/void/engineering/hazmat
-	name = "HAZMAT voidsuit helmet"
-	icon_state = "rig0-engineering_rad"
-	item_state_slots = list(slot_r_hand_str = "eng_helm_rad", slot_l_hand_str = "eng_helm_rad")
-
-/obj/item/clothing/head/helmet/space/void/engineering/construction
-	name = "construction voidsuit helmet"
-	icon_state = "rig0-engineering_con"
-	item_state_slots = list(slot_r_hand_str = "eng_helm_con", slot_l_hand_str = "eng_helm_con")
-
 /obj/item/clothing/suit/space/void/engineering
 	name = "engineering voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
@@ -26,16 +16,66 @@
 	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 
+//Engineering HAZMAT Voidsuit
+
+/obj/item/clothing/head/helmet/space/void/engineering/hazmat
+	name = "HAZMAT voidsuit helmet"
+	desc = "A engineering helmet designed for work in a low-pressure environment. Extra radiation shielding appears to have been installed at the price of comfort."
+	icon_state = "rig0-engineering_rad"
+	item_state_slots = list(slot_r_hand_str = "eng_helm_rad", slot_l_hand_str = "eng_helm_rad")
+	armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 50, bio = 100, rad = 100)
+
 /obj/item/clothing/suit/space/void/engineering/hazmat
 	name = "HAZMAT voidsuit"
+	desc = "A engineering voidsuit that protects against hazardous, low pressure environments. Has enhanced radiation shielding compared to regular engineering voidsuits."
 	icon_state = "rig-engineering_rad"
 	item_state_slots = list(slot_r_hand_str = "eng_voidsuit_rad", slot_l_hand_str = "eng_voidsuit_rad")
+	armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 50, bio = 100, rad = 100)
+
+//Engineering Construction Voidsuit
+
+/obj/item/clothing/head/helmet/space/void/engineering/construction
+	name = "construction voidsuit helmet"
+	icon_state = "rig0-engineering_con"
+	item_state_slots = list(slot_r_hand_str = "eng_helm_con", slot_l_hand_str = "eng_helm_con")
 
 /obj/item/clothing/suit/space/void/engineering/construction
 	name = "contstruction voidsuit"
 	icon_state = "rig-engineering_con"
 	item_state_slots = list(slot_r_hand_str = "eng_voidsuit_con", slot_l_hand_str = "eng_voidsuit_con")
 
+//Engineering Surplus Voidsuits
+
+/obj/item/clothing/head/helmet/space/void/engineering/alt
+	name = "reinforced engineering voidsuit helmet"
+	desc = "A heavy, radiation-shielded voidsuit helmet with a surprisingly comfortable interior."
+	icon_state = "rig0-engineeringalt"
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 45, bio = 100, rad = 100)
+	light_overlay = "helmet_light_dual"
+
+/obj/item/clothing/suit/space/void/engineering/alt
+	name = "reinforced engineering voidsuit"
+	desc = "A bulky industrial voidsuit. It's a few generations old, but a reliable design and radiation shielding make up for the lack of climate control."
+	icon_state = "rig-engineeringalt"
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 45, bio = 100, rad = 100)
+
+/obj/item/clothing/head/helmet/space/void/engineering/salvage
+	name = "salvage voidsuit helmet"
+	desc = "A heavily modified salvage voidsuit helmet. It has been fitted with radiation-resistant plating."
+	icon_state = "rig0-salvage"
+	item_state_slots = list(
+		slot_l_hand_str = "eng_helm",
+		slot_r_hand_str = "eng_helm",
+		)
+	armor = list(melee = 50, bullet = 10, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 80)
+
+/obj/item/clothing/suit/space/void/engineering/salvage
+	name = "salvage voidsuit"
+	desc = "A hand-me-down salvage voidsuit. It has obviously had a lot of repair work done to its radiation shielding."
+	icon_state = "rig-engineeringsav"
+	armor = list(melee = 50, bullet = 10, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 80)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd)
+
 //Mining
 /obj/item/clothing/head/helmet/space/void/mining
 	name = "mining voidsuit helmet"
@@ -52,6 +92,20 @@
 	item_state_slots = list(slot_r_hand_str = "mining_voidsuit", slot_l_hand_str = "mining_voidsuit")
 	armor = list(melee = 50, bullet = 5, laser = 20, energy = 5, bomb = 55, bio = 100, rad = 20)
 
+//Mining Surplus Voidsuit
+
+/obj/item/clothing/head/helmet/space/void/mining/alt
+	name = "frontier mining voidsuit helmet"
+	desc = "An armored cheap voidsuit helmet. Someone must have through they were pretty cool when they painted a mohawk on it."
+	icon_state = "rig0-miningalt"
+	armor = list(melee = 50, bullet = 15, laser = 20,energy = 5, bomb = 55, bio = 100, rad = 0)
+
+/obj/item/clothing/suit/space/void/mining/alt
+	icon_state = "rig-miningalt"
+	name = "frontier mining voidsuit"
+	desc = "A cheap prospecting voidsuit. What it lacks in comfort it makes up for in armor plating and street cred."
+	armor = list(melee = 50, bullet = 15, laser = 20,energy = 5, bomb = 55, bio = 100, rad = 0)
+
 //Medical
 /obj/item/clothing/head/helmet/space/void/medical
 	name = "medical voidsuit helmet"
@@ -60,16 +114,6 @@
 	item_state_slots = list(slot_r_hand_str = "medical_helm", slot_l_hand_str = "medical_helm")
 	armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
 
-/obj/item/clothing/head/helmet/space/void/medical/emt
-	name = "emergency medical response voidsuit helmet"
-	icon_state = "rig0-medical_emt"
-	item_state_slots = list(slot_r_hand_str = "medical_helm_emt", slot_l_hand_str = "medical_helm_emt")
-
-/obj/item/clothing/head/helmet/space/void/medical/bio
-	name = "biohazard voidsuit helmet"
-	icon_state = "rig0-medical_bio"
-	item_state_slots = list(slot_r_hand_str = "medical_helm_bio", slot_l_hand_str = "medical_helm_bio")
-
 /obj/item/clothing/suit/space/void/medical
 	name = "medical voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
@@ -78,15 +122,48 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
 	armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
 
+//Medical EMT Voidsuit
+
+/obj/item/clothing/head/helmet/space/void/medical/emt
+	name = "emergency medical response voidsuit helmet"
+	icon_state = "rig0-medical_emt"
+	item_state_slots = list(slot_r_hand_str = "medical_helm_emt", slot_l_hand_str = "medical_helm_emt")
+
 /obj/item/clothing/suit/space/void/medical/emt
 	name = "emergency medical response voidsuit"
 	icon_state = "rig-medical_emt"
 	item_state_slots = list(slot_r_hand_str = "medical_voidsuit_emt", slot_l_hand_str = "medical_voidsuit_emt")
 
+//Medical Biohazard Voidsuit
+
+/obj/item/clothing/head/helmet/space/void/medical/bio
+	name = "biohazard voidsuit helmet"
+	desc = "A special helmet that protects against hazardous environments. Has minor radiation shielding."
+	icon_state = "rig0-medical_bio"
+	item_state_slots = list(slot_r_hand_str = "medical_helm_bio", slot_l_hand_str = "medical_helm_bio")
+	armor = list(melee = 45, bullet = 5, laser = 20, energy = 5, bomb = 15, bio = 100, rad = 75)
+
 /obj/item/clothing/suit/space/void/medical/bio
 	name = "biohazard voidsuit"
+	desc = "A special suit that protects against hazardous, environments. It feels heavier than the standard suit with extra protection around the joints."
 	icon_state = "rig-medical_bio"
 	item_state_slots = list(slot_r_hand_str = "medical_voidsuit_bio", slot_l_hand_str = "medical_voidsuit_bio")
+	armor = list(melee = 45, bullet = 5, laser = 20, energy = 5, bomb = 15, bio = 100, rad = 75)
+
+//Medical Surplus Voidsuit
+/obj/item/clothing/head/helmet/space/void/medical/alt
+	name = "streamlined medical voidsuit helmet"
+	desc = "A trendy, lightly radiation-shielded voidsuit helmet trimmed in a fetching green."
+	icon_state = "rig0-medicalalt"
+	armor = list(melee = 30, bullet = 5, laser = 10,energy = 5, bomb = 5, bio = 100, rad = 60)
+	light_overlay = "helmet_light_dual_green"
+
+/obj/item/clothing/suit/space/void/medical/alt
+	icon_state = "rig-medicalalt"
+	name = "streamlined medical voidsuit"
+	desc = "A more recent model of Vey-Med voidsuit, featuring the latest in radiation shielding technology, without sacrificing comfort or style."
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
+	armor = list(melee = 30, bullet = 5, laser = 10,energy = 5, bomb = 5, bio = 100, rad = 60)
 
 //Security
 /obj/item/clothing/head/helmet/space/void/security
@@ -107,6 +184,8 @@
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
 	siemens_coefficient = 0.7
 
+//Security Crowd Control Voidsuit
+
 /obj/item/clothing/head/helmet/space/void/security/riot
 	name = "crowd control voidsuit helmet"
 	icon_state = "rig0-sec_riot"
@@ -117,6 +196,20 @@
 	icon_state = "rig-sec_riot"
 	item_state_slots = list(slot_r_hand_str = "sec_voidsuit_riot", slot_l_hand_str = "sec_voidsuit_riot")
 
+//Security Surplus Voidsuit
+/obj/item/clothing/head/helmet/space/void/security/alt
+	name = "riot security voidsuit helmet"
+	desc = "A somewhat tacky voidsuit helmet, a fact mitigated by heavy armor plating."
+	icon_state = "rig0-secalt"
+	armor = list(melee = 70, bullet = 20, laser = 30, energy = 5, bomb = 35, bio = 100, rad = 10)
+
+/obj/item/clothing/suit/space/void/security/alt
+	icon_state = "rig-secalt"
+	name = "riot security voidsuit"
+	desc = "A heavily armored voidsuit, designed to intimidate people who find black intimidating. Surprisingly slimming."
+	armor = list(melee = 70, bullet = 20, laser = 30, energy = 5, bomb = 35, bio = 100, rad = 10)
+	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
+
 //Atmospherics
 /obj/item/clothing/head/helmet/space/void/atmos
 	desc = "A special helmet designed for work in a hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding."
@@ -133,4 +226,21 @@
 	icon_state = "rig-atmos"
 	item_state_slots = list(slot_r_hand_str = "atmos_voidsuit", slot_l_hand_str = "atmos_voidsuit")
 	armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50)
+	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+
+//Atmospherics Surplus Voidsuit
+
+/obj/item/clothing/head/helmet/space/void/atmos/alt
+	desc = "A special voidsuit helmet designed for work in hazardous, low pressure environments.This one has been plated with an expensive heat and radiation resistant ceramic."
+	name = "heavy duty atmospherics voidsuit helmet"
+	icon_state = "rig0-atmosalt"
+	armor = list(melee = 20, bullet = 5, laser = 20,energy = 15, bomb = 45, bio = 100, rad = 50)
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
+	light_overlay = "hardhat_light"
+
+/obj/item/clothing/suit/space/void/atmos/alt
+	desc = "A special suit that protects against hazardous, low pressure environments. Fits better than the standard atmospheric voidsuit while still rated to withstand extreme heat and even minor radiation."
+	icon_state = "rig-atmosalt"
+	name = "heavy duty atmos voidsuit"
+	armor = list(melee = 20, bullet = 5, laser = 20,energy = 15, bomb = 45, bio = 100, rad = 50)
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE

code/modules/clothing/suits/armor.dm

@@ -316,6 +316,34 @@
 	icon_badge = "pcrcvest_badge"
 	icon_nobadge = "pcrcvest_nobadge"
 
+/obj/item/clothing/suit/storage/vest/solgov
+	name = "\improper Solar Confederate Government armored vest"
+	desc = "A synthetic armor vest. This one is marked with the crest of the Solar Confederate Government."
+	icon_state = "solvest"
+	armor = list(melee = 40, bullet = 40, laser = 40, energy = 25, bomb = 30, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/storage/vest/solgov/heavy
+	name = "\improper Solar Confederate Government heavy armored vest"
+	desc = "A synthetic armor vest with PEACEKEEPER printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates."
+	icon_state = "solwebvest"
+
+/obj/item/clothing/suit/storage/vest/solgov/security
+	name = "master at arms heavy armored vest"
+	desc = "A synthetic armor vest with MASTER AT ARMS printed in silver lettering on the chest. This one has added webbing and ballistic plates."
+	icon_state = "secwebvest"
+
+/obj/item/clothing/suit/storage/vest/solgov/command
+	name = "command heavy armored vest"
+	desc = "A synthetic armor vest with Solar Confederate Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."
+	icon_state = "comwebvest"
+
+/obj/item/clothing/suit/storage/vest/tactical //crack at a more balanced mid-range armor, minor improvements over standard vests, with the idea "modern" combat armor would focus on energy weapon protection.
+	name = "tactical armored vest"
+	desc = "A heavy armored vest in a fetching tan. It is surprisingly flexible and light, even with the extra webbing and advanced ceramic plates."
+	icon_state = "tacwebvest"
+	item_state = "tacwebvest"
+	armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0)
+
 /obj/item/clothing/suit/storage/vest/detective
 	name = "detective armor vest"
 	desc = "A simple kevlar plate carrier in a vintage brown, it has a badge clipped to the chest that reads, 'Private investigator'."

code/modules/clothing/suits/jobs.dm

@@ -154,6 +154,21 @@
 	/obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
 	body_parts_covered = UPPER_TORSO
 
+/obj/item/clothing/suit/storage/hazardvest/blue
+	name = "blue hazard vest"
+	desc = "A high-visibility vest used in work zones. This one is blue!"
+	icon_state = "hazard_b"
+
+/obj/item/clothing/suit/storage/hazardvest/green
+	name = "green hazard vest"
+	desc = "A high-visibility vest used by emergency responders. This one is green!"
+	icon_state = "hazard_g"
+
+/obj/item/clothing/suit/storage/hazardvest/white
+	name = "white hazard vest"
+	desc = "A high-visibility vest used in work zones. This one has a red cross!"
+	icon_state = "hazard_w"
+
 //Lawyer
 /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
 	name = "blue suit jacket"
@@ -207,6 +222,16 @@
 	icon_open = "ems_jacket_open"
 	icon_closed = "ems_jacket_closed"
 
+/obj/item/clothing/suit/surgicalapron
+	name = "surgical apron"
+	desc = "A sterile blue apron for performing surgery."
+	icon_state = "surgical"
+	blood_overlay_type = "armor"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \
+	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/scalpel,/obj/item/weapon/retractor,/obj/item/weapon/hemostat, \
+	/obj/item/weapon/cautery,/obj/item/weapon/bonegel,/obj/item/weapon/FixOVein)
+
 //Mime
 /obj/item/clothing/suit/suspenders
 	name = "suspenders"

code/modules/clothing/suits/solgov.dm

@@ -0,0 +1,168 @@
+//SolGov Uniform Suits
+
+//Service
+
+/obj/item/clothing/suit/storage/service
+	name = "service jacket"
+	desc = "A uniform service jacket, plain and undecorated."
+	icon_state = "blackservice"
+	item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
+	body_parts_covered = UPPER_TORSO|ARMS
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.9
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/flashlight,/obj/item/weapon/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/analyzer,/obj/item/device/radio,/obj/item/taperoll)
+
+/obj/item/clothing/suit/storage/service/expeditionary
+	name = "expeditionary jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has silver buttons."
+	icon_state = "blackservice_crew"
+
+/obj/item/clothing/suit/storage/service/expeditionary/medical
+	name = "expeditionary medical jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has silver buttons and blue trim."
+	icon_state = "blackservice_med"
+
+/obj/item/clothing/suit/storage/service/expeditionary/medical/command
+	name = "expeditionary medical command jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has gold buttons and blue trim."
+	icon_state = "blackservice_medcom"
+
+/obj/item/clothing/suit/storage/service/expeditionary/engineering
+	name = "expeditionary engineering jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has silver buttons and orange trim."
+	icon_state = "blackservice_eng"
+
+/obj/item/clothing/suit/storage/service/expeditionary/engineering/command
+	name = "expeditionary engineering command jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has gold buttons and orange trim."
+	icon_state = "blackservice_engcom"
+
+/obj/item/clothing/suit/storage/service/expeditionary/supply
+	name = "expeditionary supply jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has silver buttons and brown trim."
+	icon_state = "blackservice_sup"
+
+/obj/item/clothing/suit/storage/service/expeditionary/security
+	name = "expeditionary security jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has silver buttons and red trim."
+	icon_state = "blackservice_sec"
+
+/obj/item/clothing/suit/storage/service/expeditionary/security/command
+	name = "expeditionary security command jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has gold buttons and red trim."
+	icon_state = "blackservice_seccom"
+
+/obj/item/clothing/suit/storage/service/expeditionary/command
+	name = "expeditionary command jacket"
+	desc = "A uniform service jacket belonging to the SCG Expeditionary Corps. It has gold buttons and gold trim."
+	icon_state = "blackservice_com"
+
+/obj/item/clothing/suit/storage/service/marine
+	name = "marine coat"
+	desc = "An SCG Marine Corps service coat. Green and undecorated."
+	icon_state = "greenservice"
+	item_state_slots = list(slot_r_hand_str = "suit_olive", slot_l_hand_str = "suit_olive")
+
+/obj/item/clothing/suit/storage/service/marine/medical
+	name = "marine medical jacket"
+	desc = "An SCG Marine Corps service coat. This one has blue markings."
+	icon_state = "greenservice_med"
+
+/obj/item/clothing/suit/storage/service/marine/medical/command
+	name = "marine medical command jacket"
+	desc = "An SCG Marine Corps service coat. This one has blue and gold markings."
+	icon_state = "greenservice_medcom"
+
+/obj/item/clothing/suit/storage/service/marine/engineering
+	name = "marine engineering jacket"
+	desc = "An SCG Marine Corps service coat. This one has orange markings."
+	icon_state = "greenservice_eng"
+
+/obj/item/clothing/suit/storage/service/marine/engineering/command
+	name = "marine engineering command jacket"
+	desc = "An SCG Marine Corps service coat. This one has orange and gold markings."
+	icon_state = "greenservice_engcom"
+
+/obj/item/clothing/suit/storage/service/marine/supply
+	name = "marine supply jacket"
+	desc = "An SCG Marine Corps service coat. This one has brown markings."
+	icon_state = "greenservice_sup"
+
+/obj/item/clothing/suit/storage/service/marine/security
+	name = "marine security jacket"
+	desc = "An SCG Marine Corps service coat. This one has red markings."
+	icon_state = "greenservice_sec"
+
+/obj/item/clothing/suit/storage/service/marine/security/command
+	name = "marine security command jacket"
+	desc = "An SCG Marine Corps service coat. This one has red and gold markings."
+	icon_state = "greenservice_seccom"
+
+/obj/item/clothing/suit/storage/service/marine/command
+	name = "marine command jacket"
+	desc = "An SCG Marine Corps service coat. This one has gold markings."
+	icon_state = "greenservice_com"
+
+//Dress
+
+/obj/item/clothing/suit/dress
+	name = "dress jacket"
+	desc = "A uniform dress jacket, fancy."
+	icon_state = "greydress"
+	body_parts_covered = UPPER_TORSO|ARMS
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.9
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen)
+
+/obj/item/clothing/suit/dress/expedition
+	name = "expeditionary dress jacket"
+	desc = "A silver and grey dress jacket belonging to the SCG Expeditionary Corps. Fashionable, for the 25th century at least."
+	icon_state = "greydress"
+
+/obj/item/clothing/suit/dress/expedition/command
+	name = "expeditionary command dress jacket"
+	desc = "A gold and grey dress jacket belonging to the SCG Expeditionary Corps. The height of fashion."
+	icon_state = "greydress_com"
+
+/obj/item/clothing/suit/storage/toggle/dress
+	name = "clasped dress jacket"
+	desc = "A uniform dress jacket with gold toggles."
+	icon_state = "whitedress"
+	item_state = "labcoat"
+	icon_open = "whitedress_open"
+	icon_closed = "whitedress"
+	blood_overlay_type = "coat"
+
+/obj/item/clothing/suit/storage/toggle/dress/fleet
+	name = "fleet dress jacket"
+	desc = "A crisp white SCG Fleet dress jacket with blue and gold accents. Don't get near pasta sauce or vox."
+
+/obj/item/clothing/suit/storage/toggle/dress/fleet/command
+	name = "expeditionary command dress jacket"
+	desc = "A crisp white SCG Fleet dress jacket dripping with gold accents. So bright it's blinding."
+	icon_state = "whitedress_com"
+	item_state = "labcoat"
+	icon_open = "whitedress_com_open"
+	icon_closed = "whitedress_com"
+	blood_overlay_type = "coat"
+
+/obj/item/clothing/suit/dress/marine
+	name = "marine dress jacket"
+	desc = "A tailored black SCG Marine Corps dress jacket with red trim. So sexy it hurts."
+	icon_state = "blackdress"
+	item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
+
+/obj/item/clothing/suit/dress/marine/command
+	name = "marine command dress jacket"
+	desc = "A tailored black SCG Marine Corps dress jacket with gold trim. Smells like ceremony."
+	icon_state = "blackdress_com"
+//Misc
+
+/obj/item/clothing/suit/storage/toggle/marshal_jacket
+	name = "colonial marshal jacket"
+	desc = "A black synthleather jacket. The word 'MARSHAL' is stenciled onto the back in gold lettering."
+	icon_state = "marshal_jacket"
+	item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
+	icon_open = "marshal_jacket_open"
+	icon_closed = "marshal_jacket"
+	body_parts_covered = UPPER_TORSO|ARMS

polaris.dme

@@ -1236,6 +1236,7 @@
 #include "code\modules\clothing\suits\jobs.dm"
 #include "code\modules\clothing\suits\labcoat.dm"
 #include "code\modules\clothing\suits\miscellaneous.dm"
+#include "code\modules\clothing\suits\solgov.dm"
 #include "code\modules\clothing\suits\storage.dm"
 #include "code\modules\clothing\suits\toggles.dm"
 #include "code\modules\clothing\suits\utility.dm"