From bbfc1a0af5f1303b334589a662156a70a12c5cbf Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 25 Apr 2018 12:54:35 -0400 Subject: [PATCH 1/3] Fixes master --- DMAPI/tgs/v3210/api.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/DMAPI/tgs/v3210/api.dm b/DMAPI/tgs/v3210/api.dm index 8823aa6da0..38e264df98 100644 --- a/DMAPI/tgs/v3210/api.dm +++ b/DMAPI/tgs/v3210/api.dm @@ -53,17 +53,20 @@ return copytext(text, 1, i + 1) return "" +/datum/tgs_api/v3210/proc/file2list(filename) + return splittext(trim_left(trim_right(file2text(filename))), "\n") + /datum/tgs_api/v3210/OnWorldNew(datum/tgs_event_handler/event_handler) //don't use event handling in this version comms_key = world.params[SERVICE_WORLD_PARAM] instance_name = world.params[SERVICE_INSTANCE_PARAM] if(!instance_name) instance_name = "TG Station Server" //maybe just upgraded - var/list/logs = splittext(trim_left(trim_right(file2text(".git/logs/HEAD"))), "\n") + var/list/logs = sfile2list(".git/logs/HEAD") if(logs.len) logs = splittext(logs[logs.len - 1], " ") commit = logs[2] - logs = world.file2list(".git/logs/refs/remotes/origin/master") + logs = file2list(".git/logs/refs/remotes/origin/master") if(logs.len) originmastercommit = splittext(logs[logs.len - 1], " ")[2] From a8b373f2fb95bf16a045088db4f8277803fa3d4e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 25 Apr 2018 12:59:14 -0400 Subject: [PATCH 2/3] Further fixes --- DMAPI/tgs/v3210/api.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/DMAPI/tgs/v3210/api.dm b/DMAPI/tgs/v3210/api.dm index 38e264df98..5f69889f07 100644 --- a/DMAPI/tgs/v3210/api.dm +++ b/DMAPI/tgs/v3210/api.dm @@ -62,7 +62,7 @@ if(!instance_name) instance_name = "TG Station Server" //maybe just upgraded - var/list/logs = sfile2list(".git/logs/HEAD") + var/list/logs = file2list(".git/logs/HEAD") if(logs.len) logs = splittext(logs[logs.len - 1], " ") commit = logs[2] @@ -177,7 +177,10 @@ return list() /datum/tgs_api/v3210/ChatBroadcast(message, list/channels) - return TGS_UNIMPLEMENTED + if(channels) + return TGS_UNIMPLEMENTED + ChatTargetedBroadcast(message, TRUE) + ChatTargetedBroadcast(message, FALSE) /datum/tgs_api/v3210/ChatTargetedBroadcast(message, admin_only) ExportService("[admin_only ? SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE : SERVICE_REQUEST_IRC_BROADCAST] [message]") From 303448457e1529c900fa183a8b3c7f2e5459acf1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 25 Apr 2018 13:12:11 -0400 Subject: [PATCH 3/3] Fix global declaration --- DMAPI/tgs/core/datum.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DMAPI/tgs/core/datum.dm b/DMAPI/tgs/core/datum.dm index 0a8782529e..6af39a75df 100644 --- a/DMAPI/tgs/core/datum.dm +++ b/DMAPI/tgs/core/datum.dm @@ -1,4 +1,4 @@ -TGS_DEFINE_AND_SET_GLOBAL(datum/tgs_api/tgs, null) +TGS_DEFINE_AND_SET_GLOBAL(tgs, null) /datum/tgs_api