From 2a180421600e795ef95bfd77219e6220a6d7a6c9 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Sat, 22 Apr 2017 21:41:28 -0500
Subject: [PATCH] Grammar edit for flashbangs tip

---
 config/sillytips.txt |  2 +-
 tgstation.dme.rej    | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 tgstation.dme.rej

diff --git a/config/sillytips.txt b/config/sillytips.txt
index 2652414ece..a3d619ec7c 100644
--- a/config/sillytips.txt
+++ b/config/sillytips.txt
@@ -25,6 +25,6 @@ Plenty of things that aren't traditionally considered weapons can still be used
 DEATH IS IMMINENT!
 This game is older than most of the people playing it.
 Do not go gentle into that good night.
-Flash bangs can weaken blob tiles, allowing for you and the crew to easily destroy them.
+Flashbangs can weaken blob tiles, allowing for you and the crew to easily destroy them.
 Just the tip?
 Some people are unable to read text on a game where half of it is based on text.
\ No newline at end of file
diff --git a/tgstation.dme.rej b/tgstation.dme.rej
new file mode 100644
index 0000000000..320974d163
--- /dev/null
+++ b/tgstation.dme.rej
@@ -0,0 +1,11 @@
+diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
+@@ -656,8 +656,8 @@
+ #include "code\game\objects\effects\mines.dm"
+ #include "code\game\objects\effects\misc.dm"
+ #include "code\game\objects\effects\overlays.dm"
+-#include "code\game\objects\effects\proximity.dm"
+ #include "code\game\objects\effects\portals.dm"
++#include "code\game\objects\effects\proximity.dm"
+ #include "code\game\objects\effects\spiders.dm"
+ #include "code\game\objects\effects\step_triggers.dm"
+ #include "code\game\objects\effects\wanted_poster.dm"