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

2021-07-18 15:12:52 -07:00
parent d9b70b1f1c 94dc98ccfa
commit 3070f178e0
159 changed files with 132112 additions and 130447 deletions
@@ -182,6 +182,7 @@
 	. = ..()

 /mob/living/silicon/ai/proc/set_core_display_icon(input, client/C)
+	set waitfor = FALSE
 	if(client && !C)
 		C = client
 	if(!input && !C?.prefs?.preferred_ai_core_display)