Skip to content

Commit

Permalink
shrug
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed May 12, 2024
1 parent f019ff3 commit 1910693
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
21 changes: 12 additions & 9 deletions code/controllers/subsystem/datacore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SUBSYSTEM_DEF(datacore)
DATACORE_RECORDS_OUTPOST,
DATACORE_RECORDS_SECURITY,
DATACORE_RECORDS_MEDICAL,
DATACORE_RECORDS_LOCKED
//DATACORE_RECORDS_LOCKED
)

var/securityPrintCount = 0
Expand Down Expand Up @@ -67,7 +67,8 @@ SUBSYSTEM_DEF(datacore)

/// Removes a person from history. Except locked. That's permanent history.
/datum/controller/subsystem/datacore/proc/demanifest(name)
for(var/id in library - DATACORE_RECORDS_LOCKED)
//for(var/id in library - DATACORE_RECORDS_LOCKED)
for(var/id in library)
var/datum/data/record/R = get_record_by_name(name, id)
qdel(R)

Expand Down Expand Up @@ -255,6 +256,7 @@ SUBSYSTEM_DEF(datacore)
S.fields[DATACORE_NOTES] = "No notes."
library[DATACORE_RECORDS_SECURITY].inject_record(S)

/*
//Locked Record
var/datum/data/record/locked/L = new()
L.fields[DATACORE_ID] = id
Expand All @@ -278,8 +280,9 @@ SUBSYSTEM_DEF(datacore)
L.fields[DATACORE_IMAGE] = image
L.fields[DATACORE_MINDREF] = H.mind
library[DATACORE_RECORDS_LOCKED].inject_record(L)

SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MANIFEST_INJECT, G, M, S, L)
*/
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MANIFEST_INJECT, G, M, S)
return

//For ship records
Expand Down Expand Up @@ -333,13 +336,13 @@ SUBSYSTEM_DEF(datacore)
*
* @return - list(general_records_out)
*/
/datum/controller/subsystem/datacore/proc/get_general_records()
if(!get_records(DATACORE_RECORDS_OUTPOST))
/datum/controller/subsystem/datacore/proc/get_general_records(record_key = DATACORE_RECORDS_OUTPOST)
if(!get_records(record_key))
return list()

/// The array of records
var/list/general_records_out = list()
for(var/datum/data/record/gen_record as anything in get_records(DATACORE_RECORDS_OUTPOST))
for(var/datum/data/record/gen_record as anything in get_records(record_key))
/// The object containing the crew info
var/list/crew_record = list()
crew_record["ref"] = REF(gen_record)
Expand All @@ -356,13 +359,13 @@ SUBSYSTEM_DEF(datacore)
*
* @return - list(security_records_out)
*/
/datum/controller/subsystem/datacore/proc/get_security_records()
if(!get_records(DATACORE_RECORDS_SECURITY))
/datum/controller/subsystem/datacore/proc/get_security_records(record_key = DATACORE_RECORDS_SECURITY)
if(!get_records(record_key))
return list()

/// The array of records
var/list/security_records_out = list()
for(var/datum/data/record/sec_record as anything in get_records(DATACORE_RECORDS_SECURITY))
for(var/datum/data/record/sec_record as anything in get_records(record_key))
/// The object containing the crew info
var/list/crew_record = list()
crew_record["ref"] = REF(sec_record)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/ai/ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@
if("Crew Member")
var/list/personnel_list = list()

for(var/datum/data/record/t in SSdatacore.get_records(DATACORE_RECORDS_LOCKED))//Look in data core locked.
for(var/datum/data/record/t in SSdatacore.get_records(DATACORE_RECORDS_OUTPOST))//Look in data core locked.
personnel_list["[t.fields[DATACORE_NAME]]: [t.fields[DATACORE_RANK]]"] = t.fields[DATACORE_IMAGE]//Pull names, rank, and image.

if(personnel_list.len)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/overmap/ships/controlled_ship_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,9 @@
SStgui.close_uis(helm)
helm.say(helm_locked ? "Helm console is now locked." : "Helm console has been unlocked.")

/datum/overmap/ship/controlled/proc/get_records()
return ship_record

/obj/item/key/ship
name = "ship key"
desc = "A key for locking and unlocking the helm of a ship, comes with a ball chain so it can be worn around the neck. Comes with a cute little shuttle-shaped keychain."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/filingcabinet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY(employmentCabinets)

/obj/structure/filingcabinet/employment/proc/fillCurrent()
//This proc fills the cabinet with the current crew.
for(var/record in SSdatacore.get_records(DATACORE_RECORDS_LOCKED))
for(var/record in SSdatacore.get_records(DATACORE_RECORDS_OUTPOST))
var/datum/data/record/G = record
if(!G)
continue
Expand Down

0 comments on commit 1910693

Please sign in to comment.