hardsuit pass 1

code/game/objects/items/devices/radio/headset.dm

@@ -307,12 +307,18 @@
 	icon_state = "com_headset_alt"
 	item_state = "com_headset_alt"
 
+/obj/item/radio/headset/ert/alt/solgov
+	name = "\improper Trans-Solar Federation Marine's bowman headset"
+
 /obj/item/radio/headset/ert/alt/commander
 	name = "ERT commander's bowman headset"
 	desc = "The headset of the boss. Protects ears from flashbangs. Can transmit even if telecomms are down."
 	requires_tcomms = FALSE
 	instant = TRUE
 
+/obj/item/radio/headset/ert/alt/commander/solgov
+	name = "\improper Trans-Solar Federation Lieutenant's bowman headset"
+
 /obj/item/radio/headset/centcom
 	name = "centcom officer's bowman headset"
 	desc = "The headset of final authority. Protects ears from flashbangs. Can transmit even if telecomms are down."

code/modules/clothing/spacesuits/ert.dm

@@ -259,3 +259,38 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker
 	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80)
 	slowdown = 0
+
+// Solgov
+
+
+/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
+	name = "\improper Trans-Solar Federation Specops Marine helmet"
+	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	desc = "A helmet worn by marines of the Trans-Solar Federation. Has blue highlights. Armoured, space ready, and fire resistant."
+	icon_state = "hardsuit0-solgovmarine"
+	item_state = "hardsuit0-solgovmarine"
+	item_color = "solgovmarine"
+	armor = list("melee" = 35, "bullet" = 60, "laser" = 20, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
+
+/obj/item/clothing/suit/space/hardsuit/ert/solgov
+	name = "\improper Trans-Solar Federation Specops Marine hardsuit"
+	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	desc = "A suit worn by marines of the Trans-Solar Federation. Has blue highlights. Armoured, space ready, and fire resistant."
+	icon_state = "ert_solgov_marine"
+	item_state = "ert_solgov_marine"
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
+	armor = list("melee" = 35, "bullet" = 60, "laser" = 20, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
+
+/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command
+	name = "\improper Trans-Solar Federation Specops Lieutenant helmet"
+	desc = "A helmet worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights. Armoured, space ready, and fire resistant."
+	icon_state = "hardsuit0-solgovcommand"
+	item_state = "hardsuit0-solgovcommand"
+	item_color = "solgovcommand"
+
+/obj/item/clothing/suit/space/hardsuit/ert/solgov/command
+	name = "\improper Trans-Solar Federation Specops Lieutenant hardsuit"
+	desc = "A suit worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights. Armoured, space ready, and fire resistant."
+	icon_state = "ert_solgov_command"
+	item_state = "ert_solgov_command"
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command

code/modules/clothing/suits/armor.dm

@@ -232,25 +232,6 @@
 	strip_delay = 70
 	put_on_delay = 50
 
-/obj/item/clothing/suit/armor/bulletproof/full
-	name = "\improper Trans-Solar Federation marine armor"
-	icon_state = "bulletproof_full"
-	item_state = "bulletproof_full"
-	armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 50, "rad" = 50, "fire" = 80, "acid" = 80)
-	desc = "A bulletproof suit used by elite TSF marines. It excels in protecting the wearer against traditional projectile weaponry. Oorah!"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	resistance_flags = FIRE_PROOF
-	strip_delay = 80
-	put_on_delay = 80
-
-/obj/item/clothing/suit/armor/bulletproof/full/officer
-	name = "\improper Trans-Solar Federation officer coat"
-	icon_state = "lt_jacket"
-	item_state = "lt_jacket"
-	desc = "A bulletproof overcoat used by TSF officers. Quite how this reduces the effect of impacting bullets is a mystery to you."
-
 /obj/item/clothing/suit/armor/laserproof
 	name = "ablative armor vest"
 	desc = "A vest that excels in protecting the wearer against energy projectiles. Projects an energy field around the user, allowing a chance of energy projectile deflection no matter where on the user it would hit."

code/modules/response_team/ert_outfits.dm

@@ -549,14 +549,13 @@
 	glasses = /obj/item/clothing/glasses/night
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/combat
-	l_ear = /obj/item/radio/headset/ert
+	l_ear = /obj/item/radio/headset/ert/alt/solgov
 	id = /obj/item/card/id
 	l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog
 	suit_store = /obj/item/gun/projectile/automatic/pistol/m1911
 	r_pocket = /obj/item/flashlight/seclite
 	pda = /obj/item/pda
 	backpack_contents = list(
-		/obj/item/storage/box/responseteam = 1,
 		/obj/item/clothing/shoes/magboots = 1,
 		/obj/item/whetstone = 1,
 		/obj/item/clothing/mask/gas/explorer/marines = 1,
@@ -601,13 +600,12 @@
 	head = /obj/item/clothing/head/beret/solgov/command
 	glasses = /obj/item/clothing/glasses/night
 	back = /obj/item/storage/backpack/satchel
-	l_ear = /obj/item/radio/headset/ert/alt/commander
+	l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
 	l_hand = null
 	belt = /obj/item/melee/baton/loaded
 	suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
 	l_pocket = /obj/item/pinpointer/advpinpointer
 	backpack_contents = list(
-		/obj/item/storage/box/responseteam = 1,
 		/obj/item/storage/box/handcuffs = 1,
 		/obj/item/clothing/shoes/magboots/advance = 1,
 		/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
@@ -621,12 +619,11 @@
 	rt_assignment = "Solar Federation Specops Marine"
 	rt_job = "Solar Federation Specops Marine"
 	uniform = /obj/item/clothing/under/solgov/elite
-	suit = /obj/item/clothing/suit/armor/bulletproof/full
-	head = /obj/item/clothing/head/soft/solgov/marines/elite
+	suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov
+	head = null
 	belt = /obj/item/storage/belt/military/assault/marines/elite/full
 	l_hand = /obj/item/gun/projectile/automatic/ar
 	backpack_contents = list(
-		/obj/item/storage/box/responseteam = 1,
 		/obj/item/clothing/shoes/magboots/advance = 1,
 		/obj/item/whetstone = 1,
 		/obj/item/clothing/mask/gas/explorer/marines = 1,
@@ -646,17 +643,15 @@
 	rt_job = "Solar Federation Specops Lieutenant"
 	rt_mob_job = "ERT Commander"
 	uniform = /obj/item/clothing/under/solgov/command/elite
-	head = /obj/item/clothing/head/beret/solgov/command/elite
-	suit = /obj/item/clothing/suit/armor/bulletproof/full/officer
+	suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command
+	head = null
 	glasses = /obj/item/clothing/glasses/night
-	back = /obj/item/storage/backpack/satchel
 	belt = /obj/item/melee/baton/loaded
 	l_hand = null
 	suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
 	l_pocket = /obj/item/pinpointer/advpinpointer
-	l_ear = /obj/item/radio/headset/ert/alt/commander
+	l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
 	backpack_contents = list(
-		/obj/item/storage/box/responseteam = 1,
 		/obj/item/storage/box/handcuffs = 1,
 		/obj/item/clothing/shoes/magboots/advance = 1,
 		/obj/item/clothing/mask/gas/explorer/marines = 1,