Give event news proper headlines (#29680)

* Give event news proper headlines

* extra exclamation mark

code/modules/economy/economy_events/economy_events.dm

@@ -58,42 +58,61 @@
 
 	//see if our location has custom event info for this event
 	newMsg.body = affected_dest.get_custom_eventstring()
+	newMsg.title = affected_dest.get_custom_eventtitle() || "[newMsg.author]: "
 	if(!newMsg.body)
 		switch(event_type)
 			if(RANDOM_STORY_RIOTS)
+				newMsg.title += "Riots on [affected_dest.name]"
 				newMsg.body = "[pick("Riots have","Unrest has")] broken out on planet [affected_dest.name]. Authorities call for calm, as [pick("various parties","rebellious elements","peacekeeping forces","\'REDACTED\'")] begin stockpiling weaponry and armour. Meanwhile, food and mineral prices are dropping as local industries attempt empty their stocks in expectation of looting."
 			if(RANDOM_STORY_WILD_ANIMAL_ATTACK)
+				newMsg.title += "Animal attack on [affected_dest.name]"
 				newMsg.body = "Local [pick("wildlife","animal life","fauna")] on planet [affected_dest.name] has been increasing in aggression and raiding outlying settlements for food. Big game hunters have been called in to help alleviate the problem, but numerous injuries have already occurred."
 			if(RANDOM_STORY_INDUSTRIAL_ACCIDENT)
+				newMsg.title += "Industrial accident on [affected_dest.name]"
 				newMsg.body = "[pick("An industrial accident","A smelting accident","A malfunction","A malfunctioning piece of machinery","Negligent maintenance","A coolant leak","A ruptured conduit")] at a [pick("factory","installation","power plant","dockyards")] on [affected_dest.name] resulted in severe structural damage and numerous injuries. Repairs are ongoing."
 			if(RANDOM_STORY_BIOHAZARD_OUTBREAK)
+				newMsg.title += "Viral outbreak on [affected_dest.name]"
 				newMsg.body = "[pick("A \'REDACTED\'","A biohazard","An outbreak","A virus")] on [affected_dest.name] has resulted in quarantine, stopping much shipping in the area. Although the quarantine is now lifted, authorities are calling for deliveries of medical supplies to treat the infected, and gas to replace contaminated stocks."
 			if(RANDOM_STORY_PIRATES)
+				newMsg.title += "Attack on [affected_dest.name]"
 				newMsg.body = "[pick("Pirates","Criminal elements","A [pick("Syndicate","Donk Co.","Waffle Co.","\'REDACTED\'")] strike force")] have [pick("raided","blockaded","attempted to blackmail","attacked")] [affected_dest.name] today. Security has been tightened, but many valuable minerals were taken."
 			if(RANDOM_STORY_CORPORATE_ATTACK)
+				newMsg.title += "Corporate attack on [affected_dest.name]"
 				newMsg.body = "A small [pick("pirate","Cybersun Industries","Gorlex Marauders","Syndicate")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident."
 			if(RANDOM_STORY_ALIEN_RAIDERS)
 				if(prob(20))
+					newMsg.title += "Raid on [affected_dest.name]"
 					newMsg.body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. Nanotrasen authorities are standing by to counter attempts at bio-terrorism."
 				else
+					newMsg.title += "Alien raid on [affected_dest.name]"
 					newMsg.body = "[pick("The alien species designated \'United Exolitics\'","The alien species designated \'REDACTED\'","An unknown alien species")] have raided [affected_dest.name] today, stealing wildlife, farm animals, medical research materials and kidnapping civilians. It seems they desire to learn more about us, so the Navy will be standing by to accommodate them next time they try."
 			if(RANDOM_STORY_AI_LIBERATION)
+				newMsg.title += "Technoterrorist attack on [affected_dest.name]"
 				newMsg.body = "A [pick("\'REDACTED\' was detected on","S.E.L.F operative infiltrated","malignant computer virus was detected on","rogue [pick("slicer","hacker")] was apprehended on")] [affected_dest.name] today, and managed to infect [pick("\'REDACTED\'","a sentient sub-system","a class one AI","a sentient defense installation")] before it could be stopped. Many lives were lost as it systematically begin murdering civilians, and considerable work must be done to repair the affected areas."
 			if(RANDOM_STORY_MOURNING)
-				newMsg.body = "[pick("The popular","The well-liked","The eminent","The well-known")] [pick("professor","entertainer","singer","researcher","public servant","administrator","ship captain","\'REDACTED\'")], [pick( random_name(pick(MALE,FEMALE)), 40; "\'REDACTED\'" )] has [pick("passed away","committed suicide","been murdered","died in a freakish accident")] on [affected_dest.name] today. The entire planet is in mourning, and prices have dropped for industrial goods as worker morale drops."
+				var/job = pick("professor","entertainer","singer","researcher","public servant","administrator","ship captain","\'REDACTED\'")
+				var/age = rand(27, 100)
+				newMsg.title += "Famous [job] dies aged [age]"
+				newMsg.body = "[pick("The popular","The well-liked","The eminent","The well-known")] [job], [pick( random_name(pick(MALE,FEMALE)), 40; "\'REDACTED\'" )] has [pick("passed away","committed suicide","been murdered","died in a freakish accident")] on [affected_dest.name] today. The entire planet is in mourning, and prices have dropped for industrial goods as worker morale drops."
 			if(RANDOM_STORY_CULT_CELL_REVEALED)
+				newMsg.title += "Cult cell revealed on [affected_dest.name]"
 				newMsg.body = "A [pick("dastardly","blood-thirsty","villainous","crazed")] cult of [pick("The Elder Gods","Nar'sie","an apocalyptic sect","\'REDACTED\'")] has [pick("been discovered","been revealed","revealed themselves","gone public")] on [affected_dest.name] earlier today. Public morale has been shaken due to [pick("certain","several","one or two")] [pick("high-profile","well known","popular")] individuals [pick("performing \'REDACTED\' acts","claiming allegiance to the cult","swearing loyalty to the cult leader","promising to aid to the cult")] before those involved could be brought to justice. The editor reminds all personnel that supernatural myths will not be tolerated on Nanotrasen facilities."
 			if(RANDOM_STORY_SECURITY_BREACH)
+				newMsg.title += "Security breach on [affected_dest.name]"
 				newMsg.body = "There was [pick("a security breach in","an unauthorized access in","an attempted theft in","an anarchist attack in","violent sabotage of")] a [pick("high-security","restricted access","classified","\'REDACTED\'")] [pick("\'REDACTED\'","section","zone","area")] this morning. Security was tightened on [affected_dest.name] after the incident, and the editor reassures all Nanotrasen personnel that such lapses are rare."
 			if(RANDOM_STORY_ANIMAL_RIGHTS_RAID)
+				newMsg.title += "Animal rights raid on [affected_dest.name]"
 				newMsg.body = "[pick("Militant animal rights activists","Members of the terrorist group Animal Rights Consortium","Members of the terrorist group \'REDACTED\'")] have [pick("launched a campaign of terror","unleashed a swathe of destruction","raided farms and pastures","forced entry to \'REDACTED\'")] on [affected_dest.name] earlier today, freeing numerous [pick("farm animals","animals","\'REDACTED\'")]. Prices for tame and breeding animals have spiked as a result."
 			if(RANDOM_STORY_FESTIVAL)
+				newMsg.title += "Festival on [affected_dest.name]"
 				newMsg.body = "A [pick("festival","week long celebration","day of revelry","planet-wide holiday")] has been declared on [affected_dest.name] by [pick("Governor","Commissioner","General","Commandant","Administrator")] [random_name(pick(MALE,FEMALE))] to celebrate [pick("the birth of their [pick("son","daughter")]","coming of age of their [pick("son","daughter")]","the pacification of rogue military cell","the apprehension of a violent criminal who had been terrorizing the planet")]. Massive stocks of food and meat have been bought driving up prices across the planet."
+			else
+				newMsg.title = null // let newscaster autogenerate a title
 
 	GLOB.news_network.get_channel_by_name("Nyx Daily")?.add_message(newMsg)
 	for(var/nc in GLOB.allNewscasters)
 		var/obj/machinery/newscaster/NC = nc
-		NC.alert_news("Nyx Daily")
+		NC.alert_news(newMsg.title)
 
 /datum/event/economic_event/end()
 	for(var/good_type in dearer_goods)

code/modules/economy/economy_events/economy_events_mundane.dm

@@ -15,19 +15,21 @@
 	var/datum/feed_message/newMsg = new /datum/feed_message
 	newMsg.author = "Nyx Daily"
 	newMsg.admin_locked = TRUE
+	newMsg.title = "[newMsg.author]: "
 
 	//see if our location has custom event info for this event
 	newMsg.body = affected_dest.get_custom_eventstring()
+	newMsg.title = affected_dest.get_custom_eventtitle()
 	if(!newMsg.body)
-		newMsg.body = ""
-
 		switch(event_type)
 			if(RANDOM_STORY_RESEARCH_BREAKTHROUGH)
+				newMsg.title += "Research breakthrough at [affected_dest.name]"
 				newMsg.body = "A major breakthrough in the field of [pick("plasma research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \
 				was announced [pick("yesterday","a few days ago","last week","earlier this month")] by a private firm on [affected_dest.name]. \
 				Nanotrasen declined to comment as to whether this could impinge on profits."
 
 			if(RANDOM_STORY_ELECTION)
+				newMsg.title += "Election on [affected_dest.name]"
 				newMsg.body = "The pre-selection of an additional candidates was announced for the upcoming [pick("supervisors council","advisory board","governorship","board of inquisitors")] \
 				election on [affected_dest.name] was announced earlier today, \
 				[pick("media mogul","web celebrity", "industry titan", "superstar", "famed chef", "popular gardener", "ex-army officer", "multi-billionaire")] \
@@ -35,7 +37,9 @@
 				"I will maintain Nanotrasen's record profits","I believe in our future","We must return to our moral core","Just like... chill out dudes")]'."
 
 			if(RANDOM_STORY_RESIGNATION)
-				newMsg.body = "Nanotrasen regretfully announces the resignation of [pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")] [random_name(pick(MALE,FEMALE))]."
+				var/job = pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")
+				newMsg.title += "[job] retires"
+				newMsg.body = "Nanotrasen regretfully announces the resignation of [job] [random_name(pick(MALE,FEMALE))]."
 				if(prob(25))
 					var/locstring = pick("Segunda","Salusa","Cepheus","Andromeda","Gruis","Corona","Aquila","Asellus") + " " + pick("I","II","III","IV","V","VI","VII","VIII")
 					newMsg.body += " In a ceremony on [affected_dest.name] this afternoon, they will be awarded the \
@@ -54,43 +58,50 @@
 					newMsg.body += " Administration Aerospace wishes them the best of luck in their retirement ceremony on [affected_dest.name]."
 
 			if(RANDOM_STORY_CELEBRITY_DEATH)
-				newMsg.body = "It is with regret today that we announce the sudden passing of the "
+				var/job = "Doctor"
 				if(prob(33))
-					newMsg.body += "[pick("distinguished","decorated","veteran","highly respected")] \
+					job = "[pick("distinguished","decorated","veteran","highly respected")] \
 					[pick("Ship's Captain","Vice Admiral","Colonel","Lieutenant Colonel")] "
 				else if(prob(50))
-					newMsg.body += "[pick("award-winning","popular","highly respected","trend-setting")] \
+					job = "[pick("award-winning","popular","highly respected","trend-setting")] \
 					[pick("comedian","singer/songwright","artist","playwright","TV personality","model")] "
 				else
-					newMsg.body += "[pick("successful","highly respected","ingenious","esteemed")] \
+					job = "[pick("successful","highly respected","ingenious","esteemed")] \
 					[pick("academic","Professor","Doctor","Scientist")] "
 
-				newMsg.body += "[random_name(pick(MALE,FEMALE))] on [affected_dest.name] [pick("last week","yesterday","this morning","two days ago","three days ago")]\
+				newMsg.title += "Famous [job] dies on [affected_dest.name]"
+				newMsg.body = "It is with regret today that we announce the sudden passing of the "
+				newMsg.body += "[job] [random_name(pick(MALE,FEMALE))] on [affected_dest.name] [pick("last week","yesterday","this morning","two days ago","three days ago")]\
 				[pick(". Assassination is suspected, but the perpetrators have not yet been brought to justice",\
 				" due to Syndicate infiltrators (since captured)",\
 				" during an industrial accident",\
 				" due to [pick("heart failure","kidney failure","liver failure","brain hemorrhage")]")]"
 
 			if(RANDOM_STORY_BARGAINS)
-				newMsg.body += "RANDOM_STORY_BARGAINS! RANDOM_STORY_BARGAINS! RANDOM_STORY_BARGAINS! Commerce Control on [affected_dest.name] wants you to know that everything must go! Across all retail centres, \
+				newMsg.title += "Bargains"
+				newMsg.body += "Commerce Control on [affected_dest.name] wants you to know that everything must go! Across all retail centres, \
 				all goods are being slashed, and all retailors are onboard - so come on over for the \[shopping\] time of your life."
 
 			if(RANDOM_STORY_SONG_DEBUT)
-				newMsg.body += "[pick("Singer","Singer/songwriter","Saxophonist","Pianist","Guitarist","TV personality","Star")] [random_name(pick(MALE,FEMALE))] \
+				var/job = pick("Singer","Singer/songwriter","Saxophonist","Pianist","Guitarist","TV personality","Star")
+				newMsg.title += "[job] Debuts"
+				newMsg.body += "[job] [random_name(pick(MALE,FEMALE))] \
 				announced the debut of their new [pick("single","album","EP","label")] '[pick("Everyone's","Look at the","Baby don't eye those","All of those","Dirty nasty")] \
 				[pick("roses","three stars","starships","nanobots","cyborgs","Skrell","Sren'darr")] \
 				[pick("on Venus","on Reade","on Moghes","in my hand","slip through my fingers","die for you","sing your heart out","fly away")]' \
 				with [pick("pre-purchases available","a release tour","cover signings","a launch concert")] on [affected_dest.name]."
 
 			if(RANDOM_STORY_MOVIE_RELEASE)
-				newMsg.body += "From the [pick("desk","home town","homeworld","mind")] of [pick("acclaimed","award-winning","popular","stellar")] \
-				[pick("playwright","author","director","actor","TV star")] [random_name(pick(MALE,FEMALE))] comes the latest sensation: '\
-				[pick("Deadly","The last","Lost","Dead")] [pick("Starships","Warriors","outcasts","Tajarans","Unathi","Skrell")] \
+				var/movie_name = "[pick("Deadly","The last","Lost","Dead")] [pick("Starships","Warriors","outcasts","Tajarans","Unathi","Skrell")] \
 				[pick("of","from","raid","go hunting on","visit","ravage","pillage","destroy")] \
-				[pick("Moghes","Earth","Biesel","Ahdomai","S'randarr","the Void","the Edge of Space")]'.\
-				. Own it on webcast today, or visit the galactic premier on [affected_dest.name]!"
+				[pick("Moghes","Earth","Biesel","Ahdomai","S'randarr","the Void","the Edge of Space")]'."
+				newMsg.title += "Now in Theaters: [movie_name]"
+				newMsg.body += "From the [pick("desk","home town","homeworld","mind")] of [pick("acclaimed","award-winning","popular","stellar")] \
+				[pick("playwright","author","director","actor","TV star")] [random_name(pick(MALE,FEMALE))] comes the latest sensation: [movie_name]. \
+				Own it on webcast today, or visit the galactic premier on [affected_dest.name]!"
 
 			if(RANDOM_STORY_BIG_GAME_HUNTERS)
+				newMsg.title += "Unusual specimen on [affected_dest.name]"
 				newMsg.body += "Game hunters on [affected_dest.name] "
 				if(prob(33))
 					newMsg.body += "were surprised when an unusual species experts have since identified as \
@@ -104,7 +115,9 @@
 					[pick("today","yesterday","last week")]. Speculators suggest they may be tipped to break several records."
 
 			if(RANDOM_STORY_GOSSIP)
-				newMsg.body += "[pick("TV host","Webcast personality","Superstar","Model","Actor","Singer")] [random_name(pick(MALE,FEMALE))] "
+				var/job = pick("TV host","Webcast personality","Superstar","Model","Actor","Singer")
+				newMsg.title += "[job] Makes Big Announcement"
+				newMsg.body += "[job] [random_name(pick(MALE,FEMALE))] "
 				if(prob(33))
 					newMsg.body += "and their partner announced the birth of their [pick("first","second","third")] child on [affected_dest.name] early this morning. \
 					Doctors say the child is well, and the parents are considering "
@@ -121,15 +134,17 @@
 					newMsg.body += "[pick("unkind comments by an ex","rumours started by jealous friends",\
 					"the decision to be dropped by a major sponsor","a disastrous interview on Nyx Tonight")]."
 			if(RANDOM_STORY_TOURISM)
+				newMsg.title += "Tourists flock to [affected_dest.name]"
 				newMsg.body += "Tourists are flocking to [affected_dest.name] after the surprise announcement of [pick("major shopping bargains by a wily retailer",\
 				"a huge new ARG by a popular entertainment company","a secret tour by popular artiste [random_name(pick(MALE,FEMALE))]")]. \
 				Nyx Daily is offering discount tickets for two to see [random_name(pick(MALE,FEMALE))] live in return for eyewitness reports and up to the minute coverage."
-
+			else
+				newMsg.body = ""
 
 	GLOB.news_network.get_channel_by_name("Nyx Daily")?.add_message(newMsg)
 	for(var/nc in GLOB.allNewscasters)
 		var/obj/machinery/newscaster/NC = nc
-		NC.alert_news("Nyx Daily")
+		NC.alert_news(newMsg.title)
 
 /datum/event/trivial_news
 	endWhen = 10

code/modules/economy/economy_events/economy_trade_destinations.dm

@@ -16,6 +16,9 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
 /datum/trade_destination/proc/get_custom_eventstring(event_type)
 	return null
 
+/datum/trade_destination/proc/get_custom_eventtitle(event_type)
+	return null
+
 //distance is measured in AU and co-relates to travel time
 /datum/trade_destination/centcomm
 	name = "CentComm"
@@ -41,6 +44,11 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
 		[pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. Nanotrasen is expected to announce a co-exploitation deal within the fortnight."
 	return null
 
+/datum/trade_destination/anansi/get_custom_eventtitle(event_type)
+	if(event_type == RANDOM_STORY_RESEARCH_BREAKTHROUGH)
+		return "Major Breakthrough on NSS Anansi"
+	return null
+
 /datum/trade_destination/icarus
 	name = "NMV Icarus"
 	description = "Corvette assigned to patrol the station's local space."
@@ -64,6 +72,11 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
 		[pick("plasma research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. Nanotrasen is expected to announce a co-exploitation deal within the fortnight."
 	return null
 
+/datum/trade_destination/redolant/get_custom_eventtitle(event_type)
+	if(event_type == RANDOM_STORY_RESEARCH_BREAKTHROUGH)
+		return "Major Breakthrough on OAV Redolant"
+	return null
+
 /datum/trade_destination/beltway
 	name = "Beltway mining chain"
 	description = "A co-operative effort between Beltway and Nanotrasen to exploit the rich outer asteroid belt of the Tau Ceti system."