Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 14:27:59 -04:00
parent f8d0646b09
commit 7b30be0058
21 changed files with 72 additions and 54 deletions
@@ -177,7 +177,7 @@

 /datum/browser/alert/proc/wait()
 	while (opentime && selectedbutton <= 0 && (!timeout || opentime+timeout > world.time))
-		stoplag()
+		stoplag(1)

 /datum/browser/alert/Topic(href,href_list)
 	if (href_list["close"] || !user || !user.client)