Solgov tweaks (#15896)

* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update

code/modules/clothing/head/jobs.dm

@@ -198,3 +198,19 @@
 	desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers.  It is as dark as the coroner's humor."
 	icon_state = "surgcap_black"
 	dog_fashion = /datum/dog_fashion/head/surgery
+
+//Special Roles
+/obj/item/clothing/head/beret/solgov/command
+	name = "\improper Trans-Solar Federation Lieutenant's beret"
+	desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
+	icon_state = "solgovcberet"
+	item_color = "solgovc"
+	dog_fashion = null
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
+	strip_delay = 80
+
+/obj/item/clothing/head/beret/solgov/command/elite
+	name = "\improper Trans-Solar Federation Specops Lieutenant's beret"
+	desc = "A beret worn by marines of the Trans-Solar Federation Psiops division. The insignia signifies the wearer bears the rank of a Lieutenant."
+	icon_state = "solgovceliteberet"
+	item_color = "solgovcelite"

code/modules/clothing/head/soft_caps.dm

@@ -124,9 +124,29 @@
 	item_color = "solgov"
 	dog_fashion = null
 
-/obj/item/clothing/head/soft/solgov/command
+/obj/item/clothing/head/soft/solgov/marines
+	armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
+	strip_delay = 60
+	icon_state = "solgovsoft_flipped"
+	flipped = TRUE
+
+/obj/item/clothing/head/soft/solgov/marines/elite
+	name = "\improper Trans-Solar Federation Specops marine cap"
+	desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division."
+	icon_state = "solgovelitesoft_flipped"
+	item_color = "solgovelite"
+
+/obj/item/clothing/head/soft/solgov/marines/command
 	name = "\improper Trans-Solar Federation lieutenant's cap"
 	desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
-	icon_state = "solgovcsoft"
+	icon_state = "solgovcsoft_flipped"
 	item_color = "solgovc"
 	dog_fashion = null
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
+	strip_delay = 80
+
+/obj/item/clothing/head/soft/solgov/marines/command/elite
+	name = "\improper Trans-Solar Federation Specops Lieutenant's cap"
+	desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
+	icon_state = "solgovcelitesoft"
+	item_color = "solgovcelite"

code/modules/clothing/masks/gasmask.dm

@@ -58,6 +58,9 @@
 		"Grey" = 'icons/mob/species/grey/mask.dmi'
 		)
 
+/obj/item/clothing/mask/gas/explorer/marines
+	name = "military gas mask"
+
 /obj/item/clothing/mask/gas/explorer/attack_self(mob/user)
 	adjustmask(user)
 

code/modules/clothing/under/miscellaneous.dm

@@ -68,14 +68,25 @@
 	item_color = "solgov"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
 	displays_id = 0
+/obj/item/clothing/under/solgov/elite
+	name = "\improper Trans-Solar Federation Specops marine uniform"
+	desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces."
+	icon_state = "solgovelite"
+	item_color = "solgovelite"
 
 /obj/item/clothing/under/solgov/command
 	name = "\improper Trans-Solar Federation Lieutenant's uniform"
-	desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces. This one has additional insignia on its shoulders."
+	desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces. This one has additional insignia on its shoulders and cuffs."
 	icon_state = "solgovc"
 	item_color = "solgovc"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
 
+/obj/item/clothing/under/solgov/command/elite
+	name = "\improper Trans-Solar Federation Specops Lieutenant's uniform"
+	desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces. This one has additional insignia on its shoulders and cuffs."
+	icon_state = "solgovcelite"
+	item_color = "solgovcelite"
+
 /obj/item/clothing/under/solgov/rep
 	name = "\improper Trans-Solar Federation representative's uniform"
 	desc = "A formal uniform worn by the diplomatic representatives of the Trans-Solar Federation."

code/modules/projectiles/ammunition/magazines.dm

@@ -375,6 +375,10 @@
 	max_ammo = 30
 	multiple_sprites = 2
 
+/obj/item/ammo_box/magazine/m556/arg
+	name = "ARG magazine (5.56mm)"
+	icon_state = "arg"
+
 /obj/item/ammo_box/magazine/m12g
 	name = "shotgun magazine (12g slugs)"
 	desc = "A drum magazine."

code/modules/projectiles/guns/projectile/automatic.dm

@@ -240,7 +240,7 @@
 	item_state = "arg"
 	slot_flags = 0
 	origin_tech = "combat=6;engineering=4"
-	mag_type = /obj/item/ammo_box/magazine/m556
+	mag_type = /obj/item/ammo_box/magazine/m556/arg
 	fire_sound = 'sound/weapons/gunshots/gunshot_mg.ogg'
 	magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
 	magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'