From 5e3e8133fbac4abb8b3e58ec2facc9607cd81f32 Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers@gmail.com>
Date: Sun, 3 Apr 2016 15:46:21 +0200
Subject: [PATCH 1/2] Adds proper grammar for the DM language.

---
 .gitmodules                   | 3 +++
 grammars.yml                  | 3 +++
 lib/linguist/languages.yml    | 2 +-
 vendor/grammars/atomic-dreams | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 160000 vendor/grammars/atomic-dreams

diff --git a/.gitmodules b/.gitmodules
index 3a100ec3..233fdc44 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -701,3 +701,6 @@
 [submodule "vendor/grammars/nix"]
 	path = vendor/grammars/nix
 	url = https://github.com/wmertens/sublime-nix
+[submodule "vendor/grammars/atomic-dreams"]
+	path = vendor/grammars/atomic-dreams
+	url = https://github.com/PJB3005/atomic-dreams
diff --git a/grammars.yml b/grammars.yml
index 2ef2b282..326d7b58 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -183,6 +183,9 @@ vendor/grammars/atom-language-stan/:
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
+vendor/grammars/atomic-dreams/:
+- source.dm
+- source.dmf
 vendor/grammars/ats:
 - source.ats
 vendor/grammars/awk-sublime:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index d2f2259a..4ce22c97 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -772,7 +772,7 @@ DM:
   - .dm
   aliases:
   - byond
-  tm_scope: source.c++
+  tm_scope: source.dm
   ace_mode: c_cpp
 
 DNS Zone:
diff --git a/vendor/grammars/atomic-dreams b/vendor/grammars/atomic-dreams
new file mode 160000
index 00000000..4384f94f
--- /dev/null
+++ b/vendor/grammars/atomic-dreams
@@ -0,0 +1 @@
+Subproject commit 4384f94ff33004281d13353369a0478e28a2f479

From a91705724d84379337db65ce47f59ad4221072c4 Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@github.com>
Date: Sun, 3 Apr 2016 07:48:59 -0600
Subject: [PATCH 2/2] Adding atomic dreams license

---
 vendor/licenses/grammar/atomic-dreams.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 vendor/licenses/grammar/atomic-dreams.txt

diff --git a/vendor/licenses/grammar/atomic-dreams.txt b/vendor/licenses/grammar/atomic-dreams.txt
new file mode 100644
index 00000000..3905f737
--- /dev/null
+++ b/vendor/licenses/grammar/atomic-dreams.txt
@@ -0,0 +1,14 @@
+---
+type: grammar
+name: atomic-dreams
+license: mit
+curated: true
+---
+
+Copyright (c) 2016 Pieter-Jan Briers, Kyle J. Kemp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.