From 1910693725bf4f071b081bcebeec8db5111bddd3 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sun, 12 May 2024 16:36:24 -0500 Subject: [PATCH] shrug --- code/controllers/subsystem/datacore.dm | 21 +++++++++++-------- code/modules/mob/living/silicon/ai/ai.dm | 2 +- .../overmap/ships/controlled_ship_datum.dm | 3 +++ code/modules/paperwork/filingcabinet.dm | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/code/controllers/subsystem/datacore.dm b/code/controllers/subsystem/datacore.dm index c6ea4ca1de68..ab36e50fe4c0 100644 --- a/code/controllers/subsystem/datacore.dm +++ b/code/controllers/subsystem/datacore.dm @@ -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 @@ -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) @@ -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 @@ -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 @@ -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) @@ -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) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 5d4448af40aa..7bddf83e8090 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -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) diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm index cc23d3463321..1653a94170ab 100644 --- a/code/modules/overmap/ships/controlled_ship_datum.dm +++ b/code/modules/overmap/ships/controlled_ship_datum.dm @@ -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." diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 1aa86696b54c..b90c23c76550 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -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