From 13ab6b5e5664e493ba764fee79f9519d705d0736 Mon Sep 17 00:00:00 2001 From: CompactNinja Date: Wed, 30 Nov 2011 14:48:14 +1030 Subject: [PATCH 1/2] Crew manifest on join screen. Signed-off-by: CompactNinja --- code/modules/mob/new_player/new_player.dm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 7bb2222f1ff..a1575253ed9 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -117,11 +117,12 @@ else output += "You are ready (Cancel)
" else + output += "View the Crew Manifest

" output += "Join Game!
" output += "
Observe
" - src << browse(output,"window=playersetup;size=250x210;can_close=0") + src << browse(output,"window=playersetup;size=250x233;can_close=0") return Stat() @@ -192,6 +193,9 @@ if(href_list["late_join"]) LateChoices() + if(href_list["manifest"]) + ViewManifest() + if(href_list["SelectedJob"]) if(!client.authenticated) src << "You are not authorized to enter the game." @@ -339,6 +343,14 @@ return new_character + proc/ViewManifest() + var/dat = "" + dat += "

Crew Manifest

" + for(var/datum/data/record/t in data_core.general) + dat += "[t.fields["name"]] - [t.fields["rank"]]
" + dat += "
" + + src << browse(dat, "window=manifest;size=300x420;can_close=1") Move() return 0 From 73b9b7a481471244f5de4edd286066a0b18e7723 Mon Sep 17 00:00:00 2001 From: Head Date: Wed, 30 Nov 2011 17:49:35 +0100 Subject: [PATCH 2/2] Just a minor modification to the topic.dm --- code/datums/helper_datums/getrev.dm | 3 +-- code/game/topic.dm | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 67391a18541..10e041ca865 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -82,7 +82,6 @@ client/verb/showrevinfo() set category = "OOC" set name = "Show Server Revision" var/output = "Sorry, the revision info is unavailable." - if(revdata) - output = revdata.showInfo() + output = shell("cat /home/bay12/live/data/gitcommit") usr << browse(output,"window=revdata"); return diff --git a/code/game/topic.dm b/code/game/topic.dm index dbed2da6f6c..8d82f1d600c 100644 --- a/code/game/topic.dm +++ b/code/game/topic.dm @@ -30,4 +30,5 @@ s["player[n]"] = M.client.key n++ s["players"] = n + s["end"] = "#end" return list2params(s) \ No newline at end of file