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/game/objects/structures/false_walls.dm

@@ -51,7 +51,7 @@
 	if(density)
 		do_the_flick()
 		sleep(5)
-		if(!qdeleted(src))
+		if(!QDELETED(src))
 			density = 0
 			SetOpacity(0)
 			update_icon()
@@ -63,7 +63,7 @@
 		do_the_flick()
 		density = 1
 		sleep(5)
-		if(!qdeleted(src))
+		if(!QDELETED(src))
 			SetOpacity(1)
 			update_icon()
 	air_update_turf(1)

code/game/objects/structures/grille.dm

@@ -27,7 +27,15 @@
 
 /obj/structure/grille/Bumped(atom/user)
 	if(ismob(user))
-		shock(user, 70)
+		var/tile_density = FALSE
+		for(var/atom/movable/AM in get_turf(src))
+			if(AM == src)
+				continue
+			if(AM.density && AM.layer >= layer)
+				tile_density = TRUE
+				break
+		if(!tile_density)
+			shock(user, 70)
 
 
 /obj/structure/grille/attack_paw(mob/user)

code/game/objects/structures/kitchen_spike.dm

@@ -79,6 +79,8 @@
 				return
 			if(L.buckled)
 				return
+			if(user.pulling != L)
+				return
 			playsound(src.loc, "sound/effects/splat.ogg", 25, 1)
 			L.visible_message("<span class='danger'>[user] slams [L] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
 			L.loc = src.loc

code/game/objects/structures/morgue.dm

@@ -218,7 +218,7 @@ var/global/list/crematoriums = new/list()
 
 		new /obj/effect/decal/cleanable/ash(src)
 		sleep(30)
-		if(!qdeleted(src))
+		if(!QDELETED(src))
 			locked = 0
 			update_icon()
 			playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people

code/game/objects/structures/transit_tubes/station.dm

@@ -146,7 +146,7 @@
 		open_animation()
 		sleep(OPEN_DURATION + 2)
 		pod_moving = 0
-		if(!qdeleted(pod))
+		if(!QDELETED(pod))
 			pod.air_contents.share(loc.return_air()) //mix the pod's gas mixture with the tile it's on
 
 /obj/structure/transit_tube/station/init_tube_dirs()

code/game/objects/structures/transit_tubes/transit_tube_construction.dm

@@ -68,7 +68,7 @@
 		add_fingerprint(user)
 		playsound(src.loc, I.usesound, 50, 1)
 		if(do_after(user, 40*I.toolspeed, target = src))
-			if(qdeleted(src))
+			if(QDELETED(src))
 				return
 			user << "<span class='notice'>You attach the [name].</span>"
 			var/obj/structure/transit_tube/R = new build_type(loc, dir)

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -54,7 +54,7 @@
 
 /obj/structure/transit_tube_pod/ex_act(severity, target)
 	..()
-	if(!qdeleted(src))
+	if(!QDELETED(src))
 		empty_pod()
 
 /obj/structure/transit_tube_pod/contents_explosion(severity, target)

code/game/objects/structures/window.dm

@@ -190,7 +190,7 @@
 			playsound(loc, I.usesound, 75, 1)
 			user << "<span class='notice'> You begin to disassemble [src]...</span>"
 			if(do_after(user, 40*I.toolspeed, target = src))
-				if(qdeleted(src))
+				if(QDELETED(src))
 					return
 
 				var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount)
@@ -233,7 +233,7 @@
 
 
 /obj/structure/window/deconstruct(disassembled = TRUE)
-	if(qdeleted(src))
+	if(QDELETED(src))
 		return
 	if(!disassembled)
 		playsound(src, "shatter", 70, 1)
@@ -335,7 +335,7 @@
 
 //merges adjacent full-tile windows into one
 /obj/structure/window/update_icon()
-	if(!qdeleted(src))
+	if(!QDELETED(src))
 		if(!fulltile)
 			return