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

_maps/map_files/MetaStation/MetaStation.dmm

@@ -1,5 +1,5 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-//Model dictionary trimmed on: 31-01-2017 23:17 (UTC)
+//Model dictionary trimmed on: 02-02-2017 02:51 (UTC)
 "aaa" = (
 /turf/open/space,
 /area/space)
@@ -3906,6 +3906,8 @@
 	},
 /obj/structure/rack,
 /obj/item/weapon/storage/fancy/donut_box,
+/obj/item/weapon/gun/energy/e_gun/dragnet,
+/obj/item/weapon/gun/energy/e_gun/dragnet,
 /turf/open/floor/plasteel/vault{
 	dir = 1
 	},
@@ -40955,8 +40957,6 @@
 /obj/item/stack/cable_coil/random,
 /obj/item/stack/cable_coil/random,
 /obj/item/stack/cable_coil/random,
-/obj/item/weapon/paper_bin/construction,
-/obj/item/stack/cable_coil,
 /turf/open/floor/plasteel,
 /area/storage/art)
 "bre" = (
@@ -54885,7 +54885,7 @@
 	},
 /area/crew_quarters/kitchen)
 "bOV" = (
-/obj/machinery/holopad,
+/obj/machinery/deepfryer,
 /turf/open/floor/plasteel/cafeteria{
 	dir = 5
 	},
@@ -73083,7 +73083,6 @@
 	},
 /area/crew_quarters/hor)
 "ctb" = (
-/obj/machinery/computer/aifixer,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -73095,6 +73094,7 @@
 	pixel_x = 0;
 	pixel_y = 30
 	},
+/obj/machinery/modular_computer/console/preset/research,
 /turf/open/floor/plasteel/cafeteria{
 	dir = 5
 	},
@@ -94427,6 +94427,23 @@
 /obj/structure/disposaloutlet,
 /turf/open/floor/plating/airless,
 /area/toxins/xenobiology)
+"ddD" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 8;
+	initialize_directions = 11
+	},
+/obj/machinery/deepfryer,
+/turf/open/floor/plasteel/cafeteria{
+	dir = 5
+	},
+/area/crew_quarters/kitchen)
+"ddE" = (
+/obj/effect/landmark/start{
+	name = "Cook"
+	},
+/obj/machinery/holopad,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
 
 (1,1,1) = {"
 aaa
@@ -126198,7 +126215,7 @@ coe
 cpq
 cqJ
 crP
-cta
+cuN
 ctR
 cuN
 cvR
@@ -128230,7 +128247,7 @@ bHb
 bMP
 bKg
 bLL
-bNz
+ddD
 bOT
 bQC
 bLK
@@ -129002,7 +129019,7 @@ bBT
 bKj
 bLN
 bLK
-bOR
+ddE
 bQF
 bNz
 bSV