Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252

[MIRROR] Server tools versioning and fix to displayed testmerges
This commit is contained in:
LetterJay
2017-09-11 13:12:10 -05:00
committed by GitHub
3 changed files with 15 additions and 3 deletions
@@ -4,6 +4,10 @@ GLOBAL_PROTECT(reboot_mode)
/world/proc/RunningService()
return params[SERVICE_WORLD_PARAM]
/proc/ServiceVersion()
if(world.RunningService())
return world.params[SERVICE_VERSION_PARAM]
/world/proc/ExportService(command)
return RunningService() && shell("python code/modules/server_tools/nudge.py \"[command]\"") == 0