Merge pull request #4471 from VOREStation/upstream-merge-5701

[MIRROR] Update silicon manifest to discord dark theme.
This commit is contained in:
Aronai Sieyes
2018-11-05 15:25:41 -05:00
committed by GitHub
2 changed files with 10 additions and 8 deletions

View File

@@ -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
- if [ $RUN -eq 1 ]; then grep "All Unit Tests Passed" log.txt; fi

View File

@@ -173,13 +173,15 @@
// this function displays the stations manifest in a separate window
/mob/living/silicon/proc/show_station_manifest()
var/dat
dat += "<h4>Crew Manifest</h4>"
if(data_core)
dat += data_core.get_manifest(1) // make it monochrome
dat += "<br>"
src << browse(dat, "window=airoster")
onclose(src, "airoster")
var/dat = "<div align='center'>"
if(!data_core)
to_chat(src,"<span class='notice'>There is no data to form a manifest with. Contact your Nanotrasen administrator.</span>")
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)