From 7a97ac7bdcd75963c3fdf40935665690c2a5cc17 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Tue, 27 Sep 2016 19:01:14 +1000 Subject: [PATCH] getrev wrong var patch --- code/datums/helper_datums/getrev.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 9e8efb85082..5421d6600fb 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -18,12 +18,14 @@ var/global/datum/getrev/revdata = new() commit = head_log.group[4] world.log << "Running /tg/ revision:" world.log << "[date]" - world.log << commit if(testmerge.len) + world.log << commit for(var/line in testmerge) if(line) world.log << "Test merge active of PR #[line]" world.log << "Based off master commit [parentcommit]" + else + world.log << parentcommit world.log << "Current map - [MAP_NAME]" //can't think of anywhere better to put it /client/verb/showrevinfo() @@ -31,7 +33,7 @@ var/global/datum/getrev/revdata = new() set name = "Show Server Revision" set desc = "Check the current server code revision" - if(revdata.commit) + if(revdata.parentcommit) src << "Server revision compiled on: [revdata.date]" if(revdata.testmerge.len) for(var/line in revdata.testmerge) @@ -39,7 +41,7 @@ var/global/datum/getrev/revdata = new() src << "Test merge active of PR #[line]" src << "Based off master commit [revdata.parentcommit]" else - src << "[revdata.commit]" + src << "[revdata.parentcommit]" else src << "Revision unknown" src << "Current Infomational Settings:"