cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3813 from yogstation13/upstream-merge-41806

Browse Source 
[MIRROR] Fix TGS stuff
This commit is contained in:
nichlas0010
2018-12-10 02:58:15 +01:00
committed by GitHub
parent 7589b6c784 80cac36fe9
commit 36f9fa9b90
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystem/server_maint.dm
View File

@@ -55,8 +55,8 @@ SUBSYSTEM_DEF(server_maint)
co.ehjax_send(data = "roundrestart")
if(server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
C << link("byond://[server]")
var/tgsversion = world.TgsVersion()
var/datum/tgs_version/tgsversion = world.TgsVersion()
if(tgsversion)
SSblackbox.record_feedback("text", "server_tools", 1, tgsversion)
SSblackbox.record_feedback("text", "server_tools", 1, tgsversion.raw_parameter)
#undef PING_BUFFER_TIME

3
code/datums/helper_datums/getrev.dm
View File

@@ -77,7 +77,8 @@
msg += "No commit information"
if(world.TgsAvailable())
msg += "Server tools version: [world.TgsVersion()]"
var/datum/tgs_version/version = world.TgsVersion()
msg += "Server tools version: [version.raw_parameter]"
if(!check_rights_for(src, R_ADMIN)) //yogs
to_chat(src, msg.Join("<br>"))

3
code/modules/tgs/core/core.dm
View File

@@ -31,7 +31,8 @@
if(0)
api_datum = /datum/tgs_api/v4
if(version.suite != null && version.major != null && version.minor != null && version.patch != null && version.deprefixed_parameter > TgsMaximumAPIVersion())
var/datum/tgs_version/max_api_version = TgsMaximumAPIVersion();
if(version.suite != null && version.major != null && version.minor != null && version.patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter)
TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.")
api_datum = /datum/tgs_api/latest

1
tgstation.dme
View File

@@ -2656,7 +2656,6 @@
#include "code\modules\surgery\organs\vocal_cords.dm"
#include "code\modules\tgs\event_handler.dm"
#include "code\modules\tgs\includes.dm"
#include "code\modules\tgs\core\tgs_version.dm"
#include "code\modules\tgui\external.dm"
#include "code\modules\tgui\states.dm"
#include "code\modules\tgui\subsystem.dm"