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/modules/client/asset_cache.dm

@@ -61,7 +61,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 	var/t = 0
 	var/timeout_time = (ASSET_CACHE_SEND_TIMEOUT * client.sending.len) + ASSET_CACHE_SEND_TIMEOUT
 	while(client && !client.completed_asset_jobs.Find(job) && t < timeout_time) // Reception is handled in Topic()
-		sleep(1) // Lock up the caller until this is received.
+		stoplag(1) // Lock up the caller until this is received.
 		t++
 
 	if(client)
@@ -112,7 +112,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 	var/t = 0
 	var/timeout_time = ASSET_CACHE_SEND_TIMEOUT * client.sending.len
 	while(client && !client.completed_asset_jobs.Find(job) && t < timeout_time) // Reception is handled in Topic()
-		sleep(1) // Lock up the caller until this is received.
+		stoplag(1) // Lock up the caller until this is received.
 		t++
 
 	if(client)
@@ -131,7 +131,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 		if (register_asset)
 			register_asset(file,files[file])
 		send_asset(client,file)
-		sleep(0) //queuing calls like this too quickly can cause issues in some client versions
+		stoplag(0) //queuing calls like this too quickly can cause issues in some client versions
 
 //This proc "registers" an asset, it adds it to the cache for further use, you cannot touch it from this point on or you'll fuck things up.
 //if it's an icon or something be careful, you'll have to copy it before further use.

code/modules/client/client_procs.dm

@@ -631,10 +631,9 @@ GLOBAL_LIST(external_rsc_urls)
 /client/Stat()
 	. = ..()
 	if (holder)
-		sleep(1)
+		stoplag(1)
 	else
-		sleep(5)
-		stoplag()
+		stoplag(5)
 
 //send resources to the client. It's here in its own proc so we can move it around easiliy if need be
 /client/proc/send_resources()

code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm

@@ -161,7 +161,7 @@ Difficulty: Medium
 
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/quick_attack_loop()
 	if(next_move <= world.time)
-		sleep(1)
+		stoplag(1)
 		.() //retry
 		return
 	sleep((next_move - world.time) * 1.5)

code/modules/projectiles/projectile.dm

@@ -228,7 +228,7 @@
 		while(loc)
 			if(paused)
 				next_run = world.time
-				sleep(1)
+				stoplag(1)
 				continue
 
 			if((!( current ) || loc == current))

code/modules/spells/spell_types/touch_attacks.dm

@@ -21,7 +21,7 @@
 				return 0
 	while(attached_hand) //hibernate untill the spell is actually used
 		charge_counter = 0
-		sleep(1)
+		stoplag(1)
 
 /obj/effect/proc_holder/spell/targeted/touch/proc/ChargeHand(mob/living/carbon/user)
 	attached_hand = new hand_path(src)