Mecha Lore Revisions, Retcons, and General Edits (#6027)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Revises, Retcons, and/or Edits Mecha Fluff Descriptions to Match
New Standards.**
2. **Adds the 8-Ball Paint Kit and Updates Paint Kits.**

## Why It's Good For The Game

1. _This PR alters the majority of Cataloguer scans for Mecha mobs and
copies them over as the fluff description for the relevant mech models.
The information contained here should be available on examination,
without the need for a cataloguer and a simplemob encounter. Many of the
entries needed to be edited for general quality and formatting, or to
bring them in line with our lore. Otherwise this is pretty
straightforward._
2. _8-Ball is an event mech that I've decided deserves a custom paint
kit to make it more recognizable. As a byproduct of this, paint kits now
also update Fluff Descriptions._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: Revises, Retcons, and Edits the Lore Data for all Mechs.
add: Adds 8-Ball Paint Kit.
tweak: Paint Kits now update fluff descriptions too.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

citadel.dme

@@ -2547,6 +2547,7 @@
 #include "code\modules\examine\descriptions\engineering.dm"
 #include "code\modules\examine\descriptions\food.dm"
 #include "code\modules\examine\descriptions\machines.dm"
+#include "code\modules\examine\descriptions\mecha.dm"
 #include "code\modules\examine\descriptions\medical.dm"
 #include "code\modules\examine\descriptions\mobs.dm"
 #include "code\modules\examine\descriptions\paperwork.dm"

code/game/mecha/combat/gygax.dm

@@ -48,7 +48,7 @@
 
 
 /obj/mecha/combat/gygax/dark
-	desc = "A lightweight exosuit used by Heavy Asset Protection. A significantly upgraded Gygax security mech."
+	desc = "A lightweight exosuit used by paramilitary forces. A significantly upgraded Gygax security mech."
 	name = "Dark Gygax"
 	icon_state = "darkgygax_adv"
 	initial_icon = "darkgygax_adv"

code/game/mecha/combat/honker.dm

@@ -36,7 +36,7 @@
 
 /obj/mecha/combat/honker/cluwne
 	name = "C.L.U.W.N.E."
-	desc = "The C.L.U.W.N.E. mecha is an up-armored cousin of the H.O.N.K. mech. Still in service on the borders of the Clown Planet, this unit is not typically commercially available."
+	desc = "The C.L.U.W.N.E. mecha is an up-armored cousin of the H.O.N.K. mech. Still in service on the borders of Scaena Globus, this unit is not typically commercially available."
 	icon = 'icons/mecha/mecha_vr.dmi'
 	icon_state = "cluwne"
 	initial_icon = "cluwne"

code/game/mecha/combat/marauder.dm

@@ -71,7 +71,7 @@
 
 //Note that is the Mauler
 /obj/mecha/combat/marauder/mauler
-	desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model."
+	desc = "A stolen heavy-duty combat exosuit, developed off of the existing Marauder model."
 	name = "Mauler"
 	icon_state = "mauler"
 	initial_icon = "mauler"

code/game/mecha/combat/phazon.dm

@@ -1,6 +1,6 @@
 /obj/mecha/combat/phazon
-	desc = "An exosuit which can only be described as 'WTF?'."
 	name = "Phazon"
+	desc = "A sleek exosuit with unnaturally pronounced curves."
 	icon_state = "phazon"
 	initial_icon = "phazon"
 	step_in = 1
@@ -80,10 +80,7 @@
 
 /obj/mecha/combat/phazon/janus
 	name = "Phazon Prototype Janus Class"
-	desc = "An exosuit which a more crude civilization such as yours might describe as WTF?."
-	description_fluff = "An incredibly high-tech exosuit constructed out of salvaged alien and cutting-edge modern technology.\
-	This machine, theoretically, is capable of travelling through time, however due to the strange nature of its miniaturized \
-	supermatter-fueled bluespace drive, it is uncertain how this ability manifests."
+	desc = "A sleek exosuit that radiates a strange, alien energy."
 	icon_state = "janus"
 	initial_icon = "janus"
 	step_in = 1

code/game/mecha/working/ripley.dm

@@ -1,5 +1,5 @@
 /obj/mecha/working/ripley
-	desc = "Autonomous Power Loader Unit. The workhorse of the exosuit world."
+	desc = "Armored Power Loader Unit. The workhorse of the exosuit world."
 	name = "APLU \"Ripley\""
 	icon_state = "ripley"
 	initial_icon = "ripley"

code/game/objects/items/paintkit.dm

@@ -4,6 +4,7 @@
 	w_class = ITEMSIZE_SMALL
 	var/new_name = "custom item"
 	var/new_desc = "A custom item."
+	var/new_fluff = "A custom item."
 	var/new_icon
 	var/new_icon_file
 	var/new_icon_override_file
@@ -23,9 +24,10 @@
 /obj/item/kit/proc/can_customize(var/obj/item/I)
 	return is_type_in_list(I, allowed_types)
 
-/obj/item/kit/proc/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data)
+/obj/item/kit/proc/set_info(var/kit_name, var/kit_desc, var/kit_fluff, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data)
 	new_name = kit_name
 	new_desc = kit_desc
+	new_fluff = kit_fluff
 	new_icon = kit_icon
 	new_icon_file = kit_icon_file
 	new_icon_override_file = kit_icon_override_file
@@ -37,6 +39,7 @@
 	if(can_customize(I))
 		I.name = new_name ? new_name : I.name
 		I.desc = new_desc ? new_desc : I.desc
+		I.description_fluff = new_fluff ? new_fluff : I.description_fluff
 		I.icon = new_icon_file ? new_icon_file : I.icon
 		I.icon_override = new_icon_override_file ? new_icon_override_file : I.icon_override
 		if(new_icon)
@@ -78,6 +81,7 @@
 			var/obj/item/clothing/head/helmet/space/void/helmet = I
 			helmet.name = "[new_name] suit helmet"
 			helmet.desc = new_desc
+			helmet.description_fluff = new_fluff
 			helmet.icon_state = "[new_icon]_helmet"
 			helmet.item_state = "[new_icon]_helmet"
 			if(new_icon_file)
@@ -94,6 +98,7 @@
 			var/obj/item/clothing/suit/storage/hooded/suit = I
 			suit.name = "[new_name] suit"
 			suit.desc = new_desc
+			suit.description_fluff = new_fluff
 			suit.icon_state = "[new_icon]_suit"
 			suit.toggleicon = "[new_icon]_suit"
 			suit.item_state = "[new_icon]_suit"
@@ -114,6 +119,7 @@
 			var/obj/item/clothing/suit/space/void/suit = I
 			suit.name = "[new_name] voidsuit"
 			suit.desc = new_desc
+			suit.description_fluff = new_fluff
 			suit.icon_state = "[new_icon]_suit"
 			suit.item_state = "[new_icon]_suit"
 			if(new_icon_file)
@@ -159,6 +165,7 @@
 	HARDSUIT.suit_type = "customized [initial(HARDSUIT.suit_type)]"
 	HARDSUIT.name = "[new_name]"
 	HARDSUIT.desc = new_desc
+	HARDSUIT.description_fluff = new_fluff
 	HARDSUIT.icon = new_icon_file
 	HARDSUIT.icon_state = new_icon
 	HARDSUIT.icon_override = new_icon_override_file
@@ -237,6 +244,7 @@
 	user.visible_message("[user] opens [src] and spends some quality time customising [M].")
 	M.name = new_name
 	M.desc = new_desc
+	M.description_fluff = new_fluff
 	M.initial_icon = new_icon
 	if(new_icon_file)
 		M.icon = new_icon_file
@@ -255,149 +263,180 @@
 /obj/item/kit/paint/ripley
 	name = "\"Classic\" APLU customisation kit"
 	new_name = "APLU \"Classic\""
-	new_desc = "A very retro APLU unit; didn't they retire these back in 2543?"
+	new_desc = "An antique APLU that visibly bears the weight of time."
+	new_fluff = "A very retro APLU unit; didn't they retire these back in 2453?"
 	new_icon = "ripley-old"
 	allowed_types = list("ripley")
 
 /obj/item/kit/paint/ripley/death
 	name = "\"Reaper\" APLU customisation kit"
 	new_name = "APLU \"Reaper\""
-	new_desc = "A terrifying, grim power loader. Why do those clamps have spikes?"
+	new_desc = "This APLU bears a sinister black and red paint job."
+	new_fluff = "A grim power loader with a threatening profile. Why do those clamps have spikes?"
 	new_icon = "deathripley"
 	allowed_types = list("ripley","firefighter")
 
 /obj/item/kit/paint/ripley/flames_red
 	name = "\"Firestarter\" APLU customisation kit"
 	new_name = "APLU \"Firestarter\""
-	new_desc = "A standard APLU exosuit with stylish orange flame decals."
+	new_desc = "An APLU with a red flame paint job."
+	new_fluff = "A standard APLU exosuit with stylish orange flame decals."
 	new_icon = "ripley_flames_red"
 
 /obj/item/kit/paint/ripley/flames_blue
 	name = "\"Burning Chrome\" APLU customisation kit"
 	new_name = "APLU \"Burning Chrome\""
-	new_desc = "A standard APLU exosuit with stylish blue flame decals."
+	new_desc = "An APLU with a blue flame paint job."
+	new_fluff = "A standard APLU exosuit with stylish blue flame decals."
 	new_icon = "ripley_flames_blue"
 
 /obj/item/kit/paint/ripley/pirate
 	name = "\"Brigand\" APLU customisation kit"
 	new_name = "APLU \"Brigand\""
-	new_desc = "An up-armored power loader design often favored by pirates."
+	new_desc = "A vandalized APLU bearing the Jolly Roger."
+	new_fluff = "An up-armored power loader design often favored by pirates. Its bulky frame and implacability help it function as mobile cover during boarding actions."
 	new_icon = "pirate"
 
 /obj/item/kit/paint/ripley/junker
 	name = "\"Scrapper\" APLU customisation kit"
 	new_name = "APLU \"Scrapper\""
-	new_desc = "Even the simple power loader is considered a luxury on the Frontier. Some colonies have maintained one single model for decades."
+	new_desc = "An APLU that shows signs of multiple refits and improvised maintenance procedures."
+	new_fluff = "Even the simple power loader is considered a luxury on the Frontier. Some colonies have maintained one single model for decades."
 	new_icon = "ripley_junker"
 
 /obj/item/kit/paint/ripley/battered
 	name = "\"Battle Damaged\" APLU customisation kit"
 	new_name = "APLU \"Battle Damaged\""
-	new_desc = "Overconfident Roboticists and pilots will often rush into combat with a power loader. It is a testament to the design that some can still operate in this condition."
+	new_desc = "This APLU is intensely damaged. It's amazing that it can still move."
+	new_fluff = "Overconfident Roboticists and pilots will often rush into combat with a power loader. It is a testament to the design that some can still operate in this condition."
 	new_icon = "ripley_battered"
 
 /obj/item/kit/paint/ripley/medical
 	name = "\"Caduceus\" APLU customisation kit"
 	new_name = "APLU \"Caduceus\""
-	new_desc = "Power loaders are slow and bulky, making them poor fits for medical work. Sometimes, however, they may be all that's available."
+	new_desc = "An APLU whose medical themed paint job designates it as a triage unit."
+	new_fluff = "Power loaders are slow and bulky, making them poor fits for medical work. Sometimes, however, they may be all that's available."
 	new_icon = "ripley_med"
 
 /obj/item/kit/paint/ripley/sovjet
 	name = "\"Old Red\" APLU customisation kit"
 	new_name = "APLU \"Old Red\""
-	new_desc = "Gorlex branded power loaders often bore the scars of the Indo-Russian Diaspora. Some of these antiques are still in circulation."
+	new_desc = "An aged APLU painted in the heraldry of an Old Earth nation."
+	new_fluff = "Gorlex branded power loaders often bore the scars of the Indo-Russian Diaspora. Some of these antiques are still in circulation."
 	new_icon = "soviet"
 
 /obj/item/kit/paint/ripley/arnold
 	name = "\"Arnold\" APLU customisation kit"
 	new_name = "APLU \"Arnold\""
-	new_desc = "Power loaders are loud, and clunky. Poorly suited for jungle operations of any kind, this camo paint job is likely only cosmetic."
+	new_desc = "An APLU with a jungle green camo paint job."
+	new_fluff = "Power loaders are loud, slow, and clunky. Poorly suited for jungle operations of any kind, this camo paint job is likely only cosmetic."
 	new_icon = "ripley_camo"
 
 /obj/item/kit/paint/ripley/clown
 	name = "\"CR3AM-P13\" APLU customisation kit"
 	new_name = "APLU \"CR3AM-P13\""
-	new_desc = "Before the cessation of open trade led to the development of the H.O.N.K., NanoTrasen frequently sold Columbina old power loaders to serve as supplemental security units."
+	new_desc = "A comedically painted APLU with an authentic, oversized clown wig."
+	new_fluff = "Before the cessation of open trade led to the development of the H.O.N.K., NanoTrasen frequently sold Columbina old power loaders to serve as supplemental security units."
 	new_icon = "clowny"
 
 /obj/item/kit/paint/ripley/dreadnought
 	name = "\"SAR-C0PH\" APLU customisation kit"
 	new_name = "APLU \"SAR-C0PH\""
-	new_desc = "In conjunction with Vey-Med, NanoTrasen briefly experimented with permanently interring paralyzed or critically wounded operatives in mecha. The program was allegedly disbanded following public outcry."
+	new_desc = "A curiously modified APLU chassis. Its cockpit has been welded shut and you can hear sloshing inside."
+	new_fluff = "In conjunction with Vey-Med, NanoTrasen briefly experimented with permanently interring paralyzed or critically wounded operatives in mecha. The program was allegedly disbanded following strong public outcry."
 	new_icon = "dreadnought"
 
 // Gygax kits.
 /obj/item/kit/paint/gygax
 	name = "\"Silhouette\" Gygax customisation kit"
 	new_name = "Gygax \"Silhouette\""
-	new_desc = "An ominous Gygax exosuit modelled after the fictional corporate 'death squads' that were popular in pulp action-thrillers back in 2554."
+	new_desc = "A Gygax with an ominous black gleam."
+	new_fluff = "An ominous Gygax exosuit modelled after the fictional corporate 'death squads' made popular in the pulp action-thrillers of 2554."
 	new_icon = "darkgygax"
 	allowed_types = list("gygax")
 
 /obj/item/kit/paint/gygax/blue
 	name = "\"Ocean Blue\" Gygax customisation kit"
 	new_name = "Gygax \"Ocean Blue\""
-	new_desc = "A bulky Gygax with a soothing blue paint job, reminiscent of the sea at midday, or a calm sky."
+	new_desc = "A Gygax with a blue paint job."
+	new_fluff = "A bulky Gygax with a soothing blue paint job, reminiscent of the sea at midday, or a calm sky."
 	new_icon = "gygax_blue"
 
 /obj/item/kit/paint/gygax/green
 	name = "\"Forest Green\" Gygax customisation kit"
 	new_name = "Gygax \"Forest Green\""
-	new_desc = "A bulky Gygax with a verdant green paint job, reminiscent of waving branches, or wild grass."
+	new_desc = "A Gygax with a green paint job."
+	new_fluff = "A bulky Gygax with a verdant green paint job, reminiscent of waving branches, or wild grass."
 	new_icon = "gygax_green"
 
 /obj/item/kit/paint/gygax/turtle
 	name = "\"Furtive Tortoise\" Gygax customisation kit"
 	new_name = "Gygax \"Furtive Tortoise\""
-	new_desc = "This cartoonish paint job is based off of a long forgotten Spider Clan propaganda series. Furtive was the no-nonsense leader."
+	new_desc = "A Gygax with a cartoonish, deceptively simple paint job."
+	new_fluff = "This cartoonish paint job is based off of a long forgotten Spider Clan propaganda series. The turtle depicted by this paint job, Furtive, was the no-nonsense leader."
 	new_icon = "gygax_turtle"
 
 /obj/item/kit/paint/gygax/mad_jack
 	name = "\"Mad Jack\" Gygax customisation kit"
 	new_name = "Gygax \"Mad Jack\""
-	new_desc = "This Gygax has been refit with hardwood plating. There is something menacing about the way the cyclopean eye on the chest stares at you."
+	new_desc = "A shockingly garish Gygax with hardwood plating screwed on top of the actual armor."
+	new_fluff = "This Gygax has been decorated with an additional layer of hardwood plating. There is something menacing about the way the cyclopean eye on the chest stares at you."
 	new_icon = "gygax_rs"
 
 /obj/item/kit/paint/gygax/osbourne
 	name = "\"Osbourne\" Gygax customisation kit"
 	new_name = "Gygax \"Osbourne\""
-	new_desc = "This Gygax has been refit with hardwood plating. The green eye and orange texturing are reminiscent of volatile pumpkins, for some reason."
+	new_desc = "A shockingly garish Gygax with hardwood plating screwed on top of the actual armor."
+	new_fluff = "This Gygax has been decorated with an additional layer of hardwood plating. The green eye and orange texturing are reminiscent of volatile pumpkins, for some reason."
 	new_icon = "gygax_gg"
 
 /obj/item/kit/paint/gygax/carp
 	name = "\"Ishmael\" Gygax customisation kit"
 	new_name = "Gygax \"Ishmael\""
-	new_desc = "Gygax mech units are sometimes deployed in EVA settings by ace pilots. These mecha often bear unique, menacing paint jobs. This one resembles the fierce Space Carp."
+	new_desc = "A Gygax painted Space Carp purple. A menacing face has been painted on the glacis."
+	new_fluff = "This Gygax resembles the fierce Space Carp heraldry worn by ace pilot 'Ishmael' after their famed defense of Barker IV Orbital Station Sigma. 'Ishmael' operated in intensely hazardous EVA conditions to neutralize an overwhelmingly large migration of carp, saving the facility."
 	new_icon = "gygax_carp"
 
 // Durand kits.
 /obj/item/kit/paint/durand
 	name = "\"Classic\" Durand customisation kit"
 	new_name = "Durand \"Classic\""
-	new_desc = "An older model of Durand combat exosuit. This model was retired for rotating a pilot's torso 180 degrees."
+	new_desc = "An antique Durand that visibly bears the weight of time."
+	new_fluff = "An older model of Durand combat exosuit, this particular series was retired due to its tendency to occasionally rotate the pilot's torso 180 degrees."
 	new_icon = "durand_old"
 	allowed_types = list("durand")
 
 /obj/item/kit/paint/durand/paladin
 	name = "\"Crusader\" Durand customisation kit"
 	new_name = "Durand \"Crusader\""
-	new_desc = "This Durand's gleaming white plating and golden highlights radiate holiness and justice. Use it to smite evil wheresoever you find it."
+	new_desc = "A Durand painted in stark whites and golds. It seems to radiate purity."
+	new_fluff = "This Durand's gleaming white plating and golden highlights radiate holiness and justice. Use it to smite evil wheresoever you find it. Be mindful of ledges - this Durand provides no protection against falls."
 	new_icon = "paladin"
 
 /obj/item/kit/paint/durand/turtle
 	name = "\"Sneaky Tortoise\" Durand customisation kit"
 	new_name = "Durand \"Sneaky Tortoise\""
-	new_desc = "This cartoonish paint job is based off of a long forgotten Spider Clan propaganda series. Sneaky was a real party dude."
+	new_desc = "A Durand with a deceptively simple, cartoonish paint job."
+	new_fluff = "This cartoonish paint job is based off of a long forgotten Spider Clan propaganda series. The turtle depicted by this paint job, Sneaky, was apparently real party dude."
 	new_icon = "durand_turtle"
 
 //H.O.N.K. kits.
 /obj/item/kit/paint/honker
 	name = "\"'Hot' Rod\" H.O.N.K. customisation kit"
 	new_name = "H.O.N.K. \"'Hot' Rod\""
-	new_desc = "The sweet flames painted onto this H.O.N.K. chassis are distressingly realistic, and impart even more hilarity than usual."
+	new_desc = "A HONK mech decorated with an audacious black paint job augmented by brilliant flames."
+	new_fluff = "The sweet flames painted onto this H.O.N.K. chassis are distressingly realistic, and impart even more hilarity than usual. If you look at it for long enough, you start to realize that small depictions of mimes appear to be burning in the flames."
 	new_icon = "honker_flaming"
 	allowed_types = list("honker")
 
+//Mauler Kits
+/obj/item/kit/paint/mauler
+	name = "\"8-Ball\" Mauler customisation kit"
+	new_name = "Marauder \"8-Ball\""
+	new_desc = "An aged Mauler with multiple aesthetic modifications - most notably a large 8-Ball decal on the glacis."
+	new_fluff = "At the peak of the Phoron War, this legendary exosuit saw much use during a variety of Frontier mercenary operations. 8-Ball was presumed lost alongside the rest of its mercenary company in 2497. Due to its participation in the junta on Editius and numerous other war crimes, a NanoTrasen backed bounty for the capture and return of 8-Ball and its pilot remains open to this day."
+	new_icon = "eightball"
+	allowed_types = list("mauler")
 
 ////////////
 //Fighters//

code/modules/clothing/head/oricon.dm

@@ -1,8 +1,8 @@
-//SolGov uniform hats
+//OriCon uniform hats
 
 //Utility
 /obj/item/clothing/head/soft/orion
-	name = "\improper SolGov cap"
+	name = "\improper OriCon cap"
 	desc = "It's a blue ballcap in Orion Confederation Government colors."
 	icon_state = "orionsoft"
 	item_state_slots = list(