From 29af85a0ae7804c731428e880121d34339dd644f Mon Sep 17 00:00:00 2001 From: Poojawa Date: Mon, 29 Apr 2019 02:37:01 -0500 Subject: [PATCH 1/2] Brings NTPR to the nice discord bot --- code/__HELPERS/roundend.dm | 4 ++++ code/controllers/subsystem/ticker.dm | 3 +++ 2 files changed, 7 insertions(+) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 165cea9557..cdd2e99dd8 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -199,6 +199,10 @@ if(length(CONFIG_GET(keyed_list/cross_server))) send_news_report() + //tell the nice people on discord what went on before the salt cannon happens. + world.TgsTargetedChatBroadcast("The current round has ended. Please standby for your shift interlude Nanotrasen News Network's report!", FALSE) + world.TgsTargetedChatBroadcast(send_news_report(),FALSE) + CHECK_TICK //These need update to actually reflect the real antagonists diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 9a4cad3667..13fb1fc224 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -564,6 +564,9 @@ SUBSYSTEM_DEF(ticker) if(news_message) send2otherserver(news_source, news_message,"News_Report") + return news_message + else + return "We reget to inform you that shit be whack, yo. And none of our reporters have any idea of what may or may not have gone on." /datum/controller/subsystem/ticker/proc/GetTimeLeft() if(isnull(SSticker.timeLeft)) From 55c85175e731d9311aad81d29b6fb44f3c4642a7 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Mon, 29 Apr 2019 02:41:15 -0500 Subject: [PATCH 2/2] I can english to potatoe --- code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 13fb1fc224..4a3143da79 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -566,7 +566,7 @@ SUBSYSTEM_DEF(ticker) send2otherserver(news_source, news_message,"News_Report") return news_message else - return "We reget to inform you that shit be whack, yo. And none of our reporters have any idea of what may or may not have gone on." + return "We regret to inform you that shit be whack, yo. None of our reporters have any idea of what may or may not have gone on." /datum/controller/subsystem/ticker/proc/GetTimeLeft() if(isnull(SSticker.timeLeft))