Adds Solarian Army service uniforms, modifies Navy uniforms, and other such things. (#15959)

* The Changes

* fixes mistakes

* fixes more mistakes

* this should be it

* ok maybe this is it

code/game/objects/structures/crates_lockers/closets/sol_gear.dm

@@ -1,7 +1,7 @@
 
 /obj/structure/closet/sol
 	name = "sol navy uniform closet"
-	desc = "It's a storage unit for Sol Alliance navy uniforms."
+	desc = "It's a storage unit for Solarian Navy uniforms."
 	icon_state = "syndicate1"
 
 /obj/structure/closet/sol/navy/fill()
@@ -21,26 +21,52 @@
 
 /obj/structure/closet/sol/marine
 	name = "sol marines uniform closet"
-	desc = "It's a storage unit for Sol Alliance marine uniforms."
+	desc = "It's a storage unit for Solarian Marine Corps uniforms."
 
 /obj/structure/closet/sol/marine/fill()
 	..()
 	new /obj/item/clothing/under/rank/sol/marine(src)
 	new /obj/item/clothing/under/rank/sol/marine(src)
 	new /obj/item/clothing/under/rank/sol/marine(src)
-	new /obj/item/clothing/under/rank/sol/service/marine(src)
-	new /obj/item/clothing/under/rank/sol/service/marine(src)
-	new /obj/item/clothing/under/rank/sol/service/marine(src)
+	new /obj/item/clothing/under/rank/sol/marine/grey(src)
+	new /obj/item/clothing/under/rank/sol/marine/grey(src)
+	new /obj/item/clothing/under/rank/sol/marine/grey(src)
 	new /obj/item/clothing/head/sol/marine(src)
 	new /obj/item/clothing/head/sol/marine(src)
-	new /obj/item/clothing/head/sol/garrison(src)
+	new /obj/item/clothing/head/sol/marine(src)
+	new /obj/item/clothing/head/sol/marine/grey(src)
+	new /obj/item/clothing/head/sol/marine/grey(src)
+	new /obj/item/clothing/head/sol/marine/grey(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+
+/obj/structure/closet/sol/army
+	name = "sol army uniform closet"
+	desc = "It's a storage unit for Solarian Army uniforms."
+	icon_state = "syndicate1"
+
+/obj/structure/closet/sol/army/fill()
+	..()
+	new /obj/item/clothing/under/rank/sol/army(src)
+	new /obj/item/clothing/under/rank/sol/army(src)
+	new /obj/item/clothing/under/rank/sol/army(src)
+	new /obj/item/clothing/under/rank/sol/army/grey(src)
+	new /obj/item/clothing/under/rank/sol/army/grey(src)
+	new /obj/item/clothing/under/rank/sol/army/grey(src)
+	new /obj/item/clothing/head/sol/army(src)
+	new /obj/item/clothing/head/sol/army(src)
+	new /obj/item/clothing/head/sol/army(src)
+	new /obj/item/clothing/head/sol/army/grey(src)
+	new /obj/item/clothing/head/sol/army/grey(src)
+	new /obj/item/clothing/head/sol/army/grey(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 
 /obj/structure/closet/sol/navy_dress
 	name = "sol navy dress uniform closet"
-	desc = "It's a storage unit for Sol Alliance navy dress uniforms."
+	desc = "It's a storage unit for Solarian Navy dress uniforms."
 
 /obj/structure/closet/sol/navy_dress/fill()
 	..()
@@ -59,7 +85,7 @@
 
 /obj/structure/closet/sol/marine_dress
 	name = "sol marine dress uniform closet"
-	desc = "It's a storage unit for Sol Alliance marine dress uniforms."
+	desc = "It's a storage unit for Solarian Marine Corps service & dress uniforms."
 
 /obj/structure/closet/sol/marine_dress/fill()
 	..()
@@ -69,6 +95,9 @@
 	new /obj/item/clothing/head/sol/dress/marine(src)
 	new /obj/item/clothing/head/sol/dress/marine(src)
 	new /obj/item/clothing/head/sol/dress/marine(src)
+	new /obj/item/clothing/under/rank/sol/service/marine(src)
+	new /obj/item/clothing/under/rank/sol/service/marine(src)
+	new /obj/item/clothing/under/rank/sol/service/marine(src)
 	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/clothing/shoes/laceup(src)
@@ -76,6 +105,26 @@
 	new /obj/item/clothing/gloves/white(src)
 	new /obj/item/clothing/gloves/white(src)
 
+/obj/structure/closet/sol/army_dress
+	name = "sol army dress uniform closet"
+	desc = "It's a storage unit for Solarian Army service & dress uniforms."
+	icon_state = "syndicate1"
+
+/obj/structure/closet/sol/army_dress/fill()
+	..()
+	new /obj/item/clothing/under/rank/sol/army/service(src)
+	new /obj/item/clothing/under/rank/sol/army/service(src)
+	new /obj/item/clothing/under/rank/sol/army/service(src)
+	new /obj/item/clothing/head/sol/army/service(src)
+	new /obj/item/clothing/head/sol/army/service(src)
+	new /obj/item/clothing/head/sol/army/service(src)
+	new /obj/item/clothing/head/sol/army/service/garrison(src)
+	new /obj/item/clothing/head/sol/army/service/garrison(src)
+	new /obj/item/clothing/head/sol/army/service/garrison(src)
+	new /obj/item/clothing/shoes/laceup(src)
+	new /obj/item/clothing/shoes/laceup(src)
+	new /obj/item/clothing/shoes/laceup(src)
+
 /obj/structure/closet/secure_closet/soll_officer
 	name = "sol alliance officer locker"
 	req_access = list(access_captain)

code/modules/clothing/head/misc.dm

@@ -537,67 +537,6 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
 
-/obj/item/clothing/head/sol
-	name = "sol navy utility cover"
-	desc = "A military cover issued to Sol Alliance navy members as part of their field uniform."
-	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
-	icon_state = "greyutility"
-	item_state = "greyutility"
-	contained_sprite = TRUE
-	armor = list(
-		melee = ARMOR_MELEE_MINOR
-		)
-
-/obj/item/clothing/head/sol/marine
-	name = "sol marine utility cover"
-	desc = "An eight pointed cover issued to Sol Alliance marines as part of their field uniform."
-	icon_state = "greenutility"
-	item_state = "greenutility"
-
-/obj/item/clothing/head/sol/garrison
-	name = "sol marine garrison cap"
-	desc = "A green garrison cap issued to Sol Alliance marines."
-	icon_state = "greengarrisoncap"
-	item_state = "greengarrisoncap"
-
-/obj/item/clothing/head/sol/dress
-	name = "sol navy black peaked cap"
-	desc = "A black cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by junior officers."
-	icon_state = "whitepeakcap"
-	item_state = "whitepeakcap"
-/obj/item/clothing/head/sol/dress/marine
-	name = "sol marine peaked cap"
-	desc = "A green cap issued as part of the Sol Alliance marine service and dress uniforms."
-	icon_state = "whitepeakcap"
-	item_state = "whitepeakcap"
-
-/obj/item/clothing/head/sol/dress/officer
-	name = "sol navy officer peaked cap"
-	desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by senior officers."
-	icon_state = "whitewheelcap"
-	item_state = "whitewheelcap"
-
-/obj/item/clothing/head/sol/dress/admiral
-	name = "sol navy admiral peaked cap"
-	desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by admirals."
-	icon_state = "admiral_cap"
-	item_state = "admiral_cap"
-
-/obj/item/clothing/head/helmet/sol
-	name = "sol combat helmet"
-	desc = "A woodland colored helmet made from advanced ceramic."
-	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
-	icon_state = "helmet_tac_sol"
-	item_state = "helmet_tac_sol"
-	armor = list(
-		melee = ARMOR_MELEE_MAJOR,
-		bullet = ARMOR_BALLISTIC_MEDIUM,
-		laser = ARMOR_LASER_RIFLE,
-		energy = ARMOR_ENERGY_SMALL,
-		bomb = ARMOR_BOMB_PADDED
-	)
-	contained_sprite = TRUE
-
 /obj/item/clothing/head/padded
 	name = "padded cap"
 	desc = "A padded skullcap for those prone to bumping their heads against hard surfaces."
@@ -638,4 +577,132 @@
 	icon = 'icons/obj/item/clothing/head/leader_headband.dmi'
 	icon_state = "leader_headband"
 	item_state = "leader_headband"
-	contained_sprite = TRUE
+	contained_sprite = TRUE
+
+//sol stuff
+
+/obj/item/clothing/head/sol
+	name = "sol navy utility cover"
+	desc = "A military cover issued to Solarian Navy personnel as part of their utility uniform."
+	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
+	icon_state = "navy_utility"
+	item_state = "navy_utility"
+	contained_sprite = TRUE
+	armor = list(
+		melee = ARMOR_MELEE_MINOR
+		)
+
+/obj/item/clothing/head/sol/dress
+	name = "sol navy black peaked cap"
+	desc = "A black cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by junior officers."
+	icon_state = "navy_cap_officer"
+	item_state = "navy_cap_officer"
+
+/obj/item/clothing/head/sol/dress/officer
+	name = "sol navy officer peaked cap"
+	desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by senior officers."
+	icon_state = "navy_cap_senioroff"
+	item_state = "navy_cap_senioroff"
+
+/obj/item/clothing/head/sol/dress/admiral
+	name = "sol navy admiral peaked cap"
+	desc = "A white cap issued as part of the Sol Alliance naval officer uniforms. This one is worn by admirals."
+	icon_state = "navy_cap_admiral"
+	item_state = "navy_cap_admiral"
+
+//solarian marines
+
+/obj/item/clothing/head/sol/marine
+	name = "sol marine utility cover"
+	desc = "An eight pointed cover issued to Sol Alliance marines as part of their field uniform."
+	icon_state = "marine_utility"
+	item_state = "marine_utility"
+
+/obj/item/clothing/head/sol/marine/grey
+	name = "sol marine utility cover"
+	desc = "An eight pointed cover issued to Sol Alliance marines as part of their field uniform."
+	icon_state = "marine_utility_grey"
+	item_state = "marine_utility_grey"
+
+/obj/item/clothing/head/sol/garrison
+	name = "sol marine garrison cap"
+	desc = "A green garrison cap issued to Sol Alliance marines."
+	icon_state = "greengarrisoncap"
+	item_state = "greengarrisoncap"
+
+/obj/item/clothing/head/sol/dress/marine
+	name = "sol marine peaked cap"
+	desc = "A green cap issued as part of the Sol Alliance marine service and dress uniforms."
+	icon_state = "whitepeakcap"
+	item_state = "whitepeakcap"
+
+//solarian army
+
+/obj/item/clothing/head/helmet/sol
+	name = "sol combat helmet"
+	desc = "A woodland colored helmet made from advanced ceramic."
+	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
+	icon_state = "helmet_tac_sol"
+	item_state = "helmet_tac_sol"
+	armor = list(
+		melee = ARMOR_MELEE_MAJOR,
+		bullet = ARMOR_BALLISTIC_MEDIUM,
+		laser = ARMOR_LASER_RIFLE,
+		energy = ARMOR_ENERGY_SMALL,
+		bomb = ARMOR_BOMB_PADDED
+	)
+	contained_sprite = TRUE
+
+/obj/item/clothing/head/sol/army
+	name = "sol army field cap"
+	desc = "A cloth field issued to Solarian soldiers as part of their field uniform."
+	icon_state = "army_field"
+	item_state = "army_field"
+
+/obj/item/clothing/head/sol/army/grey
+	name = "sol army field cap"
+	desc = "A cloth field issued to Solarian soldiers as part of their field uniform."
+	icon_state = "army_field_grey"
+	item_state = "army_field_grey"
+
+/obj/item/clothing/head/sol/army/service
+	name = "sol army peaked cap"
+	desc = "A green peaked cap issued as part of Solarian Army service uniforms. A small silver pin of the ASSN seal is attached to the peak. A enlisted-person or NCO should wear this."
+	icon_state = "army_cap"
+	item_state = "army_cap"
+
+/obj/item/clothing/head/sol/army/service/officer
+	name = "sol army officer peaked cap"
+	desc = "A green peaked cap issued as part of Solarian Army service uniforms. A large gold pin of the ASSN seal is attached to the peak. A Second Lieutenant, First Lieutenant or Captain should wear this."
+	icon_state = "army_cap_officer"
+	item_state = "army_cap_officer"
+
+/obj/item/clothing/head/sol/army/service/senioroff
+	name = "sol army senior officer peaked cap"
+	desc = "A green peaked cap issued as part of Solarian Army service uniforms. A large gold pin of the ASSN seal is attached to the peak and leaf-shaped embellishments rap around the visor. A Major, Lieutenant Colonel or Colonel should wear this."
+	icon_state = "army_cap_senioroff"
+	item_state = "army_cap_senioroff"
+
+/obj/item/clothing/head/sol/army/service/general
+	name = "sol army general peaked cap"
+	desc = "A green peaked cap issued as part of Solarian Army service uniforms. A large gold pin of the ASSN seal is attached to the peak and leaf-shaped embellishments rap around the visor. A Brigadier General, Major General, Lieutenant General or full General should wear this."
+	icon_state = "army_cap_general"
+	item_state = "army_cap_general"
+
+/obj/item/clothing/head/sol/army/service/garrison
+	name = "sol army garrison cap"
+	desc = "A green garrison cap issued as part of Solarian Army service uniforms, for when a peaked cap is impractical or unnecessary. All enlisted-people and NCOs should wear this."
+	icon_state = "army_garrison"
+	item_state = "army_garrison"
+
+/obj/item/clothing/head/sol/army/service/garrison/officer
+	name = "sol army garrison cap"
+	desc = "A green garrison cap issued as part of Solarian Army service uniforms, for when a peaked cap is impractical or unnecessary. A golden rank pin is attached to one side. All officers, including generals, should wear this."
+	icon_state = "army_garrison_officer"
+	item_state = "army_garrison_officer"
+
+/obj/item/clothing/head/sol/army/service/campaign
+	name = "sol army campaign hat"
+	desc = "A green campaign hat issued as part of Solarian Army service uniforms. The NCOs that scream at you more than the normal ones should wear this."
+	icon_state = "army_campaign"
+	item_state = "army_campaign"

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

@@ -1,10 +1,10 @@
 
 /obj/item/clothing/under/rank/sol //regular sol navy uniform
 	name = "sol navy coveralls"
-	desc = "Fire-retardant naval utility coveralls, worn by Solarian naval personnel serving aboard ships and in the field."
+	desc = "Unflattering fire-retardant naval coveralls, worn by Solarian Navy personnel serving aboard ships and in the field."
 	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
-	icon_state = "sol_uniform"
-	item_state = "sol_uniform"
+	icon_state = "navy_coveralls"
+	item_state = "navy_coveralls"
 	contained_sprite = TRUE
 	armor = list(
 		melee = ARMOR_MELEE_SMALL,
@@ -12,17 +12,17 @@
 		laser = ARMOR_LASER_MINOR
 		)
 
-/obj/item/clothing/under/rank/sol/marine //regular sol navy marine fatigues
+/obj/item/clothing/under/rank/sol/marine //green sol marine fatigues
 	name = "sol marine fatigues"
-	desc = "A military uniform issued to Sol Alliance marines, to be used while in the field."
-	icon_state = "marine_fatigue"
-	item_state = "marine_fatigue"
+	desc = "A set of green military fatigues issued to Solarian marines, you can tell it's a marine uniform because an embroidered patch of the seal of the Solarian Marine Corps is sewn to the left chest pocket."
+	icon_state = "sol_fatigue_green"
+	item_state = "sol_fatigue_green"
 
-/obj/item/clothing/under/rank/sol/army //regular sol army fatigues
-	name = "sol army fatigues"
-	desc = "A military uniform issued to the oft-forgotten soldiers of the Sol Alliance's Army, to be used while in the field."
-	icon_state = "army_fatigue"
-	item_state = "army_fatigue"
+/obj/item/clothing/under/rank/sol/marine/grey //grey sol marine fatigues
+	name = "grey sol marine fatigues"
+	desc = "A set of grey military fatigues issued to Solarian marines, you can tell it's a marine uniform because an embroidered patch of the seal of the Solarian Marine Corps is sewn to the left chest pocket."
+	icon_state = "sol_fatigue_grey"
+	item_state = "sol_fatigue_grey"
 
 /obj/item/clothing/under/rank/sol/ipc //sol IPC fatigues
 	name = "sol military ipc coveralls"
@@ -32,42 +32,80 @@
 
 /obj/item/clothing/under/rank/sol/service //navy personnel service uniform
 	name = "sol navy service uniform"
-	desc = "A military service uniform issued to Sol Alliance naval personnel, to be worn in environments where a utility uniform is unfitting."
+	desc = "A military service uniform issued to Solarian naval personnel, to be worn in environments where a utility uniform is unfitting."
 	icon_state = "whiteservice"
 	item_state = "whiteservice"
 
 /obj/item/clothing/under/rank/sol/service/marine //sol marine service uniform
 	name = "sol marine service uniform"
-	desc = "A military service uniform issued to Sol Alliance marines, to be worn in environments where a utility uniform is unfitting."
+	desc = "A military service uniform issued to Solarian marines, to be worn in environments where a utility uniform is unfitting."
 	icon_state = "tanutility"
 	item_state = "tanutility"
 
 /obj/item/clothing/under/rank/sol/dress //navy personnel dress uniform
 	name = "sol navy dress uniform"
-	desc = "A fancy military dress uniform issued to Sol Alliance naval personnel, to be worn in environments where a service uniform isn't formal enough."
+	desc = "A fancy military dress uniform issued to Solarian naval personnel, to be worn in environments where a service uniform isn't formal enough."
 	icon_state = "sailor"
 	item_state = "sailor"
 
 /obj/item/clothing/under/rank/sol/dress/marine //sol marine dress uniform
 	name = "sol marine dress uniform"
-	desc = "A fancy military dress uniform issued to Sol Alliance marines, to be worn in environments where a service uniform isn't formal enough."
+	desc = "A fancy military dress uniform issued to Solarian marines, to be worn in environments where a service uniform isn't formal enough."
 	icon_state = "mahreendress"
 	item_state = "mahreendress"
 
-/obj/item/clothing/under/rank/sol/dress/subofficer //sol marine officer dress uniform
-	name = "sol navy junior officer uniform"
-	desc = "A fancy military uniform issued to lower ranking Sol Alliance navy officers. An officer in this uniform would be an Ensign, Sub-Lieutenant, or Lieutenant."
-	icon_state = "subdress"
-	item_state = "subdress"
+/obj/item/clothing/under/rank/sol/dress/pettyofficer //sol navy officer dress uniform
+	name = "sol navy chief petty officer uniform"
+	desc = "A fancy military uniform issued to Solarian Navy petty officers. A Chief petty officer, Senior chief petty officer, or Master chief petty officer should wear this."
+	icon_state = "navy_dress"
+	item_state = "navy_dress"
 
-/obj/item/clothing/under/rank/sol/dress/officer //sol marine officer dress uniform
+/obj/item/clothing/under/rank/sol/dress/subofficer //sol navy officer dress uniform
+	name = "sol navy junior officer uniform"
+	desc = "A fancy military uniform issued to lower ranking Solarian Navy officers. A Ensign, Sub-Lieutenant, or Lieutenant should wear this."
+	icon_state = "navy_dress_officer"
+	item_state = "navy_dress_officer"
+
+/obj/item/clothing/under/rank/sol/dress/officer //sol navy officer dress uniform
 	name = "sol navy senior officer uniform"
-	desc = "A fancy military uniform issued to high ranking Sol Alliance navy officers. An officer in this uniform would be a Lieutenant Commander, Commander, or Captain."
-	icon_state = "dress"
-	item_state = "dress"
+	desc = "A fancy military uniform issued to high ranking Solarian Navy officers. A Lieutenant Commander, Commander, or Captain should wear this."
+	icon_state = "navy_dress_senioroff"
+	item_state = "navy_dress_senioroff"
 
 /obj/item/clothing/under/rank/sol/dress/admiral //admiral uniform
 	name = "sol navy admiral uniform"
-	desc = "A fancy military uniform issued to a higher member of the Sol Alliance navy. An officer in this uniform would be some form of Admiral."
-	icon_state = "admiral_uniform"
-	item_state = "admiral_uniform"
+	desc = "A fancy military uniform issued to a higher member of the Solarian Navy. An Admiral should wear this."
+	icon_state = "navy_dress_admiral"
+	item_state = "navy_dress_admiral"
+
+//solarian army
+
+/obj/item/clothing/under/rank/sol/army //green sol army fatigues (and a marine corp hand-me-down)
+	name = "sol army fatigues"
+	desc = "A set of green military fatigues issued to the oft-forgetten soldiers of the Solarian Army, you can tell it's an army uniform because there's a faded section on the left chest pocket where a patch of the seal of the Solarian Marine Corps presumably used to be located."
+	icon_state = "sol_fatigue_green"
+	item_state = "sol_fatigue_green"
+
+/obj/item/clothing/under/rank/sol/army/grey //grey sol army fatigues (and a marine corp hand-me-down)
+	name = "grey sol army fatigues"
+	desc = "A set of grey military fatigues issued to the oft-forgetten soldiers of the Solarian Army, you can tell it's an army uniform because there's a faded section on the left chest pocket where a patch of the seal of the Solarian Marine Corps presumably used to be located."
+	icon_state = "sol_fatigue_grey"
+	item_state = "sol_fatigue_grey"
+
+/obj/item/clothing/under/rank/sol/army/service //sol army service uniform
+	name = "sol army service uniform"
+	desc = "A military service uniform issued to Solarian Army personnel. An enlisted-person or NCO should wear this."
+	icon_state = "army_service"
+	item_state = "army_service"
+
+/obj/item/clothing/under/rank/sol/army/service/officer //sol army service uniform
+	name = "sol army officer service uniform"
+	desc = "A military service uniform issued to Solarian Army personnel. All officers below generals should wear this."
+	icon_state = "army_service_officer"
+	item_state = "army_service_officer"
+
+/obj/item/clothing/under/rank/sol/army/service/general //sol army service uniform
+	name = "sol army general service uniform"
+	desc = "A military service uniform issued to Solarian Army personnel. A Brigadier General, Major General, Lieutenant General or full General should wear this."
+	icon_state = "army_service_general"
+	item_state = "army_service_general"