shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update communications.dm

Browse Source
This commit is contained in:
LetterJay
2018-04-01 19:48:15 -05:00
committed by GitHub
parent 6e57afd034
commit 31bb211cb3
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/communications.dm
-4
View File
@@ -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)