cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[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
parent 4b9a3f00e0 47f62d98d7
commit 3b5b03e05b
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -49,4 +49,4 @@ script:
- echo "#define ${TEST_DEFINE} 1" > ${TEST_FILE} - echo "#define ${TEST_DEFINE} 1" > ${TEST_FILE}
- DreamMaker vorestation.dme - 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 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

16
code/modules/mob/living/silicon/silicon.dm
View File

@@ -173,13 +173,15 @@
// this function displays the stations manifest in a separate window // this function displays the stations manifest in a separate window
/mob/living/silicon/proc/show_station_manifest() /mob/living/silicon/proc/show_station_manifest()
var/dat var/dat = "<div align='center'>"
dat += "<h4>Crew Manifest</h4>" if(!data_core)
if(data_core) to_chat(src,"<span class='notice'>There is no data to form a manifest with. Contact your Nanotrasen administrator.</span>")
dat += data_core.get_manifest(1) // make it monochrome return
dat += "<br>" dat += data_core.get_manifest(1) //The 1 makes it monochrome.
src << browse(dat, "window=airoster")
onclose(src, "airoster") var/datum/browser/popup = new(src, "Crew Manifest", "Crew Manifest", 370, 420, src)
popup.set_content(dat)
popup.open()
//can't inject synths //can't inject synths
/mob/living/silicon/can_inject(var/mob/user, var/error_msg) /mob/living/silicon/can_inject(var/mob/user, var/error_msg)