[MIRROR] Excised Errant Bay Military Lore

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -330,7 +330,7 @@
 	path = /obj/item/clothing/head/welding/engie
 
 /datum/gear/head/beret/solgov
-	display_name = "beret sol, selection"
+	display_name = "beret government, selection"
 	path = /obj/item/clothing/head/beret/solgov
 
 /datum/gear/head/beret/solgov/New()

code/modules/clothing/head/jobs.dm

@@ -175,6 +175,7 @@
 	icon_state = "beret_corporate_hos"
 	item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black")
 
+
 //Medical
 /obj/item/clothing/head/surgery
 	name = "surgical cap"

code/modules/clothing/head/misc.dm

@@ -452,3 +452,31 @@
 	icon_state = "blackngoldheaddress"
 	flags_inv = HIDEEYES
 	body_parts_covered = HEAD|EYES
+
+//Corporate Berets
+
+/obj/item/clothing/head/beret/corp/saare
+	name = "\improper SAARE beret"
+	desc = "A red beret denoting service with Stealth Assault Enterprises. For mercenaries that are more inclined towards style than safety."
+	icon_state = "beret_red"
+
+/obj/item/clothing/head/beret/corp/saare/officer
+	name = "\improper SAARE officer beret"
+	desc = "A red beret with a gold insignia, denoting senior service with Stealth Assault Enterprises. For mercenaries who are more inclined towards style than safety."
+	icon_state = "beret_redgold"
+
+/obj/item/clothing/head/beret/corp/pcrc
+	name = "\improper PCRC beret"
+	desc = "A black beret with a PCRC logo insignia, denoting service with Proxima Centauri Risk Control. For private security personnel that are more inclined towards style than safety."
+	icon_state = "beret_black_observatory"
+
+
+/obj/item/clothing/head/beret/corp/hedberg
+	name = "\improper Hedberg-Hammarstrom beret"
+	desc = "A tan beret denoting service with Hedberg-Hammarstrom private security. For mercenaries who are more inclined towards style than safety."
+	icon_state = "beret_tan"
+
+/obj/item/clothing/head/beret/corp/xion
+	name = "\improper Xion beret"
+	desc = "An orange beret denoting employment with Xion Manufacturing. For personnel that are more inclined towards style than safety."
+	icon_state = "beret_orange"

code/modules/clothing/head/misc_special.dm

@@ -151,11 +151,11 @@
 	flags_inv = HIDEEARS
 
 /obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
-	if(src.icon_state == "ushankadown")
+	if(src.icon_state == initial(icon_state))
-		src.icon_state = "ushankaup"
+		src.icon_state = "[icon_state]up"
 		to_chat(user, "You raise the ear flaps on the ushanka.")
 	else
-		src.icon_state = "ushankadown"
+		src.icon_state = initial(icon_state)
 		to_chat(user, "You lower the ear flaps on the ushanka.")
 
 /*

code/modules/clothing/head/solgov.dm

@@ -11,14 +11,14 @@
 		)
 
 /obj/item/clothing/head/soft/solgov/veteranhat
-	name = "veteran hat"
+	name = "veteran cap"
-	desc = "It's a tacky black ballcap bearing the yellow service ribbon of the Gaia Conflict."
+	desc = "It's a tacky black ballcap bearing the yellow service ribbon of the Almach War."
 	icon_state = "cap_veteran"
 
 /obj/item/clothing/head/soft/solgov/sifguard
 	name = "\improper SifGuard cap"
 	desc = "It's a black ballcap bearing a Sif Defense Force crest."
-	icon_state = "expeditionsoft"
+	icon_state = "sifguardsoft"
 	item_state_slots = list(
 		slot_l_hand_str = "blacksoft",
 		slot_r_hand_str = "blacksoft",
@@ -27,7 +27,7 @@
 /obj/item/clothing/head/soft/solgov/sifguard/co
 	name = "\improper SifGuard captain's cap"
 	desc = "It's a black ballcap bearing the Sif Defense Force crest. The brim has gold trim."
-	icon_state = "expeditioncomsoft"
+	icon_state = "sifguardcomsoft"
 
 /obj/item/clothing/head/soft/solgov/fleet
 	name = "fleet cap"
@@ -88,17 +88,17 @@
 /obj/item/clothing/head/service/sifguard
 	name = "\improper SifGuard peaked cap"
 	desc = "A peaked black uniform cap belonging to the Sif Defense Force Corps."
-	icon_state = "ecdresscap"
+	icon_state = "sifguarddresscap"
 
 /obj/item/clothing/head/service/sifguard/command
 	name = "\improper SifGuard officer's peaked cap"
 	desc = "A peaked black uniform cap belonging to the Sif Defense Force. This one is trimmed in gold."
-	icon_state = "ecdresscap_ofcr"
+	icon_state = "sifguarddresscap_ofcr"
 
 /obj/item/clothing/head/service/sifguard/captain
 	name = "\improper SifGuard captain's peaked cap"
 	desc = "A gold-trimmed peaked black uniform cap belonging to a Captain of the Sif Defense Force."
-	icon_state = "ecdresscap_capt"
+	icon_state = "sifguarddresscap_capt"
 
 /obj/item/clothing/head/service/sifguard/senior_command
 	name = "senior SifGuard officer's peaked cap"
@@ -127,7 +127,7 @@
 
 /obj/item/clothing/head/service/army/campaign
 	name = "campaign cover"
-	desc = "A green campaign cover with an SCG Marine crest. Only found on the heads of Drill Sergeants."
+	desc = "A green campaign cover with an SCG Marine crest. Typically found on the heads of Drill Sergeants."
 	icon_state = "greendrill"
 
 //Dress
@@ -170,60 +170,45 @@
 
 //Berets
 
+//Government Departments
+
 /obj/item/clothing/head/beret/solgov
-	name = "peacekeeper beret"
+	name = "\improper SCG beret"
-	desc = "A beret in Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety."
+	desc = "A beret in basic Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety."
 	icon_state = "beret_lightblue"
 
-/obj/item/clothing/head/beret/solgov/homeguard
+/obj/item/clothing/head/beret/solgov/ttc
-	name = "home guard beret"
+	name = "transgressive technologies beret"
-	desc = "A red beret denoting service in the Sol Home Guard. For personnel that are more inclined towards style than safety."
+	desc = "A purple beret denoting service in the Transgressive Technologies Commission. For g-men that are more inclined towards style than safety."
-	icon_state = "beret_red"
-
-/obj/item/clothing/head/beret/solgov/gateway
-	name = "gateway administration beret"
-	desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
-	icon_state = "beret_orange"
-
-/obj/item/clothing/head/beret/solgov/customs
-	name = "customs and trade beret"
-	desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
 	icon_state = "beret_purpleyellow"
 
-/obj/item/clothing/head/beret/solgov/orbital
+/obj/item/clothing/head/beret/solgov/eio
-	name = "orbital assault beret"
+	name = "intelligence oversight beret"
-	desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
+	desc = "A blue beret denoting service in Emergent Intelligent Oversight. For g-men that are more inclined towards style than safety."
 	icon_state = "beret_blue"
 
-/obj/item/clothing/head/beret/solgov/research
+/obj/item/clothing/head/beret/solgov/survey
-	name = "government research beret"
+	name = "government survey beret"
-	desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
+	desc = "A green beret denoting service in the SCG Galactic Survey Administration. For explorers that are more inclined towards style than safety."
 	icon_state = "beret_green"
 
+/obj/item/clothing/head/beret/solgov/survey/extraplanar
+	name = "extraplanar survey beret"
+	desc = "A green beret with a silver emblem, denoting service in the Extraplanar Discovery Division of the GSA. For extraplanar explorers who are more inclined towards style than safety."
+	icon_state = "beret_greensilver"
+
+/obj/item/clothing/head/beret/solgov/inspector
+	name = "\improper Solar Inspection Group beret"
+	desc = "A grey beret with a silver insignia, denoting service in the Solar Inspection Group. For Almach-inspection personnel who are more inclined towards style than safety."
+	icon_state = "beret_graysilver"
+
 /obj/item/clothing/head/beret/solgov/health
 	name = "health service beret"
 	desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
 	icon_state = "beret_white"
 
-/obj/item/clothing/head/beret/solgov/marcom
-	name = "\improper MARSCOM beret"
-	desc = "A red beret with a gold insignia, denoting service in the SCGDF Mars Central Command. For brass who are more inclined towards style than safety."
-	icon_state = "beret_redgold"
 
-/obj/item/clothing/head/beret/solgov/stratcom
+//SifGuard
-	name = "\improper STRATCOM beret"
-	desc = "A grey beret with a silver insignia, denoting service in the SCGDF Strategic Command. For intelligence personnel who are more inclined towards style than safety."
-	icon_state = "beret_graysilver"
-
-/obj/item/clothing/head/beret/solgov/diplomatic
-	name = "diplomatic security beret"
-	desc = "A tan beret denoting service in the SCG Marines Diplomatic Security Group. For security personnel who are more inclined towards style than safety."
-	icon_state = "beret_tan"
-
-/obj/item/clothing/head/beret/solgov/borderguard
-	name = "border security beret"
-	desc = "A green beret with a silver emblem, denoting service in the Bureau of Border Security. For border guards who are more inclined towards style than safety."
-	icon_state = "beret_greensilver"
 
 /obj/item/clothing/head/beret/solgov/sifguard
 	name = "\improper SifGuard beret"
@@ -260,15 +245,12 @@
 	desc = "A Sif Defense Force beret with a command crest. For personnel that are more inclined towards style than safety."
 	icon_state = "beret_black_command"
 
-/obj/item/clothing/head/beret/solgov/sifguard/branch
+/obj/item/clothing/head/beret/solgov/sifguard/patrol
-	name = "\improper Field Operations beret"
+	name = "\improper SifGuard Anti-piracy beret"
-	desc = "An Sif Defense Force beret carrying insignia of the Field Operations section of the Sif Defense Force. For personnel that are more inclined towards style than safety."
+	desc = "An Sif Defense Force beret carrying insignia of the Anti-Piracy taskforce. For personnel that are more inclined towards style than safety."
-	icon_state = "beret_black_fieldOps"
+	icon_state = "beret_black_patrol"
 
-/obj/item/clothing/head/beret/solgov/sifguard/branch/observatory
+//Fleet
-	name = "\improper Observatory beret"
-	desc = "An Sif Defense Force beret carrying insignia of the Observatory section of the Sif Defense Force. For personnel that are more inclined towards style than safety."
-	icon_state = "beret_black_observatory"
 
 /obj/item/clothing/head/beret/solgov/fleet
 	name = "fleet beret"
@@ -320,6 +302,8 @@
 	desc = "A white SCG Fleet beret with a golden crest. For personnel that are more inclined towards style than safety."
 	icon_state = "beret_whiterim_com"
 
+/*
+Unused Baylore Stuff
 /obj/item/clothing/head/beret/solgov/fleet/branch
 	name = "first fleet beret"
 	desc = "An SCG Fleet beret carrying insignia of First Fleet, the Sol Guard, stationed in Sol. For personnel that are more inclined towards style than safety."
@@ -345,46 +329,44 @@
 	desc = "An SCG Fleet beret carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech. For personnel that are more inclined towards style than safety."
 	icon_state = "beret_navy_fifth"
 
+*/
+
 //ushanka
 
 /obj/item/clothing/head/ushanka/solgov
 	name = "\improper SifGuard fur hat"
 	desc = "An Sif Defense Force synthfur-lined hat for operating in cold environments."
-	icon_state = "ecushankadown"
+	icon_state = "sifguardushankadown"
-	//icon_state_up = "ecushankaup"
 
 /obj/item/clothing/head/ushanka/solgov/fleet
 	name = "fleet fur hat"
 	desc = "An SCG Fleet synthfur-lined hat for operating in cold environments."
 	icon_state = "flushankadown"
-	//icon_state_up = "flushankaup"
 
-/obj/item/clothing/head/ushanka/solgov/army
+/obj/item/clothing/head/ushanka/solgov/marine
 	name = "marine fur hat"
 	desc = "An SCG Marine synthfur-lined hat for operating in cold environments."
 	icon_state = "barushankadown"
-	//icon_state_up = "barushankaup"
 
-/obj/item/clothing/head/ushanka/solgov/army/green
+/obj/item/clothing/head/ushanka/solgov/marine/green
-	name = "green marine fur hat"
+	name = "\improper Hedberg-Hammarstrom fur hat"
-	desc = "An SCG Marine synthfur-lined hat for operating in cold environments."
+	desc = "An Hedberg-Hammarstrom private security synthfur-lined hat for operating in cold environments."
 	icon_state = "arushankadown"
-	//icon_state_up = "mcushankaup"
 
-//Terran
+//Almachi
 
-/obj/item/clothing/head/terran/navy/service
+/obj/item/clothing/head/almach
-	name = "ICCGN service cover"
+	name = "\improper Almach Militia service cover"
-	desc = "A service uniform cover, worn by low-ranking crew within the Independent Navy."
+	desc = "A service uniform cover, occasionally worn by crew within the defunct Almach Militia."
-	icon_state = "terranservice"
+	icon_state = "almachhat"
-	item_state = "terranservice"
+	item_state = "almachhat"
 	item_state_slots = list(
 		slot_l_hand_str = "helmet",
 		slot_r_hand_str = "helmet")
 	body_parts_covered = 0
 
 /obj/item/clothing/head/terran/navy/service/command
-	name = "ICCGN command service cover"
+	name = "\improper Almach Militia command service cover"
-	desc = "A service uniform cover, worn by high-ranking crew within the Independent Navy."
+	desc = "A service uniform cover, occasionally worn by command crew within the defunct Almach Militia."
-	icon_state = "terranservice_comm"
+	icon_state = "almachhat_comm"
-	item_state = "terranservice_comm"
+	item_state = "almachhat_comm"

code/modules/clothing/suits/armor.dm

@@ -353,6 +353,11 @@
 	icon_badge = "pcrcvest_badge"
 	icon_nobadge = "pcrcvest_nobadge"
 
+/obj/item/clothing/suit/storage/vest/solgov/hedberg
+	name = "Hedberg-Hammarstrom armor vest"
+	desc = "A simple kevlar plate carrier belonging to Hedberg-Hammarstrom. The company logo is clearly visible."
+	icon_state = "secwebvest"
+
 /obj/item/clothing/suit/storage/vest/solgov
 	name = "\improper Solar Confederate Government armored vest"
 	desc = "A synthetic armor vest. This one is marked with the crest of the Solar Confederate Government."
@@ -361,14 +366,9 @@
 
 /obj/item/clothing/suit/storage/vest/solgov/heavy
 	name = "\improper Solar Confederate Government heavy armored vest"
-	desc = "A synthetic armor vest with PEACEKEEPER printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates."
+	desc = "A synthetic armor vest with Solar Confederate Government printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates."
 	icon_state = "solwebvest"
 
-/obj/item/clothing/suit/storage/vest/solgov/security
-	name = "master at arms heavy armored vest"
-	desc = "A synthetic armor vest with MASTER AT ARMS printed in silver lettering on the chest. This one has added webbing and ballistic plates."
-	icon_state = "secwebvest"
-
 /obj/item/clothing/suit/storage/vest/solgov/command
 	name = "command heavy armored vest"
 	desc = "A synthetic armor vest with Solar Confederate Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."

code/modules/clothing/suits/solgov.dm

@@ -23,19 +23,19 @@
 /obj/item/clothing/suit/storage/solgov/service/sifguard
 	name = "\improper SifGuard jacket"
 	desc = "A uniform service jacket belonging to the Sif Defense Force."
-	icon_state = "ecservice_crew"
+	icon_state = "sgservice_crew"
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/medical
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/medical/command
-	icon_state = "ecservice_officer"
+	icon_state = "sgservice_officer"
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/engineering
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/engineering/command
-	icon_state = "ecservice_officer"
+	icon_state = "sgservice_officer"
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/supply
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
@@ -44,28 +44,28 @@
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/security/command
-	icon_state = "ecservice_officer"
+	icon_state = "sgservice_officer"
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/service
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/service/command
-	icon_state = "ecservice_officer"
+	icon_state = "sgservice_officer"
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/exploration
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/exploration/command
-	icon_state = "ecservice_officer"
+	icon_state = "sgservice_officer"
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/research
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/research/command
-	icon_state = "ecservice_officer"
+	icon_state = "sgservice_officer"
 
 /obj/item/clothing/suit/storage/solgov/service/sifguard/command
-	icon_state = "ecservice_officer"
+	icon_state = "sgservice_officer"
 	starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
 
 /obj/item/clothing/suit/storage/solgov/service/fleet
@@ -181,8 +181,8 @@
 /obj/item/clothing/suit/storage/solgov/dress
 	name = "dress jacket"
 	desc = "A uniform dress jacket, fancy."
-	icon_state = "ecdress_xpl"
+	icon_state = "sgdress_xpl"
-	item_state = "ecdress_xpl"
+	item_state = "sgdress_xpl"
 	body_parts_covered = UPPER_TORSO|ARMS
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -193,39 +193,39 @@
 /obj/item/clothing/suit/storage/solgov/dress/sifguard
 	name = "\improper SifGuard dress jacket"
 	desc = "A silver and grey dress jacket belonging to the Sif Defense Force. Fashionable, for the 25th century at least."
-	icon_state = "ecdress_xpl"
+	icon_state = "sgdress_xpl"
-	item_state = "ecdress_xpl"
+	item_state = "sgdress_xpl"
 
 /obj/item/clothing/suit/storage/solgov/dress/sifguard/senior
 	name = "\improper SifGuard senior's dress coat"
-	icon_state = "ecdress_sxpl"
+	icon_state = "sgdress_sxpl"
-	item_state = "ecdress_sxpl"
+	item_state = "sgdress_sxpl"
 
 /obj/item/clothing/suit/storage/solgov/dress/sifguard/chief
 	name = "\improper SifGuard chief's dress coat"
 	icon_state = "ecdress_cxpl"
-	item_state = "ecdress_cxpl"
+	item_state = "sgdress_cxpl"
 
 /obj/item/clothing/suit/storage/solgov/dress/sifguard/command
 	name = "\improper SifGuard officer's dress coat"
 	desc = "A gold and black dress peacoat belonging to the Sif Defense Force. The height of fashion."
 	icon_state = "ecdress_ofcr"
-	item_state = "ecdress_ofcr"
+	item_state = "sgdress_ofcr"
 
 /obj/item/clothing/suit/storage/solgov/dress/sifguard/command/cdr
 	name = "\improper SifGuard commander's dress coat"
-	icon_state = "ecdress_cdr"
+	icon_state = "sgdress_cdr"
-	item_state = "ecdress_cdr"
+	item_state = "sgdress_cdr"
 
 /obj/item/clothing/suit/storage/solgov/dress/sifguard/command/capt
 	name = "\improper SifGuard captain's dress coat"
-	icon_state = "ecdress_capt"
+	icon_state = "sgdress_capt"
-	item_state = "ecdress_capt"
+	item_state = "sgdress_capt"
 
 /obj/item/clothing/suit/storage/solgov/dress/sifguard/command/adm
 	name = "\improper SifGuard admiral's dress coat"
-	icon_state = "ecdress_adm"
+	icon_state = "sgdress_adm"
-	item_state = "ecdress_adm"
+	item_state = "sgdress_adm"
 
 /obj/item/clothing/suit/storage/solgov/dress/fleet
 	name = "fleet dress jacket"
@@ -328,36 +328,36 @@
 	item_state = "labcoat"
 	blood_overlay_type = "coat"
 
-/obj/item/clothing/suit/storage/marshal_jacket
+/obj/item/clothing/suit/storage/eio_jacket
-	name = "colonial marshal jacket"
+	name = "EIO jacket"
-	desc = "A black synthleather jacket. The word 'MARSHAL' is stenciled onto the back in gold lettering."
+	desc = "A black synthleather jacket. The acronym 'EIO' of the Emergent Intelligence Oversight is stenciled onto the back in gold lettering."
 	icon_state = "marshal_jacket"
 	item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
 	body_parts_covered = UPPER_TORSO|ARMS
 
-//Terrans
+//SAARE Mercenaries
 
 //Service
 
-/obj/item/clothing/suit/storage/terran/service/navy
+/obj/item/clothing/suit/storage/saare/service/
-	name = "ICCGN coat"
+	name = "SAARE coat"
-	desc = "A ICCG Navy service coat. Black and undecorated."
+	desc = "An Stealth Assault Enterprises . Black and undecorated."
 	icon_state = "terranservice"
 	item_state = "terranservice"
 	icon = 'icons/obj/clothing/suits_solgov.dmi'
 	icon_override = 'icons/mob/suit_solgov.dmi'
 
-/obj/item/clothing/suit/storage/terran/service/navy/command
+/obj/item/clothing/suit/storage/saare/service/command
-	name = "indie command coat"
+	name = "SAARE command coat"
-	desc = "An ICCG Navy service command coat. White and undecorated."
+	desc = "An Stealth Assault Enterprises command coat. White and undecorated."
 	icon_state = "terranservice_comm"
 	item_state = "terranservice_comm"
 
 //Dress
 
-/obj/item/clothing/suit/dress/terran
+/obj/item/clothing/suit/dress/saare
 	name = "dress jacket"
-	desc = "A uniform dress jacket, fancy."
+	desc = "A Stealth Assault Enterprises uniform dress jacket, fancy."
 	icon_state = "terrandress"
 	item_state = "terrandress"
 	icon = 'icons/obj/clothing/suits_solgov.dmi'
@@ -369,19 +369,19 @@
 	valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK)
 
 /obj/item/clothing/suit/dress/terran/navy
-	name = "ICCGN dress cloak"
+	name = "SAARE dress cloak"
-	desc = "A black ICCG Navy dress cloak with red detailing. So sexy it hurts."
+	desc = "A Stealth Assault Enterprises dress cloak with red detailing. So sexy it hurts."
 	icon_state = "terrandress"
 	item_state = "terrandress"
 
 /obj/item/clothing/suit/dress/terran/navy/officer
-	name = "ICCGN officer's dress cloak"
+	name = "SAARE officer's dress cloak"
-	desc = "A black ICCG Navy dress cloak with gold detailing. Smells like ceremony."
+	desc = "A black Stealth Assault Enterprises dress cloak with gold detailing. Smells like ceremony."
 	icon_state = "terrandress_off"
 	item_state = "terrandress_off"
 
 /obj/item/clothing/suit/dress/terran/navy/command
-	name = "ICCGN command dress cloak"
+	name = "SAARE command dress cloak"
-	desc = "A black ICCG Navy dress cloak with royal detailing. Smells like ceremony."
+	desc = "A black Stealth Assault Enterprises dress cloak with royal detailing. Smells like ceremony."
 	icon_state = "terrandress_comm"
 	item_state = "terrandress_comm"

code/modules/clothing/under/solgov.dm

@@ -471,30 +471,30 @@
 
 //Terrans
 
-/obj/item/clothing/under/terran
+/obj/item/clothing/under/saare
-	name = "master ICCGN uniform"
+	name = "master SAARE uniform"
 	desc = "You shouldn't be seeing this."
 	icon = 'icons/obj/clothing/uniforms_solgov.dmi'
 	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
 
-/obj/item/clothing/under/terran/navy/utility
+/obj/item/clothing/under/saare/utility
-	name = "ICCGN utility uniform"
+	name = "SAARE utility uniform"
-	desc = "A comfortable black utility jumpsuit. Worn by the ICCG Navy."
+	desc = "A comfortable black utility jumpsuit. Worn by Stealth Assault Enterprises mercenaries."
 	icon_state = "terranutility"
 	worn_state = "terranutility"
 
-/obj/item/clothing/under/terran/navy/service
+/obj/item/clothing/under/saare/service
-	name = "ICCGN service uniform"
+	name = "SAARE service uniform"
-	desc = "The service uniform of the ICCG Navy, for low-ranking crew."
+	desc = "The service uniform of Stealth Assault Enterprises, for low-ranking mercenaries."
 	icon_state = "terranservice"
 	worn_state = "terranservice"
 	armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 5, rad = 0)
 	siemens_coefficient = 0.9
 
-/obj/item/clothing/under/terran/navy/service/command
+/obj/item/clothing/under/saare/service/command
-	name = "ICCGN command service uniform"
+	name = "SAARE command service uniform"
-	desc = "The service uniform of the ICCG Navy, for high-ranking crew."
+	desc = "The service uniform of Stealth Assault Enterprises, for high-ranking mercenaries."
 	icon_state = "terranservice_comm"
 	worn_state = "terranservice_comm"

code/modules/lore_codex/news_data/main.dm

@@ -321,7 +321,7 @@
 	<br><br>\
 	Sources within the Vir Governmental Authority have reported that a full scale recall of remote drone craft under their operation has been initiated in order to improve security measures and prevent future exploitation of government systems, statements that eerily echo those of Occulum Broadcast following emergent drone attacks earlier this year. Investigations are reportedly \"well underway\" to determine the whereabouts of those responsible for the apparent manual modification of these short-range remote craft.\
 	<br><br>\
-	Erkki Laukkanen, Chief of Fleet Staff for the Vir Defense Force has commended all patrol crews involved, and has promised \"swift retribution\" for the attempted bombings."
+	Erkki Laukkanen, Chief of Fleet Staff for the Sif Defense Force has commended all patrol crews involved, and has promised \"swift retribution\" for the attempted bombings."
 /datum/lore/codex/page/article26
 	name = "11/24/62 - Boiling Point Stronghold Seized in Vir"
 	data = "Combined forces from the SCG Fleet and Almach Militia have today struck a powerful blow to Boiling Point terrorist operations in the Vir system. With close cooperation from the crew of NanoTrasen facilities in the region, special forces were able to infiltrate what is believed to have been a major stronghold for the radical Mercurial group, located deep in the remote Ullran Expanse region of Sif. The raid closely follows the thwarted Boiling Point attack on the Radiance Energy Chain, a major energy collection array in the system which is now known to have been masterminded from the concealed bunker complex on Sif.\
@@ -354,7 +354,7 @@
 	<br><br>\
 	No more! Shall the people of this great nation have to fear the machinations of radicals! No more! Shall these twisted minds impose their perversion of humanity through violence! No more!\
 	<br><br>\
-	This Assembly... Nay, this nation expresses its thanks the noble members of our military who joined together to make this outcome possible. We thank the Fleet, of course for their tireless action hunting down these killers, and their heroic action over this past weekend. We thank the Vir Defense Force, without whom we could never have located the intelligence that led to these decisive victories... The Almach Militia, for their cooperation in the apprehension of these so-called \"revolutionaries\". \[West clears their throat\] And of course, we thank the local forces - the police and reserves who dealt firsthand with the chaos sewn by Boiling Point in their vicious crusade.\
+	This Assembly... Nay, this nation expresses its thanks the noble members of our military who joined together to make this outcome possible. We thank the Fleet, of course for their tireless action hunting down these killers, and their heroic action over this past weekend. We thank the Sif Defense Force, without whom we could never have located the intelligence that led to these decisive victories... The Almach Militia, for their cooperation in the apprehension of these so-called \"revolutionaries\". \[West clears their throat\] And of course, we thank the local forces - the police and reserves who dealt firsthand with the chaos sewn by Boiling Point in their vicious crusade.\
 	<br><br>\
 	\[Mackenzie West shifts at the podium, setting down the List of Dissidents.\]\
 	<br><br>\

code/modules/persistence/filth.dm

@@ -10,4 +10,4 @@
 
 /obj/effect/decal/cleanable/filth/Initialize()
 	. = ..()
-	alpha = rand(180,220)
+	alpha = rand(180,220)