diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index d93f3e258..e386ced61 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -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 += "| Heads |
|---|
"
for(var/name in heads)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index d34eb73fb..0738781d5 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -69,7 +69,7 @@
output += "[icon2html(preview_icon, world, "preview")]Join Game!
"
output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "roleplay")]Roleplay Roles!
"
output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "settings")]Setup Character
"
- output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "manifest")]View the Crew Manifest
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "manifest")]View the Game Manifest
"
output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "ghost")]Observe
"
if(!IsGuestKey(src.key) && SSticker.current_state >= GAME_STATE_PREGAME)
@@ -764,8 +764,8 @@
/mob/dead/new_player/proc/ViewManifest()
var/dat = ""
- dat += "Crew Manifest
"
- dat += GLOB.data_core.get_manifest(OOC = 1)
+ dat += "Game Manifest
"
+ dat += GLOB.data_core.get_manifest(OOC = TRUE)
src << browse(dat, "window=manifest;size=387x420;can_close=1")
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index b6cd8be84..e8a889037 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -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 += "Crew Manifest
"
- dat += GLOB.data_core.get_manifest()
+ dat += "Game Manifest
"
+ dat += GLOB.data_core.get_manifest(FALSE,TRUE) //Gets a more complete crew manifest
src << browse(dat, "window=manifest;size=387x420;can_close=1")