Minor Updates for Titan Rises Arc (#16997)

* guild mantle

* description updates

* changelog

code/modules/client/preference_setup/loadout/items/xeno/unathi.dm

@@ -25,19 +25,27 @@
 	sort_category = "Xenowear - Unathi"
 	flags = GEAR_HAS_COLOR_SELECTION
 
+/datum/gear/suit/unathi_mantle_heph
+	display_name = "hephaestus guild mantle"
+	description = "A green mantle, worn by Hephaestus Industries workers in the Izweski Hegemony."
+	path = /obj/item/clothing/accessory/poncho/unathimantle/hephaestus
+	cost = 1
+	sort_category = "Xenowear - Unathi"
+	flags = GEAR_HAS_COLOR_SELECTION
+	faction = "Hephaestus Industries"
+
 /datum/gear/suit/unathi_mantle_guild
 	display_name = "guild mantle selection"
 	description = "A selection of hide mantles, each showing affiliation with one of the guilds of Moghes."
-	path = /obj/item/clothing/accessory/poncho/unathimantle/hephaestus
+	path = /obj/item/clothing/accessory/poncho/unathimantle/merchant
 	cost = 1
-	whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
+	whitelisted = list(SPECIES_UNATHI)
 	sort_category = "Xenowear - Unathi"
 	flags = GEAR_HAS_COLOR_SELECTION
 
 /datum/gear/suit/unathi_mantle_guild/New()
 	..()
 	var/list/guildmantles = list()
-	guildmantles["hephaestus guild mantle"] = /obj/item/clothing/accessory/poncho/unathimantle/hephaestus
 	guildmantles["merchants' guild mantle"] = /obj/item/clothing/accessory/poncho/unathimantle/merchant
 	guildmantles["miners' guild mantle"] = /obj/item/clothing/accessory/poncho/unathimantle/miner
 	guildmantles["junzi electric guild mantle"] = /obj/item/clothing/accessory/poncho/unathimantle/junzi

code/modules/clothing/under/accessories/xeno/unathi.dm

@@ -111,16 +111,16 @@
 	name = "merchants' guild mantle"
 	desc = "The cured hide and skin of a large beast, dyed in the purple colors of the Merchants' Guild. These mantles are reserved for full-fledged guildsmen, as a sign of \
 	their position in the guild."
-	desc_extended = "In the modern day, the Merchants' Guild is one of the largest guilds in the Hegemony - access to new and alien markets has produced great wealth for the guild, \
-	and its guildsmen can be seen trading all across the Orion Spur."
+	desc_extended = "The Merchants' Guild was one of the largest guilds in the Hegemony, until the phoron scarcity brought about an economic depression in Izweski space, leading to the guild's \
+	bankruptcy and dissolution. Now, these mantles are seen rarely, usually kept by former members who continue to try and work as merchants."
 	worn_overlay = "merchantsguild"
 
 /obj/item/clothing/accessory/poncho/unathimantle/miner
 	name = "miners' guild mantle"
 	desc = "The cured hide and skin of a large beast, dyed in the burnt orange of the Miners' Guild. These mantles are reserved for full-fledged guildsmen, as a sign of \
 	their position in the guild."
-	desc_extended = "The Miners' Guild is a powerful one still, though the expansion of Hephaestus mining operations into the Hegemony has harmed the monopoly they once held over their \
-	industry. For now, however, the Unathi guild and the alien megacorporation have managed to coexist."
+	desc_extended = "The Miners' Guild is a powerful one still, though the expansion of Hephaestus mining operations into the Hegemony broke up its monopoly. While the two competed for a time, \
+	Hephaestus finally won, absorbing the Miners' Guild alongside several others as a subsidiary corporation."
 	worn_overlay = "minersguild"
 
 /obj/item/clothing/accessory/poncho/unathimantle/junzi
@@ -128,7 +128,8 @@
 	desc = "The cured hide and skin of a large beast, dyed in the electric blue of the Junzi Electric Guild. These mantles are reserved for full-fledged guildsmen, as a sign of \
 	their position in the guild."
 	desc_extended = "For centuries, Junzi Electric has been responsible for the Hegemony's power industry. It is the oldest guild in existence within the Hegemony, with origins dating back \
-	to the Unathi discovery of electricity. In the modern age, a vast majority of the Hegemony's power generation is still maintained by guildsmen of Junzi Electric."
+	to the Unathi discovery of electricity. In the modern age, a vast majority of the Hegemony's power generation is still maintained by guildsmen of Junzi Electric. In 2465, Junzi Electric \
+	grew close to bankruptcy, and was bought out by Hephaestus Industries, continuing to operate as a subsidiary of the human megacorporation."
 	worn_overlay = "junzielectric"
 
 /obj/item/clothing/accessory/poncho/unathimantle/bard
@@ -136,7 +137,9 @@
 	desc = "The cured hide and skin of a large beast, dyed in the vibrant green of the Bards' Guild, also known as the Keepers of Heirlooms. \
 	These mantles are reserved for full-fledged guildsmen as a sign of their position in the guild."
 	desc_extended = "The Keepers of Heirlooms operate a majority of the Hegemony's entertainment industry - nearly all news, television and film across the Hegemony can be traced back \
-	to this ancient and illustrious guild. Outside of the Hegemony, they are mainly known for their operation of Sinta Articles, the largest news outlet of the Hegemony."
+	to this ancient and illustrious guild. Outside of the Hegemony, they are mainly known for their operation of Sinta Articles, the largest news outlet of the Hegemony. The Keepers of Heirlooms \
+	were one of many guilds transformed into Hephaestus subsidiaries in 2465, though their operations have largely continued unchanged, with the megacorporation content to leave the Bards alone save for \
+	Sinta Articles, which now prints exactly what Hephaestus wants it to."
 	worn_overlay = "bardsguild"
 
 /obj/item/clothing/accessory/poncho/unathimantle/med
@@ -145,7 +148,8 @@
 	their position in the guild."
 	desc_extended = "The House of Medicine oversees the Skalamar University of Medicine, one of the oldest educational institutions on Moghes. To be a guildsman of the House is equivalent \
 	to a medical doctorate within human nations. In recent years, the House has come into conflict with the K'lax Hive, as their gene-clinics pose a threat to the guild's monopoly over \
-	the medical industry."
+	the medical industry. This guild was bought out by Hephaestus in 2465, and now provides Hephaestus employees with medical care, as well as continuing to operate most of the Hegemony's medical \
+	industry."
 	worn_overlay = "houseofmedicine"
 
 /obj/item/clothing/accessory/poncho/unathimantle/construction
@@ -154,7 +158,7 @@
 	their position in the guild."
 	desc_extended = "The Construction Coalition is a unique guild, operating far more democratically than others. It originated as a loose federation of local construction guilds, and \
 	this new and unique model was only recently approved by Hegemon Not'zar. Many of the castles of the nobility and the great cities of Moghes were constructed and are still maintained by \
-	guildsmen of the Coalition's constituents."
+	guildsmen of the Coalition's constituents. In 2465, the bankruptcy of the Construction Coalition led to their acquisition as a subsidiary of Hephaestus Industries."
 	worn_overlay = "constructioncoalition"
 
 /obj/item/clothing/accessory/poncho/unathimantle/union
@@ -163,7 +167,9 @@
 	their position in the guild."
 	desc_extended = "A new movement, and one rapidly gaining influence in the Southlands of Moghes, the Hearts of Industry resemble a workers' union more than a traditional guild. \
 	Their membership has grown in the factories and docks of Jaz'zirt, and they have often clashed with the local nobility on matters of workers' rights. While membership in the Hearts \
-	is not illegal, the organisation's growing power threatens the status quo, and their meetings have often been brutally struck down by Overlord Miazso."
+	is not illegal, the organisation's growing power threatens the status quo, and their meetings have often been brutally struck down by Overlord Miazso. Following the Ouerean riots of \
+	2465, and the mass expansion of Hephaestus Industries, the Hearts of Industry have been suppressed, and have lost a great deal of the power they were beginning to grasp. While membership is not \
+	illegal, it is prohibited by Hephaestus regulations, and open members of the Hearts cannot find employment with the megacorporation - which now disqualifies them from almost every guild in the Hegemony."
 	worn_overlay = "heartofindustry"
 
 /obj/item/clothing/accessory/poncho/unathimantle/fighter
@@ -172,14 +178,17 @@
 	their position in the guild."
 	desc_extended = "The Fighters' Lodge was created in the years following the Contact War, inspired by human private military contractors. As such, it has an unusual structure for an Unathi guild, \
 	resembling a human corporation more than the traditional guilds of Moghes. The Fighters' Lodge mainly takes jobs as security for merchants, with their charter preventing them from \
-	taking sides in the power struggles of the nobility."
+	taking sides in the power struggles of the nobility. Following the recession of 2465, the Lodge became a Hephaestus subsidiary corporation, and now largely provides security to the corporation's operations in the Hegemony and beyond."
 	worn_overlay = "fighterslodge"
 
 /obj/item/clothing/accessory/poncho/unathimantle/fisher
 	name = "fishing league mantle"
 	desc = "The cured hide and skin of a large beast, dyed in the grey-brown of the Fishing League. These mantles are reserved for full-fledged guildsmen, as a sign of \
 	their position in the guild."
-	desc_extended = "The largest guild within the Hegemony, the Fishing League is a behemoth of food production, churning out tons of foodstuffs a day. While local villages and nobles have their own food production centers, mainly aquaculture farms which run outside of the aegis of the Fishing League, the vast majority of food produced within the Hegemony is produced by the Fishing League, whether it be on Ouerea or Moghes. However, due to the post-contact war environment of Moghes, no matter how much the fishing league produces, it will never be enough to feed the remaining population."
+	desc_extended = "Once the largest guild within the Hegemony, the Fishing League is a behemoth of food production, churning out tons of foodstuffs a day. While local \
+	villages and nobles have their own food production centers, mainly aquaculture farms which run outside of the aegis of the Fishing League, the vast majority of food produced within the Hegemony \
+	was produced by the Fishing League, whether it be on Ouerea or Moghes. Following Hephaestus's acquisition of the guild as a subsidiary, the guildsmen and facilities of the Fishing League have played a major role in the \
+	megacorporation's aquacultural expansions on Ouerea - bringing an end to the famine, though some say at the price of the guild's soul."
 	worn_overlay = "fishingleague"
 
 /obj/item/clothing/accessory/poncho/rockstone

html/changelogs/RustingWithYou - scarcitychanges.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "Updates the descriptions of guild mantle items to reflect Hephaestus's new position in the Hegemony."
+  - maptweak: "Disables the Merchants' Guild Freighter due to recent lore developments."

maps/away/ships/hegemony/merchants_guild/merchant_freighter.dm

@@ -4,7 +4,7 @@
 	description = "A freighter flying under the banner of the Izweski Hegemony Merchants' Guild."
 	suffixes = list("ships/hegemony/merchants_guild/merchant_freighter.dmm")
 	ship_cost = 1
-	spawn_weight = 1
+	spawn_weight = 0 //the merchants guild has gone bankrupt, don't spawn this until we figure out how to rework it.
 
 	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/merchants_guild)
 	sectors = list(SECTOR_BADLANDS, SECTOR_UUEOAESA, SECTOR_VALLEY_HALE, SECTOR_CORP_ZONE, SECTOR_TAU_CETI)

maps/away/ships/hegemony/miners_guild/miners_guild_station.dm

@@ -14,7 +14,7 @@
 
 /obj/effect/overmap/visitable/sector/miners_guild_station
 	name = "Miners' Guild Outpost"
-	desc = "A Kutah-class mining station, owned and operated by the Hegemony Miners' Guild. These stations are usually temporary, constructed in mineral-rich systems and operated until \
+	desc = "A Kutah-class mining station, owned and operated by the Hegemony Miners' Guild, now a proud subsidiary of Hephaestus Industries. These stations are usually temporary, constructed in mineral-rich systems and operated until \
 	the local celestial bodies have been stripped of any minerals of value. They have earned a reputation for being slapdash and shoddily-constructed, though this one seems to be in good shape."
 	icon = 'icons/obj/overmap/overmap_stationary.dmi'
 	icon_state = "outpost"
@@ -60,7 +60,7 @@
 /obj/effect/overmap/visitable/ship/landable/miners_guild
 	name = "Miners' Guild Shuttle"
 	class = "IHGV" //Izweski Hegemony Guild Vessel
-	desc = "Commonly used by the Miners’ Guild, Glizkin-class shuttles are short-range mining vessels, designed for persistent mining of celestial bodies. \
+	desc = "Commonly used by the Miners’ Guild, now a proud Hephaestus subsidiary, Glizkin-class shuttles are short-range mining vessels, designed for persistent mining of celestial bodies. \
 	They are viewed by their crews as small, yet reliable and enduring - much like the Tza Prairie folk hero for which they are named. They are usually found attached to larger stations or mining vessels."
 	shuttle = "Miners' Guild Shuttle"
 	icon_state = "shuttle"