From d3504f2e7b57bc1f1e8c9dc5e77c0e60b8927743 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 23 Aug 2017 15:46:50 -0500 Subject: [PATCH 1/2] Add a brain damage line from a backstory --- strings/brain_damage_lines.json.rej | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/strings/brain_damage_lines.json.rej b/strings/brain_damage_lines.json.rej index 6d8e1cdb62..da5d21a48b 100644 --- a/strings/brain_damage_lines.json.rej +++ b/strings/brain_damage_lines.json.rej @@ -1,10 +1,11 @@ diff a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json (rejected hunks) -@@ -131,7 +131,7 @@ - "", - "IS TIS A BUG??", - "SI IST A BUGG/", -- "BUG!!!" -+ "BUG!!!" +@@ -61,7 +61,8 @@ + "@pick(semicolon)N-NYAAAAAA~", + "@pick(bug)", + "@pick(semicolon)wtf??????????? @pick(bug)", +- "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)" ++ "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)", ++ "DON'T EVER TUCH ME", ], - - "semicolon": [ + + "mutations": [ From f7d9c456d77abb08f0773e6859bda7426bc51f03 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 10:08:24 -0700 Subject: [PATCH 2/2] kek --- strings/brain_damage_lines.json | 1 + strings/brain_damage_lines.json.rej | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 strings/brain_damage_lines.json.rej diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json index af040d5ba0..5efd3ac9b2 100644 --- a/strings/brain_damage_lines.json +++ b/strings/brain_damage_lines.json @@ -101,6 +101,7 @@ "SINGULO eNGINE 2 DANGER, SOLARS PLS!", "nerf blob!1", "iM NOT A FUWRRYY!!!", + "DON'T EVER TUCH ME", "FOURTEEN INCHES SOFT!!!" ], diff --git a/strings/brain_damage_lines.json.rej b/strings/brain_damage_lines.json.rej deleted file mode 100644 index da5d21a48b..0000000000 --- a/strings/brain_damage_lines.json.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json (rejected hunks) -@@ -61,7 +61,8 @@ - "@pick(semicolon)N-NYAAAAAA~", - "@pick(bug)", - "@pick(semicolon)wtf??????????? @pick(bug)", -- "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)" -+ "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)", -+ "DON'T EVER TUCH ME", - ], - - "mutations": [