From 95cb98e48b98122553f755f306969cd55965ef2a Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 3 Nov 2020 17:04:25 -0500
Subject: [PATCH] MA stuff that is now trapped in an unrelated merge

---
 src/events/scheduled/murderAttempt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/events/scheduled/murderAttempt.js b/src/events/scheduled/murderAttempt.js
index d5bde38bd36..daed121f4a5 100644
--- a/src/events/scheduled/murderAttempt.js
+++ b/src/events/scheduled/murderAttempt.js
@@ -466,7 +466,7 @@ App.Events.murderAttemptFollowup = function(variation, companyName, type) {
 			cashX(1000000, "event");
 			V.menials += 500;
 		} else {
-			r.push("Despite great efforts, the coalition of forces trying to establish a new Free City in the old world finally announces their failure. May the reason be that the old world military still has enough power to stop the establishment of a colony or simple mismanagement by the powers at hand is a topic for debate, but the fact remains that months were wasted on a fruitless war. Luckily you didn't invest too much, so the cost for failure is a meager ${cashFormatColor(40000, true)} and some <span class='reputation dec'>reputation.</span>");
+			r.push(`The coalition of forces you'd joined to establish a new Free City in the old world admitted defeat this week. The target nation-state's military proved to be less decrepit than your allies assumed, and they've fended off the Free Cities' mercenary forces for now. Of course your allies all blame each other for mismanaging the coalition's resources, a debate you have no interest and no stakes in. In the end, this war proved to be a waste of your time. Luckily you didn't invest too much in the war effort, so it only cost you ${cashFormatColor(40000, true)} and some <span class='reputation dec'>reputation.</span>`);
 			cashX(-40000, "event");
 			repX(forceNeg(V.rep / 8), "event");
 		}
-- 
GitLab