cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-22 20:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1690 from haha26315/Game-Manifest-Silicon-Update

Browse Source 
Game manifest update
This commit is contained in:
Dahlular
2022-09-15 17:25:51 -06:00
committed by GitHub
parent acbc8027c1 a2214a1bb4
commit e653b3b1a1
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/datacore.dm
+9 -1
View File
@@ -89,7 +89,7 @@
if(foundrecord)
foundrecord.fields["rank"] = assignment
/datum/datacore/proc/get_manifest(monochrome, OOC)
/datum/datacore/proc/get_manifest(monochrome, OOC = FALSE)
var/list/heads = list()
var/list/sec = list()
var/list/eng = list()
@@ -143,6 +143,14 @@
department = 1
if(!department && !(name in heads))
misc[name] = rank
//If we're getting the manifest from out of the round, add borgs to it
if(OOC)
for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs)
if(!R.hack_software || R.emagged) //If they're not hacked except via emag
var name = R.name
bot[name] = "Station Cyborg"
if(heads.len > 0)
dat += "<tr><th colspan=3>Heads</th></tr>"
for(var/name in heads)
code/modules/mob/dead/new_player/new_player.dm
+3 -3
View File
@@ -69,7 +69,7 @@
output += "<p><a href='byond://?src=[REF(src)];late_join=1'>[icon2html(preview_icon, world, "preview")]Join Game!</a></p>"
output += "<p><a href='byond://?src=[REF(src)];roleplay_join=1'>[icon2html('hyperstation/icons/menu/menu.dmi', world, "roleplay")]Roleplay Roles!</a></p>"
output += "<p><a href='byond://?src=[REF(src)];show_preferences=1'>[icon2html('hyperstation/icons/menu/menu.dmi', world, "settings")]Setup Character</a></p>"
output += "<p><a href='byond://?src=[REF(src)];manifest=1'>[icon2html('hyperstation/icons/menu/menu.dmi', world, "manifest")]View the Crew Manifest</a></p>"
output += "<p><a href='byond://?src=[REF(src)];manifest=1'>[icon2html('hyperstation/icons/menu/menu.dmi', world, "manifest")]View the Game Manifest</a></p>"
output += "<p><a href='byond://?src=[REF(src)];ready=[PLAYER_READY_TO_OBSERVE]'>[icon2html('hyperstation/icons/menu/menu.dmi', world, "ghost")]Observe</a></p>"
if(!IsGuestKey(src.key) && SSticker.current_state >= GAME_STATE_PREGAME)
@@ -764,8 +764,8 @@
/mob/dead/new_player/proc/ViewManifest()
var/dat = "<html><body>"
dat += "<h4>Crew Manifest</h4>"
dat += GLOB.data_core.get_manifest(OOC = 1)
dat += "<h4>Game Manifest</h4>"
dat += GLOB.data_core.get_manifest(OOC = TRUE)
src << browse(dat, "window=manifest;size=387x420;can_close=1")
code/modules/mob/dead/observer/observer.dm
+3 -3
View File
@@ -653,12 +653,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return 1
/mob/dead/observer/verb/view_manifest()
set name = "View Crew Manifest"
set name = "View Game Manifest"
set category = "Ghost"
var/dat
dat += "<h4>Crew Manifest</h4>"
dat += GLOB.data_core.get_manifest()
dat += "<h4>Game Manifest</h4>"
dat += GLOB.data_core.get_manifest(FALSE,TRUE) //Gets a more complete crew manifest
src << browse(dat, "window=manifest;size=387x420;can_close=1")