TG sync Sunday (#201)

* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping

tools/mapmerge/map_helpers.py

@@ -253,6 +253,9 @@ def get_map_raw_text(mapfile):
         return reading.read()
 
 def parse_map(map_raw_text): #still does not support more than one z level per file, but should parse any format
+    in_comment_line = False
+    comment_trigger = False
+
     in_quote_block = False
     in_key_block = False
     in_data_block = False
@@ -289,9 +292,26 @@ def parse_map(map_raw_text): #still does not support more than one z level per f
 
         if not in_map_block:
 
-            if char == "\n" or char == "\t":
+            if char == "\n":
+                in_comment_line = False
+                comment_trigger = False
                 continue
 
+            if in_comment_line:
+                continue
+
+            if char == "\t":
+                continue
+
+            if char == "/" and not in_quote_block:
+                if comment_trigger:
+                    in_comment_line = True
+                    continue
+                else:
+                    comment_trigger = True
+            else:
+                comment_trigger = False
+            
             if in_data_block:
 
                 if in_varedit_block:

tools/mapmerge/path_update.py

@@ -17,10 +17,10 @@ def tgm_check(map_file):
 def save_map(map_data,filepath,tgm=False):
     map_data['dictionary'] = map_helpers.sort_dictionary(map_data['dictionary'])
     if tgm:
-        map_helpers.write_dictionary_tgm(filepath, map_data['dictionary'])
+        map_helpers.write_dictionary_tgm(filepath, map_data['dictionary'],None)
         map_helpers.write_grid_coord_small(filepath, map_data['grid'], map_data['maxx'], map_data['maxy'])
     else:
-        map_helpers.write_dictionary(filepath, map_data['dictionary'])
+        map_helpers.write_dictionary(filepath, map_data['dictionary'],None)
         map_helpers.write_grid(filepath, map_data['grid'], map_data['maxx'], map_data['maxy'])
 
 def update_all_maps(update_file=None, update_string=None, map_directory=None, verbose=False):