diff --git a/.travis.yml b/.travis.yml index c9a8d196fc..478896d7b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,4 +49,4 @@ script: - echo "#define ${TEST_DEFINE} 1" > ${TEST_FILE} - DreamMaker vorestation.dme - if [ $RUN -eq 1 ]; then DreamDaemon vorestation.dmb -invisible -trusted -core 2>&1 | tee log.txt; fi - - if [ $RUN -eq 1 ]; then grep "All Unit Tests Passed" log.txt; fi \ No newline at end of file + - if [ $RUN -eq 1 ]; then grep "All Unit Tests Passed" log.txt; fi diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 62400289d7..da0809250d 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -173,13 +173,15 @@ // this function displays the stations manifest in a separate window /mob/living/silicon/proc/show_station_manifest() - var/dat - dat += "

Crew Manifest

" - if(data_core) - dat += data_core.get_manifest(1) // make it monochrome - dat += "
" - src << browse(dat, "window=airoster") - onclose(src, "airoster") + var/dat = "
" + if(!data_core) + to_chat(src,"There is no data to form a manifest with. Contact your Nanotrasen administrator.") + return + dat += data_core.get_manifest(1) //The 1 makes it monochrome. + + var/datum/browser/popup = new(src, "Crew Manifest", "Crew Manifest", 370, 420, src) + popup.set_content(dat) + popup.open() //can't inject synths /mob/living/silicon/can_inject(var/mob/user, var/error_msg)