From 6e57afd034a5033703b763c2c873d8f2beb3f8f2 Mon Sep 17 00:00:00 2001 From: oranges Date: Sun, 1 Apr 2018 11:28:17 +1200 Subject: [PATCH 1/2] Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle. --- code/game/machinery/computer/communications.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 31bb211cb33b4d1263bcb2a6db0f16261b37b3c0 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Apr 2018 19:48:15 -0500 Subject: [PATCH 2/2] Update communications.dm --- code/game/machinery/computer/communications.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 64c9301830..ac75146f3e 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -45,11 +45,7 @@ /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)