Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle.

2018-04-01 11:28:17 +12:00
parent 5a6a8c332a
commit 6e57afd034
1 changed files with 4 additions and 1 deletions
@@ -45,10 +45,13 @@

 /obj/machinery/computer/communications/process()
 	if(..())
+<<<<<<< HEAD
 		if(state != STATE_STATUSDISPLAY)
+=======
+		if(state != STATE_STATUSDISPLAY && state != STATE_CALLSHUTTLE && state != STATE_PURCHASE)
+>>>>>>> 37ff2ef... Merge pull request #36873 from kevinz000/fix_comms_consoles
 			updateDialog()

-
 /obj/machinery/computer/communications/Topic(href, href_list)
 	if(..())
 		return