shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #521 from Citadel-Station-13/upstream-merge-26376

Browse Source 
[MIRROR] Grammar edit for flashbangs tip
This commit is contained in:
LetterJay
2017-04-25 01:10:58 -05:00
committed by GitHub
parent a06c6a2994 2a18042160
commit b9ab919c22
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/sillytips.txt
+1 -1
View File
@@ -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.
tgstation.dme.rej
+11
View File
@@ -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"