Merge branch 'master' into development

code/game/atoms_movable.dm

@@ -292,7 +292,7 @@ var/list/accessible_z_levels = list("8" = 5, "9" = 10, "7" = 15, "2" = 60)
 		moved_event.raise_event(src, old_loc, loc)
 
 		// Parallax.
-		update_client_hook()
+		update_client_hook(loc)
 
 		// Lighting.
 		var/datum/light_source/L

code/game/machinery/cryopod.dm

@@ -345,8 +345,9 @@
 		var/mob/M = G:affecting
 
 		if(M.client)
+			var/originalloc = M.loc
 			if(alert(M,"Would you like to enter long-term storage?",,"Yes","No") == "Yes")
-				if(!M || !G || !G:affecting) return
+				if(!M || !G || !G:affecting || M.loc != originalloc) return
 				willing = 1
 		else
 			willing = 1
@@ -400,8 +401,9 @@
 	var/willing = null //We don't want to allow people to be forced into despawning.
 
 	if(L.client)
+		var/originalloc = L.loc
 		if(alert(L,"Would you like to enter stasis?",,"Yes","No") == "Yes")
-			if(!L) return
+			if(!L || L.loc != originalloc) return
 			willing = 1
 	else
 		willing = 1

code/game/objects/items/crayons.dm

@@ -68,7 +68,12 @@
 /obj/item/weapon/pen/crayon/afterattack(atom/target, mob/user as mob, proximity)
 	if(!proximity) return
 	if(istype(target,/turf/simulated/floor))
+		var/originaloc = user.loc
 		var/drawtype = input("Choose what you'd like to draw.", "Crayon scribbles") in list("graffiti","rune","letter","arrow")
+		if (user.loc != originaloc)
+			user << "<span class='notice'>You moved!</span>"
+			return
+
 		switch(drawtype)
 			if("letter")
 				drawtype = input("Choose the letter.", "Crayon scribbles") in list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")

code/modules/lighting/lighting_source_novis.dm

@@ -163,3 +163,39 @@
 
 /datum/light_source/novis/update_angle()
 	return
+
+#define QUEUE_UPDATE(level) \
+	var/_should_update = needs_update == LIGHTING_NO_UPDATE; \
+	if (needs_update < level) {        \
+		needs_update = level;          \
+	}                                  \
+	if (_should_update) {              \
+		SSlighting.light_queue += src; \
+	}
+
+/datum/light_source/novis/update(atom/new_top_atom)
+	// This top atom is different.
+	if (new_top_atom && new_top_atom != top_atom)
+		if(top_atom != source_atom) // Remove ourselves from the light sources of that top atom.
+			LAZYREMOVE(top_atom.light_sources, src)
+
+		top_atom = new_top_atom
+
+		if (top_atom != source_atom)
+			if(!top_atom.light_sources)
+				top_atom.light_sources = list()
+
+			top_atom.light_sources += src // Add ourselves to the light sources of our new top atom.
+
+	//L_PROF(source_atom, "source_update")
+
+	QUEUE_UPDATE(LIGHTING_CHECK_UPDATE)
+
+/datum/light_source/novis/force_update()
+	QUEUE_UPDATE(LIGHTING_FORCE_UPDATE)
+
+/datum/light_source/novis/vis_update()
+	QUEUE_UPDATE(LIGHTING_VIS_UPDATE)
+
+
+#undef QUEUE_UPDATE

code/modules/mining/mine_items.dm

@@ -1082,7 +1082,6 @@ var/list/total_extraction_beacons = list()
 	force = 10
 	throwforce = 5
 	origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 3)
-	var/currently_pulling = FALSE
 
 /obj/item/weapon/oremagnet/attack_self(mob/user)
 	if (use_check(user))
@@ -1092,22 +1091,13 @@ var/list/total_extraction_beacons = list()
 	toggle_on(user)
 
 /obj/item/weapon/oremagnet/process()
-	set waitfor = FALSE
-
-	if (currently_pulling)
-		return
-
-	currently_pulling = TRUE
-
-	for(var/obj/item/weapon/ore/O in oview(7,src.loc))
+	for(var/obj/item/weapon/ore/O in oview(7, loc))
 		if(prob(80))
 			step_to(O, src.loc, 0)
 
-		if (TICK_CHECK && QDELING(src))
+		if (TICK_CHECK)
 			return
 
-	currently_pulling = FALSE
-
 /obj/item/weapon/oremagnet/proc/toggle_on(mob/user)
 	if (!isprocessing)
 		START_PROCESSING(SSprocessing, src)
@@ -1141,6 +1131,9 @@ var/list/total_extraction_beacons = list()
 		single_spark(O.loc)
 		do_teleport(O, user, 0)
 
+		if (TICK_CHECK)
+			return
+
 /******************************Sculpting*******************************/
 /obj/item/weapon/autochisel
 	name = "auto-chisel"