diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index d0f06e19c8..64c9301830 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -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