diff --git a/citadel.dme b/citadel.dme
index 825969ae969..010038d2f8e 100644
--- a/citadel.dme
+++ b/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"
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index ef0a334fabc..4ff9d1d023a 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/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"
diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm
index 7483150fe4b..0002b79d2d6 100644
--- a/code/game/mecha/combat/honker.dm
+++ b/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"
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index a717f142272..18d0298e367 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/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"
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index dcead8fe76a..2431e6f10db 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/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
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 14bc3a7ef89..146c348f6c8 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/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"
diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm
index f4c7b192e20..9d92f9cfa7b 100644
--- a/code/game/objects/items/paintkit.dm
+++ b/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//
diff --git a/code/modules/clothing/head/oricon.dm b/code/modules/clothing/head/oricon.dm
index 75edb93a524..a17d29baa16 100644
--- a/code/modules/clothing/head/oricon.dm
+++ b/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(
diff --git a/code/modules/examine/descriptions/mecha.dm b/code/modules/examine/descriptions/mecha.dm
new file mode 100644
index 00000000000..62297cfa268
--- /dev/null
+++ b/code/modules/examine/descriptions/mecha.dm
@@ -0,0 +1,50 @@
+//Civilian Mecha
+/obj/mecha/working/ripley
+ description_fluff = "The Armored Power Loader Unit, more commonly referred to as the 'Ripley', is a tried and tested exosuit model. Often described as the workhorse of the Frontier, the Ripley was originally designed for industrial use. The APLU is a second generation improvement of the original PLU. The APLU possesses a fully enclosed cockpit enabling it to work in vacuum. The APLU retains the PLU's rugged design and resilience, and is frequently employed in mining, construction, and cargo transport capacities. Coming in at just under 9'(2.7m) tall, the APLU cockpit is cramped, requiring its pilot to stand upright and move in conjunction with the exosuit."
+
+/obj/mecha/working/hoverpod
+ description_fluff = "This small space-capable craft can accomodate one pilot and up to two passengers, depending on its equipment. The Hoverpod's trademark round design and bright white coloration are easily recognizable to spacefarers. The design has been in use for nearly two centuries, and has remained largely consistent. Developed to address short ranged transport of crew and cargo in EVA, the Hoverpod is a niche vehicle. Due to its reduced size and maneuverability, the Hoverpod saw frequent use in situations where a shuttle was deemed too cumbersome. Thanks to their ability to enter airlocks, Hoverpods have acted as a bridge between EVA in space suits and travelling within proper spacecraft. In recent times, however, the Hoverpod has begun to show its age. Newer solutions that address the same niche have begun to come to the forefront. In spite of this, the Hoverpod remains a cheap and reliable favorite across the Frontier."
+
+//Medical Mecha
+/obj/mecha/medical/odysseus
+ description_fluff = "The dominant medical exosuit on the modern market, the Odysseus is a Vey-Med product designed to incorporate other Vey-Med inventions - like the Sleeper - into a mobile frame. The Odysseus' focus on rescue operations in hazardous environments is augmented with some of the best agility ratings on the civilian market. In spite of its narrow profile, the Odysseus stands slightly taller than the APLU at 9.5'(3m). Capable of operating in vacuum as well as in most adverse weather conditions, the staying power of this mecha speaks volumes for its efficacy."
+
+//Combat Mecha
+/obj/mecha/combat/durand
+ description_fluff = "The Durand is an aging combat exosuit designed during the Rye-Egress War. Once considered the most durable exosuit ever developed by Humanity, this platform has long since lost that title. In spite of its age, the Durand remains one of the most well built and armored exosuits on the market. Standing at a towering 12'(3.5m), the exosuit boasts depleted uranium armor paneling and a robust electrical harness capable of powering some of the most fearsome weaponry still in use today. Although modern militaries - both Galactic and Corporate - have since moved on to more contemporary models, the Durand continues to see usage with smaller mercenary bands and SysDef elements."
+
+/obj/mecha/combat/gorilla
+ description_fluff = "Quadrupedal mech designs are considered excessively rare. This chassis feels more like a vehicle than a proper exosuit as a result. Although specs similar to those found in the Gorilla were patened by Hephaestus over a century ago, the company maintains that it had nothing to do with the production of this machine. When its legs are fully extended the Gorilla stands 20'(6.1m) tall, making it nearly impossible to operate at full speed within the cramped confines of a facility or vessel."
+
+/obj/mecha/combat/gygax
+ description_fluff = "The Gygax is a relatively modern exosuit designed for agility and speed without sacrificing durability. These traits have made the Gygax fairly popular among well funded private and corporate security forces. The Gygax features a bespoke actuator assembly that grants the exosuit short-term bursts of unparalleled speed. Consequently, the strain this assembly puts on the exosuit causes damage the unit's structural integrity. In spite of the drawbacks, this feature is frequently utilized by those who require the ability to rapidly respond to conflict. 10'(3m) tall and rotund, the Gygax's cockpit is fully enclosed and protected by the design's diamond-weave armor plating."
+
+/obj/mecha/combat/gygax/dark
+ description_fluff = "This variant of the standard Gygax is colloquially referred to as the 'Dark Gygax', on account of the exotic materials used in its construction. The standard Gygax's diamond-weave armor system is augmented with depleted morphium, lending it a darker and marginally more sinister hue. Simultaneously, this upgrade grants the Dark Gygax considerably more resilience without sacrificing the standard model's agility or speed. Due to the gross expenditure required to fabricate a Dark Gygax's armor plating, these platforms are exceedingly rare. Most security forces are content with the protection and utility of the standard Gygax, making this upgrade appear unnecessary. However, the Dark Gygax is often sought out by high-tier asset protection teams and paramilitary outfits."
+
+/obj/mecha/combat/honker
+ description_fluff = "Utilized with shocking effectiveness during the Prank War of 2476, the H.O.N.K. mech was commissioned by former Honktifex Maximus Pierrot LXIX. Utilizing advanced technology for its time, these mecha were constructed with the extremely rare alloy Vaudium. Initially viewed by external observers as a simple curiosity, the H.O.N.K. mech's ability to inflict widespread 'hilarity' was not realized until the design was made public some decades later. After less than two years on the open market, harsh sanctions and bans on production were levied across at least thirty six Galactic sectors. In spite of this production moratorium, experts in Robotics may sometimes ignore the warnings and fabricate these suits when asked. This is generally considered to be a poor decision. This plodding mecha comes in at 10'(3m) in height, and features a curiously barrel shaped body that provides supreme stability when firing its weaponry. There is some dispute regarding exactly what H.O.N.K. stands for. The most likely suggestion is generallly accepted to be: 'Hilariously Overpowered Noise Kreator'."
+
+/obj/mecha/combat/honker/cluwne
+ description_fluff = "As the unending battle over Vaudium continues raging to this day, it should come as no surprise that both Clowns and Mimes continue to iterate on their unique forms of military technology. The C.L.U.W.N.E. is the successor to the H.O.N.K. mech. Utilizing similar design philosophy and based off of the same chassis, the C.L.U.W.N.E. is significantly more armored and durable, addressing several vulnerabilities in the original H.O.N.K. design. Demonstrably effective, these mecha are frequently deployed to the front lines of the conflict. Rarely they are even dispatched off-planet to support Clown Commando teams. Due to the immense amount of Vaudium required to fabricate a single C.L.U.W.N.E. mech, their mass production remains untenable. Even if it were, Clown Planet guards the mech's schematics jealously. It is currently assumed that the mecha's designation stands for 'Combative Laughter Unit With New Equipment', though this theory is widely disputed."
+
+/obj/mecha/combat/marauder
+ description_fluff = "Developed by NanoTrasen, the Marauder is the modern descendant of the Durand. Stronger, faster, and more resilient, the Marauder has fully supplanted its predecessor. Deployed by NanoTrasen to the fiercest conflict zones during the Phoron War, Marauders quickly gained a reputation for brutal efficiency. Marauders are fielded by the megacorporation to hot zones across the Frontier to this day. Thanks to its status as a military grade weapons platform and its highly proprietary equipment, the Marauder is generally unavailable to civilians - including low-level NanoTrasen duty stations and allied corporations. Standing at 12'(3.5m) tall, the Marauder cockpit is complex and spacious enough to grant the pilot a full range of movement within its spherical shell."
+
+/obj/mecha/combat/marauder/seraph
+ description_fluff = "Essentially a Marauder with minor imrprovements, the Seraph combat exosuit is a slight upgrade to its predecessor. Due to the relatively small impact of these changes, the Seraph has not made the Marauder obsolete. Instead Seraph units are generally issued to NanoTrasen paramilitary commanders, where they fill a specialized communications role courtesy of their next-generation communications and electronic warfare suites. Due to the tactical nature of the Seraph's battlefield role, the exosuit is not expected to see combat frequently. In spite of this, the Seraph still fields a combat loadout that enables it to protect itself if attacked unexpectedly."
+
+/obj/mecha/combat/marauder/mauler
+ description_fluff = "In spite of their technological advancement and heavily restricted deployments, NanoTrasen Marauders may sometimes be stolen, salvaged, or illictly purchased from corrupt company officials. These repurposed models are designated Maulers - after the first line produced by the Syndicate during the Phoron War. Functionally identical in terms of armor and armament, Maulers are considerably more rare than the already scarce Marauder, and are considered a black market collectable on par with stolen art."
+
+/obj/mecha/combat/phazon
+ description_fluff = "The Phazon exosuit is the result of a heavily classified NanoTrasen research initiative. Designed to serve as a reconnaissance, infiltration, and flanking mecha, the Phazon possesses an array of complex and expensive phasing and cloaking systems which allow it to change its matter state and move through solid materials. Although initial field tests were positive, the raw cost of manufacturing the Phazon made mass production untenable. Of the few suits deployed during the Phoron War, none are known to have fallen into enemy hands. In spite of this, corporate espionage has lead to various parts and components becoming available on the black market. The actual circuitry and chips necessary to construct the Phazon, however, remain closely guarded corporate secrets. The exosuit's hover capabilities cause it to float roughly a foot off of the ground. Due to this, although the Janus itself comes in at a moderate 9'(2.7m) in height, it effectively takes up 10' to 11'(3m-3.4m) of space when in operation."
+
+/obj/mecha/combat/phazon/janus
+ description_fluff = "An incredibly high-tech exosuit constructed out of salvaged alien components fused with cutting-edge modern technology. This machine is theoretically capable of sublight travel. However, due to the vaguely anomalous nature of its miniaturized, supermatter-fueled Toroidal Bluespace Drive, it is uncertain how this ability manifests."
+
+/obj/mecha/combat/reticent
+ description_fluff = "During the Melancholy Occupation of 2476 - callously referred to by their opposition as the 'Prank War' - the people of Le Rien realized the rapidly widening gulf between their technological advancements and Columbina's. Aiming to prevent another such tragedy from happening again, extensive research was conducted on the H.O.N.K. mecha deployed by the Clowns. Although Silencium bears less technological utility, scientists were able to employ its own unique properties in the Reticent's design. An agile mecha plated in a sturdy layer of Silencium, the Reticent was able to move silently through corridors its bulkier opponent could not. Able to close distance with the more range biased H.O.N.K. mecha, Reticent units deployed to occupied zones quickly cleared out mechanized garrisons. Although formidable, the Reticent suffers from a weak chassis - a byproduct of its maneuverability - and is easily disabled once its dense mineral armor is shattered. Its 11'(3.4m) oblong body is designed to move at a forward tilt, assisting the exosuit in rapidly gaining momentum."
+
+/obj/mecha/combat/reticence
+ description_fluff = "After fully repelling the Columbinan occupiers in 2503, Le Rien began to construct powerful defensive lines along their borders. Decades of fighting had provided researchers with plenty of insight into the faults and merits of the Reticent design. Although intent on keeping the model in service, the Silent Council decreed that a new mech platform would need to be developed to bolster their static defensive line. The Reticent was far too fragile for border defense. Returning to more traditional mecha design doctrine, the Reticence is larger, heavier, and more armored than its predecessor. A 10'(3m) tall hulk, the Reticence trades in the Reticent's blinding speed for a more powerful shielding system and significant improvements in Silencium armor placement. The Reticence is still able to close the gap and deliver close-range punishment to any who dare violate Le Rien's borders."
diff --git a/code/modules/lore_codex/robutt_data/bybrand.dm b/code/modules/lore_codex/robutt_data/bybrand.dm
index c7d7bf3da74..341723f5a3d 100644
--- a/code/modules/lore_codex/robutt_data/bybrand.dm
+++ b/code/modules/lore_codex/robutt_data/bybrand.dm
@@ -41,7 +41,7 @@
/datum/lore/codex/page/robo_heph
name = "Hephaestus Industries"
- data = "Hephaestus joined the civilian prosthetic market in earnest after the First Contact War. Wartime amputees and fully-prosthetic Mechanized Division veterans found themselves looking for the Hephaestus parts that they had access to during the conflict. Hephaestus responded by producing the first civilian model of their rugged green prosthetics, leveraging their ties with SolGov to offer discounts to many of those returning from war. HI-Civilian is not quite as durable or easily maintained as the military model, to conform with most systems' legal restrictions on the capacities of prosthetic limbs, but maintains an unmatched reputation for resilience to damage and ease of repair.\
+ data = "Hephaestus joined the civilian prosthetic market in earnest after the Rye-Egress War. Wartime amputees and fully-prosthetic Mechanized Division veterans found themselves looking for the Hephaestus parts that they had access to during the conflict. Hephaestus responded by producing the first civilian model of their rugged green prosthetics, leveraging their ties with OriCon to offer discounts to many of those returning from war. HI-Civilian is not quite as durable or easily maintained as the military model, to conform with most systems' legal restrictions on the capacities of prosthetic limbs, but maintains an unmatched reputation for resilience to damage and ease of repair.\
\
Hephaestus prosthetics are somewhat expensive, but are a reasonable investment for many of average or above economic status. It has sufficient manual dexterity for most tasks, without sacrificing the rugged durability that made the brand popular."
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm
index 60ea5d44011..4531c056b00 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax.dm
@@ -8,7 +8,7 @@
name = "Exosuit - Advanced Dark Gygax"
desc = "This exosuit is an experimental prototype, descended from the Dark Gygax. It retains the \
speed that is characteristic of the other models, yet outclasses all of them in durability, \
- to the point of having a comparable amount of protection to models that placed a higher emphesis \
+ to the point of having a comparable amount of protection to models that placed a higher emphasis \
on armor, like the Durand and even the Marauder. It is also much larger in scale, and significantly \
heavier than most other exosuits developed by humans, which often causes shockwaves to be felt \
whenever it moves. This has been observed to have a demoralizing effect on hostile forces.\
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm
index 0bcedb7a3b0..3f2b2d68530 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm
@@ -4,20 +4,17 @@
/datum/category_item/catalogue/technology/durand
name = "Exosuit - Durand"
- desc = "The Durand is an old combat exosuit; once the most durable exosuit ever developed by humans. \
- In modern times, this exosuit has been dethroned from that title, yet it remains one of the more well built and armored \
- exosuits, despite its age.\
-
\
- During the First Contact War against the Unathi, there was a need for various new technologies to be developed \
- to counter the Unathi war machine. One of many solutions created was the Durand, which was made to be heavy and \
- well-armored, and be capable of powering the various weapons that could be mounted onto it. Presently, the \
- Durand now generally serves as corporate asset protection hardware, due to modern militaries moving on to newer, \
- more advanced war machines."
+ desc = "The Durand is an aging combat exosuit designed during the Rye-Egress War. Once considered the most \
+ durable exosuit ever developed by Humanity, this platform has long since lost that title. In spite of its age, \
+ the Durand remains one of the most well built and armored exosuits on the market. Standing at a towering 12'(3.5m), \
+ the exosuit boasts depleted uranium armor paneling and a robust electrical harness capable of powering some of the \
+ most fearsome weaponry still in use today. Although modern militaries - both Galactic and Corporate - have since \
+ moved on to more contemporary models, the Durand continues to see usage with smaller mercenary bands and SysDef elements."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/durand
name = "durand"
- desc = "An aging combat exosuit utilized by many corporations. It was originally developed to fight in the First Contact War."
+ desc = "An aging combat exosuit utilized by many corporations. It was originally developed to fight in the Rye-Egress War."
catalogue_data = list(/datum/category_item/catalogue/technology/durand)
icon_state = "durand"
movement_cooldown = 10
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm
index 4cd3de1d9ec..eed5d18e84b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/gygax.dm
@@ -3,13 +3,12 @@
/datum/category_item/catalogue/technology/gygax
name = "Exosuit - Gygax"
- desc = "The Gygax is a relatively modern exosuit, built to be lightweight and agile, while still being fairly durable. \
- These traits have made them rather popular among well funded private and corporate security forces, who desire \
- the ability to rapidly respond to conflict.\
-
\
- One special feature of this model is that the actuators that \
- drive the exosuit can have their safeties disabled in order to achieve a short-term burst of unparalleled speed, \
- at the expense of damaging the exosuit considerably."
+ desc = "The Gygax is a relatively modern exosuit designed for agility and speed without sacrificing durability. \
+ These traits have made the Gygax fairly popular among well funded private and corporate security forces. The Gygax \
+ features a bespoke actuator assembly that grants the exosuit short-term bursts of unparalleled speed. Consequently, \
+ the strain this assembly puts on the exosuit causes damage the unit's structural integrity. In spite of the drawbacks, \
+ this feature is frequently utilized by those who require the ability to rapidly respond to conflict. 10'(3m) tall and \
+ rotund, the Gygax's cockpit is fully enclosed and protected by the design's diamond-weave armor plating."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/gygax
@@ -43,19 +42,18 @@
/datum/category_item/catalogue/technology/dark_gygax
name = "Exosuit - Dark Gygax"
- desc = "This exosuit is a variant of the regular Gygax. It is generally referred to as the Dark Gygax, \
- due to being constructed from different materials that give it a darker appearance. Beyond merely looking \
- cosmetically different, the Dark Gygax also has various upgrades compared to the Gygax. It is much more \
- resilient, yet retains the agility and speed of the Gygax.\
-
\
- These are relatively rare compared to the other security exosuits, as most security forces are content with \
- a regular Gygax. Instead, this exosuit is often used by high-end asset protection teams, and mercenaries."
+ desc = "This variant of the standard Gygax is colloquially referred to as the 'Dark Gygax', on account of the exotic \
+ materials used in its construction. The standard Gygax's diamond-weave armor system is augmented with depleted morphium, \
+ lending it a darker and marginally more sinister hue. Simultaneously, this upgrade grants the Dark Gygax considerably more \
+ resilience without sacrificing the standard model's agility or speed. Due to the gross expenditure required to fabricate a \
+ Dark Gygax's armor plating, these platforms are exceedingly rare. Most security forces are content with the protection and \
+ utility of the standard Gygax, making this upgrade appear unnecessary. However, the Dark Gygax is often sought out by \
+ high-tier asset protection teams and paramilitary outfits."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark
name = "dark gygax"
- desc = "A significantly upgraded Gygax security mech, often utilized by corporate asset protection teams and \
- PMCs."
+ desc = "A significantly upgraded Gygax security mech, often utilized by corporate asset protection teams and PMCs."
catalogue_data = list(/datum/category_item/catalogue/technology/dark_gygax)
icon_state = "darkgygax"
wreckage = /obj/structure/loot_pile/mecha/gygax/dark
@@ -75,8 +73,6 @@
/mob/living/simple_mob/mechanical/mecha/combat/gygax/medgax
name = "medgax"
- desc = "An unorthodox fusion of the Gygax and Odysseus exosuits, this one is fast, sturdy, and carries a wide array of \
- potent chemicals and delivery mechanisms. The doctor is in!"
+ desc = "An unorthodox fusion of the Gygax and Odysseus exosuits, this one is fast, sturdy, and carries a wide array of potent chemicals and delivery mechanisms. The doctor is in!"
icon_state = "medgax"
wreckage = /obj/structure/loot_pile/mecha/gygax/medgax
-
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/honker.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/honker.dm
index b1b5001b4e6..ba6a5cf70eb 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/honker.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/honker.dm
@@ -2,14 +2,14 @@
/datum/category_item/catalogue/technology/honker
name = "Exosuit - H.O.N.K."
-
- desc = "Utilized with shocking effectiveness during the Prank War of 2476, the H.O.N.K. mech was commissioned by former \
- Honktifex Maximus Pierrot LXIX. Utilizing advanced technology for its time, these mecha were constructed utilizing the extremely rare \
- alloy Vaudium. Viewed by external observers as a simple curiosity, the H.O.N.K. mech's ability to inflict widespread 'hilarity' was not \
- realized until the design was made public some decades later. After less than two years on the open market, harsh sanctions and bans on \
- production were levied across at least thirty six Galactic sectors. In spite of this production moratorium, experts in Robotics may sometimes \
- ignore the warnings and fabricate these suits when asked. This is generally considered to be a poor decision.There is some dispute regarding \
- exactly what H.O.N.K. stands for. The most likely suggestion is generallly accepted to be: 'Hilariously Overpowered Noise Kreator'"
+ desc = "Utilized with shocking effectiveness during the Prank War of 2476, the H.O.N.K. mech was commissioned by former Honktifex Maximus \
+ Pierrot LXIX. Utilizing advanced technology for its time, these mecha were constructed with the extremely rare alloy Vaudium. Initially viewed \
+ by external observers as a simple curiosity, the H.O.N.K. mech's ability to inflict widespread 'hilarity' was not realized until the design was \
+ made public some decades later. After less than two years on the open market, harsh sanctions and bans on production were levied across at least \
+ thirty six Galactic sectors. In spite of this production moratorium, experts in Robotics may sometimes ignore the warnings and fabricate these \
+ suits when asked. This is generally considered to be a poor decision. This plodding mecha comes in at 10'(3m) in height, and features a curiously \
+ barrel shaped body that provides supreme stability when firing its weaponry. There is some dispute regarding exactly what H.O.N.K. stands for. The \
+ most likely suggestion is generallly accepted to be: 'Hilariously Overpowered Noise Kreator'."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/honker
@@ -43,21 +43,19 @@
/datum/category_item/catalogue/technology/cluwne
name = "Exosuit - C.L.U.W.N.E."
-
- desc = "As the unending battle over Vaudium wages to this day, it should come as no surprise that both \
- Clowns and Mimes continue to iterate on their unique forms of military technology. The C.L.U.W.N.E. is the \
- successor to the H.O.N.K. mech. Utilizing similar design philosophy and based off of the same chassis, the \
- C.L.U.W.N.E. is significantly more armored and durable, addressing several vulnerabilities in the original H.O.N.K. \
- design. Demonstrably effective, these mecha are frequently deployed on the front lines of the conflict, and may rarely be \
- dispatched off-planet to support Clown Commando teams. Due to the immense amount of Vaudium required to fabricate a \
- single C.L.U.W.N.E. mech, their mass production remains untenable. Even if it were, Clown Planet guards the mech's schematics \
- jealously. It is currently assumed that the mecha's designation stands for 'Combative Laughter Unit With New Equipment', though \
- this theory is widely disputed."
+ desc = "As the unending battle over Vaudium continues raging to this day, it should come as no surprise that both Clowns \
+ and Mimes continue to iterate on their unique forms of military technology. The C.L.U.W.N.E. is the successor to the H.O.N.K. \
+ mech. Utilizing similar design philosophy and based off of the same chassis, the C.L.U.W.N.E. is significantly more armored and \
+ durable, addressing several vulnerabilities in the original H.O.N.K. design. Demonstrably effective, these mecha are frequently \
+ deployed to the front lines of the conflict. Rarely they are even dispatched off-planet to support Clown Commando teams. Due to \
+ the immense amount of Vaudium required to fabricate a single C.L.U.W.N.E. mech, their mass production remains untenable. Even if \
+ it were, Clown Planet guards the mech's schematics jealously. It is currently assumed that the mecha's designation stands for \
+ 'Combative Laughter Unit With New Equipment', though this theory is widely disputed."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/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 found elsewhere."
+ 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 found elsewhere."
catalogue_data = list(/datum/category_item/catalogue/technology/cluwne)
icon = 'icons/mecha/mecha_vr.dmi'
icon_state = "cluwne"
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
index ee31e518d41..e18ec43419a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
@@ -2,14 +2,14 @@
/datum/category_item/catalogue/technology/hoverpod
name = "Voidcraft - Hoverpod"
- desc = "This is a small space-capable craft that has a round design. Can hold up to one pilot, \
- and sometimes one or two passengers, with the right modifications made. \
- Hoverpods have existed for a very long time, and the design has remained more or less consistant over its life. \
- They carved out a niche in short ranged transportation of cargo or crew while in space, \
- as they were more efficient compared to using a shuttle, and required less infrastructure to use due to being compact enough \
- to use airlocks. As such, they acted as a sort of bridge between being EVA in a spacesuit, and being inside a 'real' spacecraft.\
-
\
- In recent times, the Hoverpod is seen as outdated by some, as newer solutions to that niche now exist, however it remains an ancient favorite."
+ desc = "This small space-capable craft can accomodate one pilot and up to two passengers, depending on its equipment. \
+ The Hoverpod's trademark round design and bright white coloration are easily recognizable to spacefarers. The design \
+ has been in use for nearly two centuries, and has remained largely consistent. Developed to address short ranged transport \
+ of crew nad cargo in EVA, the Hoverpod is a niche vehicle. Due to its reduced size and maneuverability, the Hoverpod saw \
+ frequent use in situations where a shuttle was deemed too cumbersome. Thanks to their ability to enter airlocks, Hoverpods \
+ have acted as a bridge between EVA in space suits and travelling within proper spacecraft. In recent times, however, the \
+ Hoverpod has begun to show its age. Newer solutions that address the same niche have begun to come to the forefront. \
+ In spite of this, the Hoverpod remains a cheap and reliable favorite across the Frontier."
value = CATALOGUER_REWARD_EASY
/mob/living/simple_mob/mechanical/mecha/hoverpod
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/marauder.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/marauder.dm
index 3ec4ab6be4b..a5269043a52 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/marauder.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/marauder.dm
@@ -2,10 +2,13 @@
/datum/category_item/catalogue/technology/marauder
name = "Exosuit - Marauder"
- desc = "Marauders are the more modern descendants of the Durand model. Stronger, faster, and \
- more resilient than their predecessor, they have replaced the Durand's role entirely, and are generally deployed by \
- NanoTrasen to heavy conflict zones across the Frontier. As such, they are generlly unavailable to civilians, including \
- low-level NanoTrasen duty stations and most allied corporations."
+ desc = "Developed by NanoTrasen, the Marauder is the modern descendant of the Durand. Stronger, faster, and more resilient, \
+ the Marauder has fully supplanted its predecessor. Deployed by NanoTrasen to the fiercest conflict zones during the Phoron War, \
+ Marauders quickly gained a reputation for brutal efficiency. Marauders are fielded by the megacorporation to hot zones across \
+ the Frontier to this day. Thanks to its status as a military grade weapons platform and its highly proprietary equipment, \
+ the Marauder is generally unavailable to civilians - including low-level NanoTrasen duty stations and allied corporations. \
+ Standing at 12'(3m) tall, the Marauder cockpit is complex and spacious enough to grant the pilot a full range of movement \
+ within its spherical shell."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/marauder
@@ -37,14 +40,12 @@
/datum/category_item/catalogue/technology/seraph
name = "Exosuit - Seraph"
- desc = "The Seraph line of combat exosuit is essentially a Marauder with incremental improvements, making \
- it slightly better. Due to the relatively minor improvements over its predecessor, and the cost of \
- said improvements, Seraphs have not made the Marauder obsolute. Instead, they have generally filled the \
- role of housing important commanders, and as such they generally contain specialized communications \
- equipment to aid in receiving and relaying orders.\
-
\
- Due to this role, they are generally not expected to see combat frequently. Despite this, they often have \
- one or more weapons attached, to allow for retaliation in case it is attacked directly."
+ desc = "Essentially a Marauder with minor imrprovements, the Seraph combat exosuit is a slight upgrade to its predecessor. \
+ Due to the relatively small impact of these changes, the Seraph has not made the Marauder obsolete. Instead Seraph units are \
+ generally issued to NanoTrasen paramilitary commanders, where they fill a specialized communications role courtesy of their \
+ next-generation communications and electronic warfare suites. Due to the tactical nature of the Seraph's battlefield role, \
+ the exosuit is not expected to see combat frequently. In spite of this, the Seraph still fields a combat loadout that enables \
+ it to protect itself if attacked unexpectedly."
value = CATALOGUER_REWARD_HARD
// Slightly stronger, used to allow comdoms to frontline without dying instantly, I guess.
@@ -64,8 +65,8 @@
desc = "In spite of their technological advancement and heavily restricted deployments, NanoTrasen \
Marauders may sometimes be stolen, salvaged, or illictly purchased from corrupt company officials. These \
repurposed models are designated Maulers - after the first line produced by the Syndicate during the Phoron \
- wars. Functionally identical in terms of armor and armament, Maulers are considerably more rare than the \
- already scarce Marauder, and are considered a black market collectable item on par with stolen art."
+ War. Functionally identical in terms of armor and armament, Maulers are considerably more rare than the \
+ already scarce Marauder, and are considered a black market collectable on par with stolen art."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/marauder/mauler
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm
index d35058d6a50..047162a2fbb 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/odysseus.dm
@@ -4,11 +4,12 @@
/datum/category_item/catalogue/technology/odysseus
name = "Exosuit - Odysseus"
- desc = "A Vey-Medical innovation, the Odysseus was designed to incorporate some of their \
- other inventions, such as the Sleeper, into a mobile frame. Due to its ability to safely \
- rescue injured people in potentially hostile environments such as vacuum, as well as its \
- agility compared to other civilian exosuits, the Odysseus dominates the market for \
- medical exosuits."
+ desc = "The dominant medical exosuit on the modern market, the Odysseus is a Vey-Med product \
+ designed to incorporate other Vey-Med inventions - like the Sleeper - into a mobile frame. The \
+ Odysseus' focus on rescue operations in hazardous environments is augmented with some of the best \
+ agility ratings on the civilian market. In spite of its narrow profile, the Odysseus stands slightly \
+ taller than the APLU at 9.5'(3m). Capable of operating in vacuum as well as in most adverse weather \
+ conditions, the staying power of this mecha speaks volumes for its efficacy."
value = CATALOGUER_REWARD_EASY
/mob/living/simple_mob/mechanical/mecha/odysseus
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/phazon.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/phazon.dm
index 3512bff0b19..88d618afb42 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/phazon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/phazon.dm
@@ -8,8 +8,10 @@
and move through solid materials. Although initial field tests were positive, the raw cost of manufacturing \
the Phazon made mass production untenable. Of the few suits deployed during the Phoron War, none are known to \
have fallen into enemy hands. In spite of this, corporate espionage has lead to various parts and components \
- becoming available on the black market. The actual circuitry and chips necessary to construct the Phazon, however \
- remain closely guarded corporate secrets."
+ becoming available on the black market. The actual circuitry and chips necessary to construct the Phazon, however, \
+ remain closely guarded corporate secrets. The exosuit's hover capabilities cause it to float roughly a foot off of \
+ the ground. Due to this, although the Phazon itself comes in at a moderate 9'(2.7m) in height, it effectively takes \
+ up 10' to 11'(3m-3.4m) of space when in operation."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/phazon
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/reticent.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/reticent.dm
index cc03898e2af..d25a69a0c67 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/reticent.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/reticent.dm
@@ -2,15 +2,15 @@
/datum/category_item/catalogue/technology/reticent
name = "Exosuit - Reticent"
-
- desc = "During the Melancholy Occupation of 2476 - callously referred to by their opposition as the 'Prank War', the \
+ desc = "During the Melancholy Occupation of 2476 - callously referred to by their opposition as the 'Prank War' - the \
people of Le Rien realized the rapidly widening gulf between their technological advancements and Columbina's. Aiming to \
prevent another such tragedy from happening again, extensive research was conducted on the H.O.N.K. mecha deployed by \
the Clowns. Although Silencium bears less technological utility, scientists were able to employ its own unique properties in \
the Reticent's design. An agile mecha plated in a sturdy layer of Silencium, the Reticent was able to move silently through \
corridors its bulkier opponent could not. Able to close distance with the more range biased H.O.N.K. mecha, Reticent units \
deployed to occupied zones quickly cleared out mechanized garrisons. Although formidable, the Reticent suffers from a weak \
- chassis - a byproduct of its maneuverability, and is easily disabled once its dense mineral armor is shattered."
+ chassis - a byproduct of its maneuverability - and is easily disabled once its dense mineral armor is shattered. Its 11'(3m) \
+ oblong body is designed to move at a forward tilt, assisting the exosuit in rapidly gaining momentum."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/reticent
@@ -63,15 +63,14 @@
/datum/category_item/catalogue/technology/reticence
name = "Exosuit - Reticence"
-
desc = "After fully repelling the Columbinan occupiers in 2503, Le Rien began to construct powerful defensive \
lines along their borders. Decades of fighting had provided researchers with plenty of insight into the faults \
and merits of the Reticent design. Although intent on keeping the model in service, the Silent Council decreed \
that a new mech platform would need to be developed to bolster their static defensive line. The Reticent was far \
too fragile for border defense. Returning to more traditional mecha design doctrine, the Reticence is larger, \
- heavier, and more armored than its predecessor. Trading in the Reticent's blinding speed for a more powerful \
- shielding system and significant improvements in Silencium armor placement, the Reticence is still able to close \
- the gap and deliver close-range punishment to any who dare violate Le Rien's borders."
+ heavier, and more armored than its predecessor. A 10'(3m) tall hulk, the Reticence trades in the Reticent's \
+ blinding speed for a more powerful shielding system and significant improvements in Silencium armor placement. \
+ The Reticence is still able to close the gap and deliver close-range punishment to any who dare violate Le Rien's borders."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/mecha/combat/reticent/reticence
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm
index c456e1862ad..08cacab4bb0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/ripley.dm
@@ -3,17 +3,19 @@
/datum/category_item/catalogue/technology/ripley
name = "Exosuit - APLU"
- desc = "The Autonomous Power Loader Unit, more commonly designated as the 'Ripley', \
- is an exosuit that is often described as 'the workhorse of the exosuit world', \
- due to being designed for industrial use. Featuring a rugged design, they are fairly \
- resilient to the stresses of operation. As such, they are often used for various roles, \
- such as mining, construction, heavy lifting, and cargo transportation."
+ desc = "The Armored Power Loader Unit, more commonly referred to as the 'Ripley', \
+ is a tried and tested exosuit model. Often described as the workhorse of the Frontier, \
+ the Ripley was originally designed for industrial use. The APLU is a second generation \
+ improvement of the original PLU. The APLU possesses a fully enclosed cockpit enabling it \
+ to work in vacuum. The APLU retains the PLU's rugged design and resilience, and is frequently \
+ employed in mining, construction, and cargo transport capacities. Coming in at just under 9'(2.7m) tall, \
+ the APLU cockpit is cramped, requiring its pilot to stand upright and move in conjunction with the exosuit."
value = CATALOGUER_REWARD_EASY
/mob/living/simple_mob/mechanical/mecha/ripley
name = "\improper APLU ripley"
- desc = "Autonomous Power Loader Unit. The workhorse of the exosuit world. This one has big drill."
+ desc = "Armored Power Loader Unit. The workhorse of the exosuit world. This one has big drill."
catalogue_data = list(/datum/category_item/catalogue/technology/ripley)
icon_state = "ripley"
wreckage = /obj/structure/loot_pile/mecha/ripley
@@ -112,4 +114,3 @@
has_repair_droid = TRUE //But has repair drone
pilot_type = /mob/living/simple_mob/humanoid/possessed/merc/feral //Possessed rig suit piloting a mech. Tremble in fear
movement_shake_radius = 5 //Actually tremble
-
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index a3f99082336..df7949792e2 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ