From 9eef5ff877418bea0211158a966ae918add35662 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 25 Aug 2014 19:30:56 +0200 Subject: [PATCH] Status displays can now show station time. Also prepares for making brig timer inherit from status display. --- baystation12.dme | 1 + .../computer3/computers/communications.dm | 3 + .../game/machinery/computer/communications.dm | 4 + code/game/machinery/status_display.dm | 88 ++++++++----------- code/game/machinery/supply_display.dm | 40 +++++++++ code/unused/pda2/smallprogs.dm | 3 + maps/tgstation2.dmm | 17 ++-- 7 files changed, 98 insertions(+), 58 deletions(-) create mode 100644 code/game/machinery/supply_display.dm diff --git a/baystation12.dme b/baystation12.dme index 677d4ed90cd..ff370aa4469 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -323,6 +323,7 @@ #include "code\game\machinery\spaceheater.dm" #include "code\game\machinery\status_display.dm" #include "code\game\machinery\suit_storage_unit.dm" +#include "code\game\machinery\supply_display.dm" #include "code\game\machinery\syndicatebeacon.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\turrets.dm" diff --git a/code/WorkInProgress/computer3/computers/communications.dm b/code/WorkInProgress/computer3/computers/communications.dm index 16123e42e70..b2a7e55f728 100644 --- a/code/WorkInProgress/computer3/computers/communications.dm +++ b/code/WorkInProgress/computer3/computers/communications.dm @@ -183,6 +183,8 @@ if("setmsg2" in href_list) stat_msg2 = reject_bad_text(input("Line 2", "Enter Message Text", stat_msg2) as text|null, 40) computer.updateDialog() + if("settime") + post_status(href_list["time"]) // OMG CENTCOMM LETTERHEAD if("MessageCentcomm" in href_list) @@ -348,6 +350,7 @@ dat += "\[ Back \]
" dat += "Set Status Displays
" dat += "\[ Clear \]
" + dat += "\[ Station Time \]" dat += "\[ Shuttle ETA \]
" dat += "\[ Message \]" dat += "