diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 720ca7d403e..85fad60526e 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -264,7 +264,7 @@ Turf and target are seperate in case you want to teleport some distance from a t if(oldname) //update the datacore records! This is goig to be a bit costly. - for(var/list/L in list(data_core.general,data_core.medical,data_core.security,data_core.locked,data_core.permanent)) + for(var/list/L in list(data_core.general,data_core.medical,data_core.security,data_core.locked)) for(var/datum/data/record/R in L) if(R.fields["name"] == oldname) R.fields["name"] = newname diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 3d33e90a363..da72abcdd5e 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -114,28 +114,28 @@ S.fields["notes"] = "No notes." security += S - // Records with oermanently available information - var/datum/data/record/P = new() - P.fields["id"] = id - P.fields["name"] = H.real_name - if(H.exploit_record && !jobban_isbanned(H, "Records")) - P.fields["exploit_record"] = H.exploit_record - else - P.fields["exploit_record"] = "No additional information acquired." - permanent += P - //Locked Record var/datum/data/record/L = new() L.fields["id"] = md5("[H.real_name][H.mind.assigned_role]") L.fields["name"] = H.real_name L.fields["rank"] = H.mind.assigned_role L.fields["age"] = H.age + L.fields["fingerprint"] = md5(H.dna.uni_identity) L.fields["sex"] = H.gender L.fields["b_type"] = H.b_type L.fields["b_dna"] = H.dna.unique_enzymes L.fields["enzymes"] = H.dna.SE // Used in respawning L.fields["identity"] = H.dna.UI // " + L.fields["species"] = H.get_species() + L.fields["home_system"] = H.home_system + L.fields["citizenship"] = H.citizenship + L.fields["faction"] = H.personal_faction + L.fields["religion"] = H.religion L.fields["image"] = getFlatIcon(H) //This is god-awful + if(H.exploit_record && !jobban_isbanned(H, "Records")) + L.fields["exploit_record"] = H.exploit_record + else + L.fields["exploit_record"] = "No additional information acquired." locked += L return diff --git a/code/defines/obj.dm b/code/defines/obj.dm index da7c5df22ba..0c971df2609 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -48,7 +48,6 @@ var/medical[] = list() var/general[] = list() var/security[] = list() - var/permanent[] = list() //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). var/locked[] = list() diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 8604926a835..fe569e23647 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -255,9 +255,6 @@ var/global/list/frozen_items = list() for(var/datum/data/record/G in data_core.general) if ((G.fields["name"] == occupant.real_name)) del(G) - for(var/datum/data/record/P in data_core.permanent) - if ((P.fields["name"] == occupant.real_name)) - del(P) if(orient_right) icon_state = "body_scanner_0-r" diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 31a25a88894..0d74cb57c76 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -221,25 +221,17 @@ datum/nano_item_lists /obj/item/device/uplink/hidden/proc/update_nano_data(var/id) if(nanoui_menu == 1) var/permanentData[0] - for(var/datum/data/record/P in sortRecord(data_core.permanent)) - permanentData[++permanentData.len] = list(Name = P.fields["name"],"id" = P.fields["id"]) + for(var/datum/data/record/L in sortRecord(data_core.locked)) + permanentData[++permanentData.len] = list(Name = L.fields["name"],"id" = L.fields["id"]) nanoui_data["exploit_records"] = permanentData if(nanoui_menu == 11) - nanoui_data["general_exists"] = 0 nanoui_data["exploit_exists"] = 0 - for(var/datum/data/record/R in data_core.general) - if(R.fields["id"] == id) - nanoui_data["general"] = R.fields - nanoui_data["general_exists"] = 1 - break - - for(var/datum/data/record/P in data_core.permanent) - if(P.fields["id"] == id) - if(!nanoui_data["exploit"]) - nanoui_data["exploit"] = new - nanoui_data["exploit"]["notes"] = replacetext(P.fields["exploit_record"], "\n", "
") + for(var/datum/data/record/L in data_core.locked) + if(L.fields["id"] == id) + nanoui_data["exploit"] = L.fields + nanoui_data["exploit"]["nanoui_exploit_record"] = replacetext(nanoui_data["exploit"]["exploit_record"], "\n", "
") nanoui_data["exploit_exists"] = 1 break diff --git a/nano/templates/uplink.tmpl b/nano/templates/uplink.tmpl index b063d007daf..45b2a7c0f71 100644 --- a/nano/templates/uplink.tmpl +++ b/nano/templates/uplink.tmpl @@ -53,7 +53,7 @@ Used In File(s): \code\game\objects\items\devices\uplinks.dm {{:helper.link('Buy Random (??)' , 'gear', {'buy_item' : 'random'}, null, 'fixedLeftWidest')}} {{else data.menu == 1}} - Information Record List +

Information Record List


Select a Record @@ -65,30 +65,25 @@ Used In File(s): \code\game\objects\items\devices\uplinks.dm
{{/for}} {{else data.menu == 11}} - Information Record +

Information Record


- {{if data.general_exists == 1}} - Name: {{:data.general.name}}
- Sex: {{:data.general.sex}}
- Species: {{:data.general.species}}
- Age: {{:data.general.age}}
- Rank: {{:data.general.rank}}
- Home System: {{:data.general.home_system}}
- Citizenship: {{:data.general.citizenship}}
- Faction: {{:data.general.faction}}
- Religion: {{:data.general.religion}}
- Fingerprint: {{:data.general.fingerprint}}
- {{else}} - - General Record Lost!

- - {{/if}} {{if data.exploit_exists == 1}} - Acquired Information:
- Notes: {{:data.exploit.notes}}

+ Name: {{:data.exploit.name}}
+ Sex: {{:data.exploit.sex}}
+ Species: {{:data.exploit.species}}
+ Age: {{:data.exploit.age}}
+ Rank: {{:data.exploit.rank}}
+ Home System: {{:data.exploit.home_system}}
+ Citizenship: {{:data.exploit.citizenship}}
+ Faction: {{:data.exploit.faction}}
+ Religion: {{:data.exploit.religion}}
+ Fingerprint: {{:data.exploit.fingerprint}}
+ +
Acquired Information:
+ Notes:
 {{:data.exploit.nanoui_exploit_record}}

{{else}} No exploitative information acquired!