Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494

[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -123,10 +123,9 @@
 	if(glow_type)
 		glow = new glow_type(get_turf(src))
 		animate(glow, alpha = 255, time = convert_time)
-	var/I = 0
-	while(I < convert_time && get_turf(L) == get_turf(src))
-		I++
-		sleep(1)
+	var/end_time = world.time+convert_time
+	while(world.time < end_time && get_turf(L) == get_turf(src))
+		stoplag(1)
 	if(get_turf(L) != get_turf(src))
 		if(glow)
 			qdel(glow)

code/game/gamemodes/clock_cult/clock_scripture.dm

@@ -319,7 +319,7 @@ Applications: 8 servants, 3 caches, and 100 CV
 				qdel(progbar)
 			else
 				progbar.update(end_time - world.time)
-		sleep(1)
+		stoplag(1)
 	if(slab)
 		if(slab.slab_ability)
 			successful = slab.slab_ability.successful

code/game/machinery/dance_machine.dm

@@ -381,7 +381,7 @@
 				initial_matrix = matrix(M.transform)
 				initial_matrix.Translate(-3,0)
 				animate(M, transform = initial_matrix, time = 1, loop = 0)
-		sleep (1)
+		sleep(1)
 	M.lying_fix()
 
 
@@ -428,7 +428,7 @@
 				initial_matrix = matrix(M.transform)
 				initial_matrix.Translate(-3,0)
 				animate(M, transform = initial_matrix, time = 1, loop = 0)
-		sleep (1)
+		sleep(1)
 	M.lying_fix()
 
 

code/game/objects/items.dm

@@ -344,7 +344,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 					var/datum/progressbar/progress = new(user, len, loc)
 
 					while (do_after(user, 10, TRUE, S, FALSE, CALLBACK(src, .proc/handle_mass_pickup, S, things, loc, rejections, progress)))
-						sleep(1)
+						stoplag(1)
 
 					qdel(progress)
 

code/game/objects/items/storage/storage.dm

@@ -88,7 +88,7 @@
 	var/list/things = src_object.contents.Copy()
 	var/datum/progressbar/progress = new(user, things.len, src)
 	while (do_after(user, 10, TRUE, src, FALSE, CALLBACK(src, .proc/handle_mass_item_insertion, things, src_object, user, progress)))
-		sleep(1)
+		stoplag(1)
 	qdel(progress)
 	orient2hud(user)
 	src_object.orient2hud(user)
@@ -489,7 +489,7 @@
 	var/list/things = contents.Copy()
 	var/datum/progressbar/progress = new(usr, things.len, T)
 	while (do_after(usr, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
-		sleep(1)
+		stoplag(1)
 	qdel(progress)
 
 /obj/item/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress)

code/game/objects/structures/barsigns.dm

@@ -120,7 +120,7 @@
 		return
 	emagged = TRUE
 	to_chat(user, "<span class='notice'>You emag the barsign. Takeover in progress...</span>")
-	sleep(100) //10 seconds
+	sleep(10 SECONDS)
 	set_sign(new /datum/barsign/hiddensigns/syndibarsign)
 	req_access = list(ACCESS_SYNDICATE)
 

code/game/turfs/turf.dm

@@ -330,7 +330,7 @@
 	var/list/things = src_object.contents.Copy()
 	var/datum/progressbar/progress = new(user, things.len, src)
 	while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, /obj/item/storage.proc/mass_remove_from_storage, src, things, progress)))
-		sleep(1)
+		stoplag(1)
 	qdel(progress)
 
 	return TRUE