Merge remote-tracking branch 'citadel/master' into shoelaces

2020-07-23 16:23:34 -07:00
parent 484da28600 30a6ddd963
commit 1f25c7f06d
540 changed files with 11615 additions and 4656 deletions
@@ -123,6 +123,9 @@

 	var/list/progressbars = null	//for stacking do_after bars

+	///For storing what do_after's someone has, in case we want to restrict them to only one of a certain do_after at a time
+	var/list/do_afters
+
 	var/list/mousemove_intercept_objects

 	var/datum/click_intercept