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

Merge pull request #5701 from lbnesquik/Kates-Ai-Manifest-Fix

Browse Source 
Update silicon manifest to discord dark theme.
This commit is contained in:
Neerti
2018-10-30 18:41:47 -04:00
committed by VirgoBot
parent 1ce67ab74d
commit bcf58840d0
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

@@ -5,7 +5,7 @@ sudo: false
env: env:
global: global:
- BYOND_MAJOR="512" - BYOND_MAJOR="512"
- BYOND_MINOR="1453" - BYOND_MINOR="1414"
- MACRO_COUNT=4 - MACRO_COUNT=4
matrix: matrix:
- TEST_DEFINE="MAP_TEST" TEST_FILE="code/_map_tests.dm" RUN="0" - TEST_DEFINE="MAP_TEST" TEST_FILE="code/_map_tests.dm" RUN="0"

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)