Merge pull request #5683 from VOREStation/upstream-merge-6402

[MIRROR] Uniform Adjustments Phase 1

code/datums/outfits/military/fleet.dm

@@ -1,21 +1,21 @@
 /decl/hierarchy/outfit/military/fleet/pt
 	name = OUTFIT_MILITARY("Fleet PT")
-	uniform = /obj/item/clothing/under/pt/fleet
+	uniform = /obj/item/clothing/under/solgov/pt/fleet
 	shoes = /obj/item/clothing/shoes/black
 
 /decl/hierarchy/outfit/military/fleet/utility
 	name = OUTFIT_MILITARY("Fleet Utility")
-	uniform = /obj/item/clothing/under/utility/fleet
+	uniform = /obj/item/clothing/under/solgov/utility/fleet
-	shoes = /obj/item/clothing/shoes/boots/jackboots
+	shoes = /obj/item/clothing/shoes/boots/duty
 
 /decl/hierarchy/outfit/military/fleet/service
 	name = OUTFIT_MILITARY("Fleet Service")
-	uniform = /obj/item/clothing/under/service/fleet
+	uniform = /obj/item/clothing/under/solgov/service/fleet
 	shoes = /obj/item/clothing/shoes/dress/white
 
 /decl/hierarchy/outfit/military/fleet/dress
 	name = OUTFIT_MILITARY("Fleet Dress")
-	uniform = /obj/item/clothing/under/service/fleet
+	uniform = /obj/item/clothing/under/solgov/service/fleet
 	shoes = /obj/item/clothing/shoes/dress/white
 	suit = /obj/item/clothing/suit/storage/toggle/dress/fleet
 	gloves = /obj/item/clothing/gloves/white

code/datums/outfits/military/marines.dm

@@ -1,22 +1,22 @@
 /decl/hierarchy/outfit/military/marine/pt
 	name = OUTFIT_MILITARY("Marine PT")
-	uniform = /obj/item/clothing/under/pt/marine
+	uniform = /obj/item/clothing/under/solgov/pt/marine
 	shoes = /obj/item/clothing/shoes/black
 
 /decl/hierarchy/outfit/military/marine/utility
 	name = OUTFIT_MILITARY("Marine Utility")
-	uniform = /obj/item/clothing/under/utility/marine
+	uniform = /obj/item/clothing/under/solgov/utility/marine
 	shoes = /obj/item/clothing/shoes/boots/jungle
 
 /decl/hierarchy/outfit/military/marine/service
 	name = OUTFIT_MILITARY("Marine Service")
-	uniform = /obj/item/clothing/under/service/marine
+	uniform = /obj/item/clothing/under/solgov/service/marine
 	shoes = /obj/item/clothing/shoes/dress
 	suit = /obj/item/clothing/suit/storage/service/marine
 
 /decl/hierarchy/outfit/military/marine/dress
 	name = OUTFIT_MILITARY("Marine Dress")
-	uniform = /obj/item/clothing/under/mildress/marine
+	uniform = /obj/item/clothing/under/solgov/mildress/marine
 	shoes = /obj/item/clothing/shoes/dress/white
 	suit = /obj/item/clothing/suit/dress/marine
 	gloves = /obj/item/clothing/gloves/white

code/datums/outfits/military/sifguard.dm

@@ -1,22 +1,22 @@
 /decl/hierarchy/outfit/military/sifguard/pt
 	name = OUTFIT_MILITARY("SifGuard PT")
-	uniform = /obj/item/clothing/under/pt/sifguard
+	uniform = /obj/item/clothing/under/solgov/pt/sifguard
 	shoes = /obj/item/clothing/shoes/black
 
 /decl/hierarchy/outfit/military/sifguard/utility
 	name = OUTFIT_MILITARY("SifGuard Utility")
-	uniform = /obj/item/clothing/under/utility/sifguard
+	uniform = /obj/item/clothing/under/solgov/utility/sifguard
-	shoes = /obj/item/clothing/shoes/boots/jackboots
+	shoes = /obj/item/clothing/shoes/boots/tactical
 
 /decl/hierarchy/outfit/military/sifguard/service
 	name = OUTFIT_MILITARY("SifGuard Service")
-	uniform = /obj/item/clothing/under/utility/sifguard
+	uniform = /obj/item/clothing/under/solgov/utility/sifguard
-	shoes = /obj/item/clothing/shoes/boots/jackboots
+	shoes = /obj/item/clothing/shoes/boots/tactical
 	suit = /obj/item/clothing/suit/storage/service/sifguard
 
 /decl/hierarchy/outfit/military/sifguard/dress
 	name = OUTFIT_MILITARY("SifGuard Dress")
-	uniform = /obj/item/clothing/under/mildress/sifguard
+	uniform = /obj/item/clothing/under/solgov/mildress/sifguard
 	shoes = /obj/item/clothing/shoes/dress
 	suit = /obj/item/clothing/suit/dress/expedition
 	gloves = /obj/item/clothing/gloves/white

code/modules/clothing/under/accessories/storage.dm

@@ -9,12 +9,15 @@
 	var/obj/item/weapon/storage/internal/hold
 	w_class = ITEMSIZE_NORMAL
 	on_rolled = list("down" = "none")
+	var/hide_on_roll = FALSE
 
 /obj/item/clothing/accessory/storage/New()
 	..()
 	hold = new/obj/item/weapon/storage/internal(src)
 	hold.max_storage_space = slots * 2
 	hold.max_w_class = ITEMSIZE_SMALL
+	if (!hide_on_roll)
+		on_rolled["down"] = icon_state
 
 /obj/item/clothing/accessory/storage/attack_hand(mob/user as mob)
 	if (has_suit)	//if we are part of a suit

code/modules/clothing/under/accessories/torch.dm

@@ -310,9 +310,9 @@ department tags
 	desc = "Insignia denoting assignment to the command department. These fit Fleet uniforms."
 	on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
 
-/obj/item/clothing/accessory/solgov/department/command/army
+/obj/item/clothing/accessory/solgov/department/command/marine
-	icon_state = "dept_army"
+	icon_state = "dept_marine"
-	desc = "Insignia denoting assignment to the command department. These fit Army uniforms."
+	desc = "Insignia denoting assignment to the command department. These fit marine uniforms."
 	on_rolled = list("down" = "none")
 
 /obj/item/clothing/accessory/solgov/department/engineering
@@ -328,9 +328,9 @@ department tags
 	desc = "Insignia denoting assignment to the engineering department. These fit Fleet uniforms."
 	on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
 
-/obj/item/clothing/accessory/solgov/department/engineering/army
+/obj/item/clothing/accessory/solgov/department/engineering/marine
-	icon_state = "dept_army"
+	icon_state = "dept_marine"
-	desc = "Insignia denoting assignment to the engineering department. These fit Army uniforms."
+	desc = "Insignia denoting assignment to the engineering department. These fit marine uniforms."
 	on_rolled = list("down" = "none")
 
 /obj/item/clothing/accessory/solgov/department/security
@@ -346,9 +346,9 @@ department tags
 	desc = "Insignia denoting assignment to the security department. These fit Fleet uniforms."
 	on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
 
-/obj/item/clothing/accessory/solgov/department/security/army
+/obj/item/clothing/accessory/solgov/department/security/marine
-	icon_state = "dept_army"
+	icon_state = "dept_marine"
-	desc = "Insignia denoting assignment to the security department. These fit Army uniforms."
+	desc = "Insignia denoting assignment to the security department. These fit marine uniforms."
 	on_rolled = list("down" = "none")
 
 /obj/item/clothing/accessory/solgov/department/medical
@@ -364,9 +364,9 @@ department tags
 	desc = "Insignia denoting assignment to the medical department. These fit Fleet uniforms."
 	on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
 
-/obj/item/clothing/accessory/solgov/department/medical/army
+/obj/item/clothing/accessory/solgov/department/medical/marine
-	icon_state = "dept_army"
+	icon_state = "dept_marine"
-	desc = "Insignia denoting assignment to the medical department. These fit Army uniforms."
+	desc = "Insignia denoting assignment to the medical department. These fit marine uniforms."
 	on_rolled = list("down" = "none")
 
 /obj/item/clothing/accessory/solgov/department/supply
@@ -382,9 +382,9 @@ department tags
 	desc = "Insignia denoting assignment to the supply department. These fit Fleet uniforms."
 	on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
 
-/obj/item/clothing/accessory/solgov/department/supply/army
+/obj/item/clothing/accessory/solgov/department/supply/marine
-	icon_state = "dept_army"
+	icon_state = "dept_marine"
-	desc = "Insignia denoting assignment to the supply department. These fit Army uniforms."
+	desc = "Insignia denoting assignment to the supply department. These fit marine uniforms."
 	on_rolled = list("down" = "none")
 
 /obj/item/clothing/accessory/solgov/department/service
@@ -400,9 +400,9 @@ department tags
 	desc = "Insignia denoting assignment to the service department. These fit Fleet uniforms."
 	on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
 
-/obj/item/clothing/accessory/solgov/department/service/army
+/obj/item/clothing/accessory/solgov/department/service/marine
-	icon_state = "dept_army"
+	icon_state = "dept_marine"
-	desc = "Insignia denoting assignment to the service department. These fit Army uniforms."
+	desc = "Insignia denoting assignment to the service department. These fit marine uniforms."
 	on_rolled = list("down" = "none")
 
 /obj/item/clothing/accessory/solgov/department/exploration
@@ -418,9 +418,9 @@ department tags
 	desc = "Insignia denoting assignment to the exploration department. These fit Fleet uniforms."
 	on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
 
-/obj/item/clothing/accessory/solgov/department/exploration/army
+/obj/item/clothing/accessory/solgov/department/exploration/marine
-	icon_state = "dept_army"
+	icon_state = "dept_marine"
-	desc = "Insignia denoting assignment to the exploration department. These fit Army uniforms."
+	desc = "Insignia denoting assignment to the exploration department. These fit marine uniforms."
 	on_rolled = list("down" = "none")
 
 /obj/item/clothing/accessory/solgov/department/research
@@ -611,103 +611,103 @@ ranks - fleet
 /**************
 ranks - marines
 **************/
-/obj/item/clothing/accessory/solgov/rank/army
+/obj/item/clothing/accessory/solgov/rank/marine
-	name = "army ranks"
+	name = "marine ranks"
 	desc = "Insignia denoting marine rank of some kind. These appear blank."
-	icon_state = "armyrank_enlisted"
+	icon_state = "marinerank_enlisted"
 	on_rolled = list("down" = "none")
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted
 	name = "ranks (E-1 private)"
 	desc = "Insignia denoting the rank of Private."
-	icon_state = "armyrank_enlisted"
+	icon_state = "marinerank_enlisted"
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e2
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e2
 	name = "ranks (E-2 private second class)"
 	desc = "Insignia denoting the rank of Private Second Class."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e3
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e3
 	name = "ranks (E-3 private first class)"
 	desc = "Insignia denoting the rank of Private First Class."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e4
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e4
 	name = "ranks (E-4 corporal)"
 	desc = "Insignia denoting the rank of Corporal."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e5
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e5
 	name = "ranks (E-5 sergeant)"
 	desc = "Insignia denoting the rank of Sergeant."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e6
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e6
 	name = "ranks (E-6 staff sergeant)"
 	desc = "Insignia denoting the rank of Staff Sergeant."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e7
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e7
 	name = "ranks (E-7 sergeant first class)"
 	desc = "Insignia denoting the rank of Sergeant First Class."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e8
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e8
 	name = "ranks (E-8 master sergeant)"
 	desc = "Insignia denoting the rank of Master Sergeant."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e8_alt
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e8_alt
 	name = "ranks (E-8 first sergeant)"
 	desc = "Insignia denoting the rank of First Sergeant."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e9
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e9
 	name = "ranks (E-9 sergeant major)"
 	desc = "Insignia denoting the rank of Sergeant Major."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e9_alt1
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e9_alt1
 	name = "ranks (E-9 command sergeant major)"
 	desc = "Insignia denoting the rank of Command Sergeant Major."
 
-/obj/item/clothing/accessory/solgov/rank/army/enlisted/e9_alt2
+/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e9_alt2
-	name = "ranks (E-9 sergeant major of the Army)"
+	name = "ranks (E-9 sergeant major of the marine)"
-	desc = "Insignia denoting the rank of Sergeant Major of the Army."
+	desc = "Insignia denoting the rank of Sergeant Major of the marine."
 
-/obj/item/clothing/accessory/solgov/rank/army/officer
+/obj/item/clothing/accessory/solgov/rank/marine/officer
 	name = "ranks (O-1 second lieutenant)"
 	desc = "Insignia denoting the rank of Second Lieutenant."
-	icon_state = "armyrank_officer"
+	icon_state = "marinerank_officer"
 
-/obj/item/clothing/accessory/solgov/rank/army/officer/o2
+/obj/item/clothing/accessory/solgov/rank/marine/officer/o2
 	name = "ranks (O-2 first lieutenant)"
 	desc = "Insignia denoting the rank of First Lieutenant."
 
-/obj/item/clothing/accessory/solgov/rank/army/officer/o3
+/obj/item/clothing/accessory/solgov/rank/marine/officer/o3
 	name = "ranks (O-3 captain)"
 	desc = "Insignia denoting the rank of Captain."
 
-/obj/item/clothing/accessory/solgov/rank/army/officer/o4
+/obj/item/clothing/accessory/solgov/rank/marine/officer/o4
 	name = "ranks (O-4 major)"
 	desc = "Insignia denoting the rank of Major."
 
-/obj/item/clothing/accessory/solgov/rank/army/officer/o5
+/obj/item/clothing/accessory/solgov/rank/marine/officer/o5
 	name = "ranks (O-5 lieutenant colonel)"
 	desc = "Insignia denoting the rank of Lieutenant Colonel."
 
-/obj/item/clothing/accessory/solgov/rank/army/officer/o6
+/obj/item/clothing/accessory/solgov/rank/marine/officer/o6
 	name = "ranks (O-6 colonel)"
 	desc = "Insignia denoting the rank of Colonel."
 
-/obj/item/clothing/accessory/solgov/rank/army/flag
+/obj/item/clothing/accessory/solgov/rank/marine/flag
 	name = "ranks (O-7 brigadier general)"
 	desc = "Insignia denoting the rank of Brigadier General."
-	icon_state = "armyrank_command"
+	icon_state = "marinerank_command"
 
-/obj/item/clothing/accessory/solgov/rank/army/flag/o8
+/obj/item/clothing/accessory/solgov/rank/marine/flag/o8
 	name = "ranks (O-8 major general)"
 	desc = "Insignia denoting the rank of Major General."
 
-/obj/item/clothing/accessory/solgov/rank/army/flag/o9
+/obj/item/clothing/accessory/solgov/rank/marine/flag/o9
 	name = "ranks (O-9 lieutenant general)"
 	desc = "Insignia denoting the rank of lieutenant general."
 
-/obj/item/clothing/accessory/solgov/rank/army/flag/o10
+/obj/item/clothing/accessory/solgov/rank/marine/flag/o10
 	name = "ranks (O-10 general)"
 	desc = "Insignia denoting the rank of General."
 
-/obj/item/clothing/accessory/solgov/rank/army/flag/o10_alt
+/obj/item/clothing/accessory/solgov/rank/marine/flag/o10_alt
 	name = "ranks (O-10 field marshal)"
 	desc = "Insignia denoting the rank of Field Marshal."

code/modules/clothing/under/solgov.dm

@@ -1,7 +1,18 @@
 //SolGov Uniforms
 
+//Master
+/obj/item/clothing/under/solgov
+	name = "master solgov uniform"
+	desc = "You shouldn't be seeing this."
+	icon = 'icons/obj/clothing/uniforms_solgov.dmi'
+	rolled_down = 0
+	rolled_sleeves = 0
+	item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
+	armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
+	siemens_coefficient = 0.8
+
 //PT
-/obj/item/clothing/under/pt
+/obj/item/clothing/under/solgov/pt
 	name = "pt uniform"
 	desc = "Shorts! Shirt! Miami! Sexy!"
 	icon_state = "miami"
@@ -10,19 +21,19 @@
 	siemens_coefficient = 0.9
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-/obj/item/clothing/under/pt/sifguard
+/obj/item/clothing/under/solgov/pt/sifguard
 	name = "\improper SifGuard pt uniform"
 	desc = "A baggy shirt bearing the seal of the Sif Defense Force and some dorky looking blue shorts."
 	icon_state = "expeditionpt"
 	worn_state = "expeditionpt"
 
-/obj/item/clothing/under/pt/fleet
+/obj/item/clothing/under/solgov/pt/fleet
 	name = "fleet pt uniform"
 	desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
 	icon_state = "fleetpt"
 	worn_state = "fleetpt"
 
-/obj/item/clothing/under/pt/marine
+/obj/item/clothing/under/solgov/pt/marine
 	name = "marine pt uniform"
 	desc = "Does NOT leave much to the imagination."
 	icon_state = "marinept"
@@ -53,63 +64,62 @@
 	worn_state = "greyutility"
 
 //Here's the real ones
-/obj/item/clothing/under/utility/sifguard
+/obj/item/clothing/under/solgov/utility/sifguard
 	name = "\improper SifGuard uniform"
 	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has silver trim."
 	icon_state = "blackutility_crew"
 	worn_state = "blackutility_crew"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
 
-/obj/item/clothing/under/utility/sifguard/medical
+/obj/item/clothing/under/solgov/utility/sifguard/command
-	name = "\improper SifGuard medical uniform"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command)
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has silver trim and blue blazes."
-	icon_state = "blackutility_med"
-	worn_state = "blackutility_med"
 
-/obj/item/clothing/under/utility/sifguard/medical/command
+/obj/item/clothing/under/solgov/utility/sifguard/engineering
-	name = "\improper SifGuard medical command uniform"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering)
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has gold trim and blue blazes."
-	icon_state = "blackutility_medcom"
-	worn_state = "blackutility_medcom"
 
-/obj/item/clothing/under/utility/sifguard/engineering
+/obj/item/clothing/under/solgov/utility/sifguard/security
-	name = "\improper SifGuard engineering uniform"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security)
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has silver trim and organge blazes."
-	icon_state = "blackutility_eng"
-	worn_state = "blackutility_eng"
 
-/obj/item/clothing/under/utility/sifguard/engineering/command
+/obj/item/clothing/under/solgov/utility/sifguard/medical
-	name = "\improper SifGuard engineering command uniform"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical)
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has gold trim and organge blazes."
-	icon_state = "blackutility_engcom"
-	worn_state = "blackutility_engcom"
 
-/obj/item/clothing/under/utility/sifguard/supply
+/obj/item/clothing/under/solgov/utility/sifguard/supply
-	name = "\improper SifGuard supply uniform"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply)
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has silver trim and brown blazes."
-	icon_state = "blackutility_sup"
-	worn_state = "blackutility_sup"
 
-/obj/item/clothing/under/utility/sifguard/security
+/obj/item/clothing/under/solgov/utility/sifguard/exploration
-	name = "\improper SifGuard security uniform"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration)
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has silver trim and red blazes."
-	icon_state = "blackutility_sec"
-	worn_state = "blackutility_sec"
 
-/obj/item/clothing/under/utility/sifguard/security/command
+/obj/item/clothing/under/solgov/utility/sifguard/research
-	name = "\improper SifGuard security command uniform"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research)
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has gold trim and red blazes."
-	icon_state = "blackutility_seccom"
-	worn_state = "blackutility_seccom"
 
-/obj/item/clothing/under/utility/sifguard/command
+/obj/item/clothing/under/solgov/utility/sifguard/officer
-	name = "\improper SifGuard command uniform"
+	name = "\improper Sifuard officer's uniform"
-	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has gold trim and gold blazes."
+	desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has gold trim."
 	icon_state = "blackutility_com"
 	worn_state = "blackutility_com"
 
+/obj/item/clothing/under/solgov/utility/sifguard/officer/command
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command)
 
-/obj/item/clothing/under/utility/fleet
+/obj/item/clothing/under/solgov/utility/sifguard/officer/engineering
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering)
+
+/obj/item/clothing/under/solgov/utility/sifguard/officer/security
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security)
+
+/obj/item/clothing/under/solgov/utility/sifguard/officer/medical
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical)
+
+/obj/item/clothing/under/solgov/utility/sifguard/officer/supply
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply)
+
+/obj/item/clothing/under/solgov/utility/sifguard/officer/exploration
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration)
+
+/obj/item/clothing/under/solgov/utility/sifguard/officer/research
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research)
+
+/obj/item/clothing/under/solgov/utility/fleet
 	name = "fleet coveralls"
 	desc = "The utility uniform of the SCG Fleet, made from an insulated material."
 	icon_state = "navyutility"
@@ -117,116 +127,96 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.7
 
-/obj/item/clothing/under/utility/fleet/medical
+/obj/item/clothing/under/solgov/utility/fleet/command
-	name = "fleet medical coveralls"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet)
-	desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has blue cuffs."
-	icon_state = "navyutility_med"
-	worn_state = "navyutility_med"
 
-/obj/item/clothing/under/utility/fleet/engineering
+/obj/item/clothing/under/solgov/utility/fleet/command/pilot
-	name = "fleet engineering coveralls"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/specialty/pilot)
-	desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has orange cuffs."
-	icon_state = "navyutility_eng"
-	worn_state = "navyutility_eng"
 
-/obj/item/clothing/under/utility/fleet/supply
+/obj/item/clothing/under/solgov/utility/fleet/engineering
-	name = "fleet supply coveralls"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/fleet)
-	desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has brown cuffs."
-	icon_state = "navyutility_sup"
-	worn_state = "navyutility_sup"
 
-/obj/item/clothing/under/utility/fleet/security
+/obj/item/clothing/under/solgov/utility/fleet/security
-	name = "fleet security coveralls"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/fleet)
-	desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has red cuffs."
-	icon_state = "navyutility_sec"
-	worn_state = "navyutility_sec"
 
-/obj/item/clothing/under/utility/fleet/command
+/obj/item/clothing/under/solgov/utility/fleet/medical
-	name = "fleet command coveralls"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet)
-	desc = "The utility uniform of the SCG Fleet, made from an insulated material. This one has gold cuffs."
+
-	icon_state = "navyutility_com"
+/obj/item/clothing/under/solgov/utility/fleet/supply
-	worn_state = "navyutility_com"
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/fleet)
+
+/obj/item/clothing/under/solgov/utility/fleet/exploration
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/fleet)
 
 
-/obj/item/clothing/under/utility/marine
+/obj/item/clothing/under/solgov/utility/marine
 	name = "marine fatigues"
 	desc = "The utility uniform of the SCG Marine Corps, made from durable material."
 	icon_state = "greyutility"
 	worn_state = "greyutility"
 	armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
 
-/obj/item/clothing/under/utility/marine/green
+/obj/item/clothing/under/solgov/utility/marine/command
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/marine)
+
+/obj/item/clothing/under/solgov/utility/marine/engineering
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/marine)
+
+/obj/item/clothing/under/solgov/utility/marine/security
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/marine)
+
+/obj/item/clothing/under/solgov/utility/marine/medical
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/marine)
+
+/obj/item/clothing/under/solgov/utility/marine/supply
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/marine)
+
+/obj/item/clothing/under/solgov/utility/marine/exploration
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/marine)
+
+/obj/item/clothing/under/solgov/utility/marine/green
 	name = "green fatigues"
 	desc = "A green version of the SCG marine utility uniform, made from durable material."
 	icon_state = "greenutility"
 	worn_state = "greenutility"
 
-/obj/item/clothing/under/utility/marine/tan
+/obj/item/clothing/under/solgov/utility/marine/tan
 	name = "tan fatigues"
 	desc = "A tan version of the SCG marine utility uniform, made from durable material."
 	icon_state = "tanutility"
 	worn_state = "tanutility"
 
-/obj/item/clothing/under/utility/marine/medical
-	name = "marine medical fatigues"
-	desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has blue markings."
-	icon_state = "greyutility_med"
-	worn_state = "greyutility_med"
-
-/obj/item/clothing/under/utility/marine/engineering
-	name = "marine engineering fatigues"
-	desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has orange markings."
-	icon_state = "greyutility_eng"
-	worn_state = "greyutility_eng"
-
-/obj/item/clothing/under/utility/marine/supply
-	name = "marine supply fatigues"
-	desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has brown markings."
-	icon_state = "greyutility_sup"
-	worn_state = "greyutility_sup"
-
-/obj/item/clothing/under/utility/marine/security
-	name = "marine security fatigues"
-	desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has red markings."
-	icon_state = "greyutility_sec"
-	worn_state = "greyutility_sec"
-
-/obj/item/clothing/under/utility/marine/command
-	name = "marine command coveralls"
-	desc = "The utility uniform of the SCG Marine Corps, made from durable material. This one has gold markings."
-	icon_state = "greyutility_com"
-	worn_state = "greyutility_com"
-
 //Service
 
-/obj/item/clothing/under/service
+/obj/item/clothing/under/solgov/service
 	name = "service uniform"
 	desc = "A service uniform of some kind."
 	icon_state = "whiteservice"
 	worn_state = "whiteservice"
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 5, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 5, rad = 0)
 	siemens_coefficient = 0.9
 
-/obj/item/clothing/under/service/fleet
+/obj/item/clothing/under/solgov/service/fleet
 	name = "fleet service uniform"
 	desc = "The service uniform of the SCG Fleet, made from immaculate white fabric."
 	icon_state = "whiteservice"
 	worn_state = "whiteservice"
 
-/obj/item/clothing/under/service/marine
+/obj/item/clothing/under/solgov/service/marine
 	name = "marine service uniform"
 	desc = "The service uniform of the SCG Marine Corps. Slimming."
 	icon_state = "greenservice"
 	worn_state = "greenservice"
 
-/obj/item/clothing/under/service/marine/command
+/obj/item/clothing/under/solgov/service/marine/command
 	name = "marine command service uniform"
 	desc = "The service uniform of the SCG Marine Corps. Slimming and stylish."
 	icon_state = "greenservice_com"
 	worn_state = "greenservice_com"
 
 //Dress
-/obj/item/clothing/under/mildress
+
+/obj/item/clothing/under/solgov/mildress
 	name = "dress uniform"
 	desc = "A dress uniform of some kind."
 	icon_state = "greydress"
@@ -234,25 +224,71 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 
-/obj/item/clothing/under/mildress/sifguard
+/obj/item/clothing/under/solgov/mildress/sifguard
 	name = "\improper SifGuard dress uniform"
 	desc = "The dress uniform of the Sif Defense Force in silver trim."
-	icon_state = "greydress"
-	worn_state = "greydress"
 
-/obj/item/clothing/under/mildress/sifguard/command
+/obj/item/clothing/under/solgov/mildress/sifguard/command
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/engineering
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/security
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/medical
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/supply
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/service
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/exploration
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/research
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer
 	name = "\improper SifGuard command dress uniform"
 	desc = "The dress uniform of the Sif Defense Force in gold trim."
 	icon_state = "greydress_com"
 	worn_state = "greydress_com"
 
-/obj/item/clothing/under/mildress/marine
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/command
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/engineering
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/security
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/medical
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/supply
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/service
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/exploration
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
+
+/obj/item/clothing/under/solgov/mildress/sifguard/officer/research
+	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
+
+/obj/item/clothing/under/solgov/mildress/marine
 	name = "marine dress uniform"
 	desc = "The dress uniform of the SCG Marine Corps, class given form."
 	icon_state = "blackdress"
 	worn_state = "blackdress"
 
-/obj/item/clothing/under/mildress/marine/command
+/obj/item/clothing/under/solgov/mildress/marine/command
 	name = "marine command dress uniform"
 	desc = "The dress uniform of the SCG Marine Corps, even classier in gold."
 	icon_state = "blackdress_com"

html/changelogs/Woodrat - Uniform Fix.yml

@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Woodrat
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Made the solgov uniforms use accessories for denoting department instead of having several different sprites in the uniform dmi folder."
+  - tweak: "Removed redundant solgov uniforms from uniform.dmi and moved the sprites for the solgov uniforms to their own dmi."
+  - bugfix: "Fixed storage vests and drop pouches disappearing when one rolls down a uniform."

maps/submaps/surface_submaps/wilderness/GovPatrol.dmm

@@ -25,7 +25,7 @@
 /turf/template_noop,
 /area/submap/GovPatrol)
 "h" = (
-/obj/item/clothing/under/utility/sifguard,
+/obj/item/clothing/under/solgov/utility/sifguard,
 /obj/item/clothing/shoes/boots/jackboots,
 /obj/effect/decal/remains,
 /turf/template_noop,