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

code/modules/assembly/assembly.dm

@@ -69,7 +69,7 @@
 
 // What the device does when turned on
 /obj/item/device/assembly/proc/activate()
-	if(qdeleted(src) || !secured || (next_activate > world.time))
+	if(QDELETED(src) || !secured || (next_activate > world.time))
 		return FALSE
 	next_activate = world.time + 30
 	return TRUE

code/modules/assembly/flash.dm

@@ -252,7 +252,7 @@
 		else
 			user << "You begin to replace the bulb."
 			if(do_after(user, 20, target = src))
-				if(flash.crit_fail || !flash || qdeleted(flash))
+				if(flash.crit_fail || !flash || QDELETED(flash))
 					return
 				crit_fail = FALSE
 				times_used = 0