cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tastyfish
2011-11-30 18:35:58 -05:00
parent 26e1bfdaf1 d5217ce19a
commit b344e2a442
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/getrev.dm
+1 -2
View File
@@ -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
code/game/topic.dm
+1
View File
@@ -30,4 +30,5 @@
s["player[n]"] = M.client.key
n++
s["players"] = n
s["end"] = "#end"
return list2params(s)
code/modules/mob/new_player/new_player.dm
+13 -1
View File
@@ -117,11 +117,12 @@
else output += "<b>You are ready</b> (<a href='byond://?src=\ref[src];ready=2'>Cancel</A>)<BR>"
else
output += "<a href='byond://?src=\ref[src];manifest=1'>View the Crew Manifest</A><BR><BR>"
output += "<a href='byond://?src=\ref[src];late_join=1'>Join Game!</A><BR>"
output += "<BR><a href='byond://?src=\ref[src];observe=1'>Observe</A><BR>"
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 = "<html><body>"
dat += "<h4>Crew Manifest</h4>"
for(var/datum/data/record/t in data_core.general)
dat += "[t.fields["name"]] - [t.fields["rank"]]<br>"
dat += "<br>"
src << browse(dat, "window=manifest;size=300x420;can_close=1")
Move()
return 0