cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 07:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2013-07-31 19:21:58 -07:00
parent 8008a27ec4 e860191c5b
commit b4e8c60472
9 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/new_player/new_player.dm
View File

@@ -405,7 +405,7 @@
proc/ViewManifest()
var/dat = "<html><body>"
dat += "<h4>Crew Manifest</h4>"
dat += data_core.get_manifest()
dat += data_core.get_manifest(OOC = 1)
src << browse(dat, "window=manifest;size=370x420;can_close=1")