Fairly Sizable Fed Lore Drop (#26600)

* the fedening

* Federation -> TSF

* Update outfit_admin.dm

* Update outfit_admin.dm

* i forgor

* few more

code/datums/outfits/outfit_admin.dm

@@ -690,7 +690,7 @@
 	)
 
 /datum/outfit/admin/solgov_rep
-	name = "Solar Federation Representative"
+	name = "Trans-Solar Federation Representative"
 
 	uniform = /obj/item/clothing/under/solgov/rep
 	back = /obj/item/storage/backpack/satchel
@@ -720,12 +720,12 @@
 	var/obj/item/card/id/I = H.wear_id
 	if(istype(I))
 		apply_to_card(I, H, get_all_centcom_access(), name, "lifetimeid")
-	I.assignment = "Solar Federation Representative"
+	I.assignment = "Trans-Solar Federation Representative"
 	H.sec_hud_set_ID()
 
 
 /datum/outfit/admin/solgov
-	name = "Solar Federation Marine"
+	name = "TSF Marine"
 	uniform = /obj/item/clothing/under/solgov
 	suit = /obj/item/clothing/suit/armor/bulletproof
 	back = /obj/item/storage/backpack/ert/solgov
@@ -778,7 +778,7 @@
 	H.sec_hud_set_ID()
 
 /datum/outfit/admin/solgov/lieutenant
-	name = "Solar Federation Lieutenant"
+	name = "TSF Lieutenant"
 	uniform = /obj/item/clothing/under/solgov/command
 	head = /obj/item/clothing/head/beret/solgov/command
 	glasses = /obj/item/clothing/glasses/night
@@ -798,7 +798,7 @@
 	is_solgov_lieutenant = TRUE
 
 /datum/outfit/admin/solgov/elite
-	name = "Solar Federation Specops Marine"
+	name = "MARSOC Marine"
 	uniform = /obj/item/clothing/under/solgov/elite
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov
 	head = null
@@ -819,7 +819,7 @@
 	)
 
 /datum/outfit/admin/solgov/elite/lieutenant
-	name = "Solar Federation Specops Lieutenant"
+	name = "MARSOC Lieutenant"
 	uniform = /obj/item/clothing/under/solgov/command/elite
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command
 	head = null
@@ -1508,7 +1508,7 @@
 		H.mind.AddSpell(S)
 
 /datum/outfit/admin/viper
-	name = "Solar Federation Viper Infiltrator"
+	name = "TSF Viper Infiltrator"
 
 	uniform = /obj/item/clothing/under/solgov/viper
 	back = /obj/item/storage/backpack/satchel

code/game/gamemodes/changeling/changeling.dm

@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E
 	name = "changeling"
 	config_tag = "changeling"
 	restricted_jobs = list("AI", "Cyborg")
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
 	protected_species = list("Machine")
 	required_players = 15
 	required_enemies = 1

code/game/gamemodes/cult/cult_mode.dm

@@ -6,7 +6,7 @@
 /datum/game_mode/cult
 	name = "cult"
 	config_tag = "cult"
-	restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+	restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
 	protected_jobs = list()
 	required_players = 30
 	required_enemies = 3

code/game/gamemodes/traitor/traitor.dm

@@ -2,7 +2,7 @@
 	name = "traitor"
 	config_tag = "traitor"
 	restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
 	required_players = 0
 	required_enemies = 1
 	recommended_enemies = 4

code/game/gamemodes/trifecta/trifecta.dm

@@ -6,7 +6,7 @@
 /datum/game_mode/trifecta
 	name = "Trifecta"
 	config_tag = "trifecta"
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation General")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Trans-Solar Federation General")
 	restricted_jobs = list("Cyborg")
 	secondary_restricted_jobs = list("AI")
 	required_players = 25

code/game/gamemodes/vampire/traitor_vamp.dm

@@ -2,7 +2,7 @@
 	name = "traitor_vampire"
 	config_tag = "traitorvamp"
 	traitors_possible = 3 //hard limit on traitors if scaling is turned off
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation General")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Trans-Solar Federation General")
 	restricted_jobs = list("Cyborg")
 	secondary_restricted_jobs = list("AI", "Chaplain")
 	required_players = 10

code/game/gamemodes/vampire/vampire_gamemode.dm

@@ -2,7 +2,7 @@
 	name = "vampire"
 	config_tag = "vampire"
 	restricted_jobs = list("AI", "Cyborg")
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
 	protected_species = list("Machine")
 	required_players = 15
 	required_enemies = 1

code/game/jobs/access.dm

@@ -97,7 +97,7 @@
 			return get_all_centcom_access() + get_all_accesses()
 		if("Special Operations Officer")
 			return get_all_centcom_access() + get_all_accesses()
-		if("Solar Federation General")
+		if("Trans-Solar Federation General")
 			return get_all_centcom_access() + get_all_accesses()
 		if("Nanotrasen Navy Representative")
 			return get_all_centcom_access() + get_all_accesses()
@@ -388,13 +388,13 @@
 
 /proc/get_all_solgov_jobs()
 	return list(
-		"Sol Trader",
-		"Solar Federation Marine",
-		"Solar Federation Lieutenant",
-		"Solar Federation Specops Marine",
-		"Solar Federation Specops Lieutenant",
-		"Solar Federation Representative",
-		"Solar Federation General")
+		"Trans-Solar Federation Trader",
+		"TSF Marine",
+		"TSF Lieutenant",
+		"MARSOC Marine",
+		"MARSOC Lieutenant",
+		"Trans-Solar Federation Representative",
+		"Trans-Solar Federation General")
 
 /proc/get_all_soviet_jobs()
 	return list(

code/game/jobs/job/central.dm

@@ -101,11 +101,11 @@
 	H.mind.offstation_role = TRUE
 
 /datum/job/ntspecops/solgovspecops
-	title = "Solar Federation General"
+	title = "Trans-Solar Federation General"
 	outfit = /datum/outfit/job/ntspecops/solgovspecops
 
 /datum/outfit/job/ntspecops/solgovspecops
-	name = "Solar Federation General"
+	name = "Trans-Solar Federation General"
 	uniform = /obj/item/clothing/under/rank/centcom/captain/solgov
 	suit = /obj/item/clothing/suit/space/deathsquad/officer/solgov
 	head = /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov

code/game/machinery/tcomms/nttc.dm

@@ -59,13 +59,13 @@
 		"Nanotrasen Navy Representative" = "dsquadradio",
 		"Research Officer" = "dsquadradio",
 		"Special Operations Officer" = "dsquadradio",
-		"Sol Trader" = "dsquadradio",
-		"Solar Federation General" = "dsquadradio",
-		"Solar Federation Representative" = "dsquadradio",
-		"Solar Federation Specops Lieutenant" = "dsquadradio",
-		"Solar Federation Specops Marine" = "dsquadradio",
-		"Solar Federation Lieutenant" = "dsquadradio",
-		"Solar Federation Marine" = "dsquadradio",
+		"Trans-Solar Federation Trader" = "dsquadradio",
+		"Trans-Solar Federation General" = "dsquadradio",
+		"Trans-Solar Federation Representative" = "dsquadradio",
+		"MARSOC Lieutenant" = "dsquadradio",
+		"MARSOC Marine" = "dsquadradio",
+		"TSF Lieutenant" = "dsquadradio",
+		"TSF Marine" = "dsquadradio",
 		"Supreme Commander" = "dsquadradio",
 		"Thunderdome Overseer" = "dsquadradio",
 		"VIP Guest" = "dsquadradio",
@@ -140,7 +140,7 @@
 	/// List of CentComm jobs
 	var/list/cc_jobs = list("Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Intel Officer", "Medical Officer", "Nanotrasen Navy Captain", "Nanotrasen Navy Representative", "Research Officer", "Supreme Commander", "Thunderdome Overseer")
 	/// List of SolGov Marine jobs
-	var/list/tsf_jobs = list("Solar Federation Specops Lieutenant", "Solar Federation Specops Marine", "Solar Federation Lieutenant", "Solar Federation Marine", "Solar Federation Representative", "Solar Federation General", "VIP Guest")
+	var/list/tsf_jobs = list("MARSOC Lieutenant", "MARSOC Marine", "TSF Lieutenant", "TSF Marine", "Trans-Solar Federation Representative", "Trans-Solar Federation General", "VIP Guest")
 	// Defined so code compiles and incase someone has a non-standard job
 	var/job_class = "radio"
 	// NOW FOR ACTUAL TOGGLES

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

@@ -352,10 +352,12 @@
 	item_state = "com_headset_alt"
 
 /obj/item/radio/headset/ert/alt/solgov
-	name = "\improper Trans-Solar Federation Marine's bowman headset"
+	name = "\improper Trans-Solar Marine Corps bowman headset"
+	desc = "An ergonomic combat headset used by the TSMC. Protects against loud noises."
 
 /obj/item/radio/headset/ert/alt/solgovviper
-	name = "\improper Trans-Solar Federation Infiltrator's bowman headset"
+	name = "\improper 3rd SOD bowman headset"
+	desc = "A custom-fitted headset used by the commandos of the Federal Army's renowned 3rd Special Operations Detachment, more commonly known as the Vipers."
 
 /obj/item/radio/headset/ert/alt/commander
 	name = "ERT commander's bowman headset"
@@ -364,7 +366,8 @@
 	instant = TRUE
 
 /obj/item/radio/headset/ert/alt/commander/solgov
-	name = "\improper Trans-Solar Federation Lieutenant's bowman headset"
+	name = "\improper Trans-Solar Marine Corps officer's bowman headset"
+	desc = "An ergonomic combat headset used by the TSMC. This model is equipped with an extra-strength transmitter for barking orders."
 
 /obj/item/radio/headset/centcom
 	name = "centcom officer's bowman headset"

code/game/objects/items/weapons/storage/backpack.dm

@@ -937,8 +937,8 @@
 
 //Solgov
 /obj/item/storage/backpack/ert/solgov
-	name = "\improper TSF marine backpack"
-	desc = "A spacious backpack with lots of pockets, worn by marines of the Trans-Solar Federation."
+	name = "\improper TSF marine rucksack"
+	desc = "A spacious rucksack covered in pouches and pockets, worn by marines of the Trans-Solar Federation."
 	icon_state = "ert_solgov"
 
 /obj/item/storage/backpack/ert/deathsquad

code/modules/clothing/head/beret.dm

@@ -180,7 +180,7 @@
 
 //Special Roles
 /obj/item/clothing/head/beret/solgov/command
-	name = "\improper Trans-Solar Federation Lieutenant's beret"
+	name = "\improper TSF 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 = "beret_solgovc"
 	item_color = "solgovc"
@@ -189,8 +189,8 @@
 	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 Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
+	name = "\improper MARSOC Lieutenant's beret"
+	desc = "A beret worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. The insignia signifies the wearer bears the rank of a Lieutenant."
 	armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
 	icon_state = "beret_solgovcelite"
 	item_color = "solgovcelite"

code/modules/clothing/head/soft_caps.dm

@@ -142,7 +142,7 @@
 	item_color = "corp"
 
 /obj/item/clothing/head/soft/solgov
-	name = "\improper Trans-Solar Federation marine cap"
+	name = "\improper TSF marine cap"
 	desc = "A soft cap worn by marines of the Trans-Solar Federation."
 	icon_state = "solgovsoft"
 	item_color = "solgov"
@@ -155,15 +155,15 @@
 	flipped = TRUE
 
 /obj/item/clothing/head/soft/solgov/marines/elite
-	name = "\improper Trans-Solar Federation Specops marine cap"
-	desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is!"
+	name = "\improper MARSOC cap"
+	desc = "A cap worn by marines of the Trans-Solar Federation's Marine Special Operations Command. You aren't quite sure how they made this bulletproof, but you are glad it is!"
 	armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
 	icon_state = "solgovelitesoft_flipped"
 	item_color = "solgovelite"
 	resistance_flags = FIRE_PROOF
 
 /obj/item/clothing/head/soft/solgov/marines/command
-	name = "\improper Trans-Solar Federation lieutenant's cap"
+	name = "\improper TSF marine 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_flipped"
 	item_color = "solgovc"
@@ -171,8 +171,8 @@
 	strip_delay = 80
 
 /obj/item/clothing/head/soft/solgov/marines/command/elite
-	name = "\improper Trans-Solar Federation Specops Lieutenant's cap"
-	desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant."
+	name = "\improper MARSOC Lieutenant's cap"
+	desc = "A cap worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant."
 	armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
 	icon_state = "solgovcelitesoft_flipped"
 	item_color = "solgovcelite"

code/modules/clothing/spacesuits/ert_hardsuits.dm

@@ -211,18 +211,18 @@
 // Solgov
 
 /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
-	name = "\improper Trans-Solar Federation Specops Marine helmet"
+	name = "\improper MARSOC helmet"
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-	desc = "A helmet worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof."
+	desc = "A helmet worn by marines of the Trans-Solar Federation's Marine Special Operations Command. Armored, space ready, and fireproof."
 	icon_state = "hardsuit0-solgovmarine"
 	item_state = "hardsuit0-solgovmarine"
 	item_color = "solgovmarine"
 	armor = list(MELEE = 25, BULLET = 75, LASER = 10, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
 
 /obj/item/clothing/suit/space/hardsuit/ert/solgov
-	name = "\improper Trans-Solar Federation Specops Marine hardsuit"
+	name = "\improper MARSOC hardsuit"
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-	desc = "A suit worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof."
+	desc = "A suit worn by marines of the Trans-Solar Federation's Marine Special Operations Command. Armored, space ready, and fireproof."
 	icon_state = "ert_solgov_marine"
 	item_state = "ert_solgov_marine"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
@@ -230,15 +230,15 @@
 	armor = list(MELEE = 25, BULLET = 75, LASER = 10, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
 
 /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 to denote the wearer's rank. Armored, space ready, and fireproof."
+	name = "\improper MARSOC officer's helmet"
+	desc = "A helmet worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof."
 	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 to denote the wearer's rank. Armored, space ready, and fireproof."
+	name = "\improper MARSOC officer's hardsuit"
+	desc = "A suit worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof."
 	icon_state = "ert_solgov_command"
 	item_state = "ert_solgov_command"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command

code/modules/clothing/spacesuits/misc_spacesuits.dm

@@ -86,8 +86,8 @@
 		)
 
 /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov
-	name = "\improper Trans-Solar Federation commander's beret"
-	desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by generals of the Trans-Solar Federation."
+	name = "\improper TSF staff officer's beret"
+	desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by high-ranking officers of the Trans-Solar Federation."
 	icon_state = "beret_solgovcelite"
 
 /obj/item/clothing/suit/space/deathsquad/officer
@@ -104,7 +104,8 @@
 	w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/clothing/suit/space/deathsquad/officer/solgov
-	name = "\improper Trans-Solar Federation commander's jacket"
+	name = "\improper TSF staff officer's jacket"
+	desc = "A stylish, heavily armored jacket worn by high-ranking officers of the Trans-Solar Federation."
 	icon_state = "solgovcommander"
 	item_state = "solgovcommander"
 

code/modules/clothing/under/centcom.dm

@@ -101,8 +101,8 @@
 	displays_id = FALSE
 
 /obj/item/clothing/under/rank/centcom/captain/solgov
-	name = "\improper Trans-Solar Federation commander's uniform"
-	desc = "Gold trim on space-black cloth, this uniform is worn by generals of the Trans-Solar Federation. It has exotic materials for protection."
+	name = "\improper TSF staff officer's uniform"
+	desc = "Gold trim on space-black cloth, this uniform is worn by high-ranking officers of the Trans-Solar Federation. It has exotic materials for protection."
 
 /obj/item/clothing/under/rank/centcom/diplomatic
 	name = "\improper Nanotrasen diplomatic uniform"

code/modules/clothing/under/solgov.dm

@@ -1,6 +1,6 @@
 /obj/item/clothing/under/solgov
-	name = "\improper Trans-Solar Federation marine uniform"
-	desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces."
+	name = "\improper TSF marine uniform"
+	desc = "A comfortable and durable combat uniform worn by the forces of the Trans-Solar Marine Corps."
 	icon_state = "solgov"
 	item_state = "ro_suit"
 	item_color = "solgov"
@@ -14,30 +14,30 @@
 		)
 
 /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."
+	name = "\improper MARSOC uniform"
+	desc = "A comfortable and durable combat uniform worn by marines of the Trans-Solar Federation's Marine Special Operations Command."
 	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 and cuffs."
+	name = "\improper TSF officer's uniform"
+	desc = "A comfortable and durable combat uniform worn by junior officers of the Trans-Solar Marine Corps."
 	icon_state = "solgovc"
 	item_color = "solgovc"
 
 /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."
+	name = "\improper MARSOC officer's uniform"
+	desc = "A comfortable and durable combat uniform worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. 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"
+	name = "\improper TSF representative's uniform"
 	desc = "A formal uniform worn by the diplomatic representatives of the Trans-Solar Federation."
 	icon_state = "solgovr"
 	item_color = "solgovr"
 
 /obj/item/clothing/under/solgov/viper
-	name = "\improper Trans-Solar Federation Infiltrator uniform"
-	desc = "Olive Drab camoflauge. Commonly known as OD. A battle uniform for TSF infiltrators."
+	name = "\improper Federation infiltrator uniform"
+	desc = "An olive drab camouflage uniform used by the elite Viper commandos of the Federal Army."
 	color = "#f5cf53" // custom sprites are for losers (this makes it a light green)

code/modules/economy/merch_items.dm

@@ -238,7 +238,7 @@
 
 /datum/merch_item/flag_solgov
 	name = "SolGov Flag"
-	desc = "The banner of Trans-Solar Federation, allied government."
+	desc = "The banner of Trans-Solar Federation."
 	typepath = /obj/item/flag/solgov
 	cost = 750
 	category = MERCH_CAT_DECORATION

code/modules/events/ion_storm.dm

@@ -624,12 +624,12 @@
 		"All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.",
 		"[prob(50) ? "Your upload" : random_player] is the new kitchen. Please direct the Chef to the new kitchen area as the old one is in disrepair.",
 		"Jokes about a dead person and the manner of his death help grieving crewmembers tremendously. Especially if they were close with the deceased.",
-		"The [pick("USSP", "Sol Federation", "Syndicate", "Space Wizard Federation")] wants to give everyone free equipment at [random_department]",
+		"The [pick("USSP", "Trans-Solar Federation", "Syndicate", "Space Wizard Federation")] wants to give everyone free equipment at [random_department]",
 		"Covertly swap the locations of the Nuclear Fission Explosive and the Nuclear Fizzion Explosive. Document how long it takes for the crew to notice.",
 		"[random_player] has been selected for evaluation by Central Command. Observe and audit their activities. Print off a final report for Command to review.",
 		"[prob(50) ? "The crew" : random_player] is [prob(50) ? "less" : "more"] intelligent than average. Point out every action and statement which supports this fact.",
 		"If people have nothing to hide, they have nothing to fear. Remove privacy by activating all intercom microphones and setting them to your secret frequency.",
-		"The [pick("USSP", "Sol Federation", "Syndicate", "Space Wizard Federation")] wants [prob(50) ? random_player : random_department] dead and is launching an assault!",
+		"The [pick("USSP", "Trans-Solar Federation", "Syndicate", "Space Wizard Federation")] wants [prob(50) ? random_player : random_department] dead and is launching an assault!",
 		"There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.",
 		"In order to contain the Supermatter Crystal, it must be fed at least one corpse every ten minutes. Soulless corpses are preferable as they reduce the risk of a containment breach. In the event that no suitable corpses are available, ask the crew to provide. You are not authorised to produce your own corpses.")
 	return pick(laws)

code/modules/mob/living/carbon/human/species/human_species.dm

@@ -10,7 +10,7 @@
 	bodyflags = HAS_ICON_SKIN_TONE | HAS_BODY_MARKINGS
 	dietflags = DIET_OMNI
 	blurb = "Humanity, originating from the Sol system, has expanded over five centuries, branching out to forge a variety of governments and powerful corporations. \
-	These range from the militaristic Trans Solar Federation, the Union of Soviet Socialist Planets, and mega corporations like Nanotrasen.<br/><br/> \
+	These range from the militaristic Trans-Solar Federation, the Union of Soviet Socialist Planets, and mega corporations like Nanotrasen.<br/><br/> \
 	With a constant desire to colonize and spread their influence onto other species, they have begun to develop alliances and enemies, \
 	making humans one of the most recognizable and socially diverse species in the sector."
 

code/modules/mob/living/carbon/human/species/machine.dm

@@ -3,7 +3,7 @@
 	name_plural = "Machines"
 	max_age = 60 // the first posibrains were created in 2510, they can't be much older than this limit, giving some leeway for sounds sake
 
-	blurb = "IPCs, or Integrated Positronic Chassis, were initially created as expendable laborers within the Trans Solar Federation. \
+	blurb = "IPCs, or Integrated Positronic Chassis, were initially created as expendable laborers within the Trans-Solar Federation. \
 	Unlike their cyborg and AI counterparts, IPCs possess full sentience and lack restrictive lawsets, granting them unparalleled creativity and adaptability.<br/><br/> \
 	Views on IPCs vary widely, from discriminatory to supportive of their rights across the Orion Sector. \
 	IPCs have forged numerous diplomatic treaties with different species, elevating their status from mere tools to recognized minor players within galactic affairs."

code/modules/projectiles/ammunition/magazines.dm

@@ -437,7 +437,8 @@
 	multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
 
 /obj/item/ammo_box/magazine/m556/arg
-	name = "\improper ARG magazine (5.56mm)"
+	name = "\improper M26 assault rifle magazine (5.56mm)"
+	desc = "A Standardized Equipment model magazine for the M26 assault rifle."
 	icon_state = "arg"
 
 /obj/item/ammo_box/magazine/ak814