Skip to content

Commit 2362997

Browse files
Data Core Must Die (discordia-space#8594)
* the datacore is dead, long live the crew record file list apparently this stuff dates back to may 2012 new savefile version clears out old records preferences reworked security records character name replacer proc updates renamed items reversed records sort polarity reworked respawn character proc adds setup disks for preset console programs reduced security and medical file cabinet data to that which could be reasonably accurate for an entire round deleted unused real rank system fixed potential fake crew arrival runtime cargo positions now named guild positions and JOBS_CARGO is now JOBS_GUILD nonhuman positions now named silicon positions and JOBS_NONHUMAN is now JOBS_SILICON world manifest now checks department rather than preset job names updated PAI general, medical, and security records access program fixed freelancer perk define name added green thumb and neat job perk defines deleted duplicate records customization file numbered 5 pruned record customization WIP * return to default for datacore purge update note: setup disks merged seperately security notes simplified --------- Co-authored-by: Humonitarian <61586732+Humonitarian@users.noreply.github.com>
1 parent 8443155 commit 2362997

59 files changed

Lines changed: 1398 additions & 2319 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cev_eris.dme

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@
281281
#include "code\datums\callback.dm"
282282
#include "code\datums\category.dm"
283283
#include "code\datums\contract.dm"
284-
#include "code\datums\datacore.dm"
285284
#include "code\datums\datum.dm"
286285
#include "code\datums\datum_click_handlers.dm"
287286
#include "code\datums\datum_hud.dm"
@@ -751,14 +750,12 @@
751750
#include "code\game\machinery\computer\computer.dm"
752751
#include "code\game\machinery\computer\guestpass.dm"
753752
#include "code\game\machinery\computer\law.dm"
754-
#include "code\game\machinery\computer\medical.dm"
755753
#include "code\game\machinery\computer\message.dm"
756754
#include "code\game\machinery\computer\Operating.dm"
757755
#include "code\game\machinery\computer\pod.dm"
758756
#include "code\game\machinery\computer\prisoner.dm"
759757
#include "code\game\machinery\computer\prisonshuttle.dm"
760758
#include "code\game\machinery\computer\robot.dm"
761-
#include "code\game\machinery\computer\security.dm"
762759
#include "code\game\machinery\computer\station_alert.dm"
763760
#include "code\game\machinery\doors\airlock.dm"
764761
#include "code\game\machinery\doors\airlock_control.dm"
@@ -1458,6 +1455,7 @@
14581455
#include "code\modules\asset_cache\asset_cache_item.dm"
14591456
#include "code\modules\asset_cache\asset_list.dm"
14601457
#include "code\modules\asset_cache\asset_list_items.dm"
1458+
#include "code\modules\asset_cache\assets\legacyuiicons.dm"
14611459
#include "code\modules\asset_cache\assets\sanity.dm"
14621460
#include "code\modules\asset_cache\assets\sheetmaterials.dm"
14631461
#include "code\modules\asset_cache\assets\stats.dm"
@@ -2277,6 +2275,7 @@
22772275
#include "code\modules\nano\modules\human_appearance.dm"
22782276
#include "code\modules\nano\modules\law_manager.dm"
22792277
#include "code\modules\nano\modules\nano_module.dm"
2278+
#include "code\modules\nano\modules\tgui_type.dm"
22802279
#include "code\modules\onestar\generator.dm"
22812280
#include "code\modules\onestar\os_cash.dm"
22822281
#include "code\modules\onestar\os_turret.dm"

code/__DEFINES/jobs.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
#define JOBS_MEDICAL "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer"
99
#define JOBS_SCIENCE "Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist"
1010
#define JOBS_MOEBIUS "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer","Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist"
11-
#define JOBS_CARGO "Guild Merchant","Guild Technician","Guild Miner",
11+
#define JOBS_GUILD "Guild Merchant","Guild Technician","Guild Miner",
1212
#define JOBS_CIVILIAN "Club Manager","Club Worker","Club Artist",ASSISTANT_TITLE
1313
#define JOBS_CHURCH "NeoTheology Preacher","NeoTheology Acolyte","NeoTheology Agrolyte","NeoTheology Custodian"
14-
#define JOBS_NONHUMAN "AI","Robot","pAI"
14+
#define JOBS_SILICON "AI","Robot","pAI"
1515
#define CREDITS "&cent;"
1616
#define CREDS "&cent;"
1717

code/__DEFINES/perks.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//fate perks
22
#define PERK_PAPER_WORM /datum/perk/fate/paper_worm
3-
#define PERK_FREELACER /datum/perk/fate/freelancer
3+
#define PERK_FREELANCER /datum/perk/fate/freelancer
44
#define PERK_NIHILIST /datum/perk/fate/nihilist
55
#define PERK_MORALIST /datum/perk/fate/moralist
66
#define PERK_ALCOHOLIC /datum/perk/fate/alcoholic
@@ -49,6 +49,8 @@
4949
#define PERK_CODESPEAK_COP /datum/perk/codespeak
5050
#define PERK_CODESPEAK_SERB /datum/perk/codespeak/serbian
5151
#define PERK_TECHNOMANCER /datum/perk/inspiration
52+
#define PERK_NEAT /datum/perk/neat
53+
#define PERK_GREEN_THUMB /datum/perk/greenthumb
5254
#define PERK_CLUB /datum/perk/job/club
5355
#define PERK_CHANNELING /datum/perk/channeling
5456

code/__HELPERS/manifest.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@
142142
"sec" = filtered_nano_crew_manifest(security_positions),\
143143
"eng" = filtered_nano_crew_manifest(engineering_positions),\
144144
"med" = filtered_nano_crew_manifest(medical_positions),\
145-
"sup" = filtered_nano_crew_manifest(cargo_positions),\
145+
"sup" = filtered_nano_crew_manifest(guild_positions),\
146146
"chr" = filtered_nano_crew_manifest(church_positions),\
147-
"bot" = silicon_nano_crew_manifest(nonhuman_positions),\
147+
"bot" = silicon_nano_crew_manifest(silicon_positions),\
148148
"civ" = filtered_nano_crew_manifest(civilian_positions)\
149149
)
150150

151151
/proc/flat_nano_crew_manifest()
152152
. = list()
153153
. += filtered_nano_crew_manifest(null, TRUE)
154-
. += silicon_nano_crew_manifest(nonhuman_positions)
154+
. += silicon_nano_crew_manifest(silicon_positions)

code/__HELPERS/names.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ var/syndicate_code_response//Code response for contractors.
9494
var/locations[] = LAZYLEN(SSmapping.main_ship_areas_by_name) ? SSmapping.main_ship_areas_by_name : drinks // If null, defaults to drinks instead.
9595

9696
var/names[] = list()
97-
for(var/datum/data/record/t in data_core.general)//Picks from crew manifest.
98-
names += t.fields["name"]
97+
for(var/datum/computer_file/report/crew_record/t in GLOB.all_crew_records)//Picks from crew manifest.
98+
names += t.get_name()
9999

100100
var/maxwords = words//Extra var to check for duplicates.
101101

code/__HELPERS/unsorted.dm

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,26 +276,21 @@ Turf and target are seperate in case you want to teleport some distance from a t
276276
mind.name = newname
277277

278278
if(oldname)
279-
//update the datacore records! This is goig to be a bit costly.
280-
for(var/list/L in list(data_core.general, data_core.medical, data_core.security, data_core.locked))
281-
for(var/datum/data/record/R in L)
282-
if(R.fields["name"] == oldname)
283-
R.fields["name"] = newname
284-
break
279+
for(var/datum/computer_file/report/crew_record/R in GLOB.all_crew_records)
280+
if(R.get_name() == oldname)
281+
R.set_name(newname)
285282

286283
//update our pda and id if we have them on our person
287-
var/list/searching = GetAllContents(searchDepth = 3)
288-
var/search_id = 1
289-
var/search_pda = 1
290-
291-
for(var/A in searching)
292-
if( search_id && istype(A,/obj/item/card/id) )
284+
for(var/obj/A in GetAllContents(searchDepth = 3))
285+
if(istype(A,/obj/item/card/id))
293286
var/obj/item/card/id/ID = A
294287
if(ID.registered_name == oldname)
295288
ID.registered_name = newname
296289
ID.name = "[newname]'s ID Card ([ID.assignment])"
297-
if(!search_pda) break
298-
search_id = 0
290+
if(istype(A.loc, /obj/item/modular_computer))
291+
var/obj/item/modular_computer/tolabel = A.loc
292+
tolabel.update_label()
293+
break
299294
return 1
300295

301296

code/controllers/subsystems/ticker.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ SUBSYSTEM_DEF(ticker)
241241
if(!H.mind || player_is_antag(H.mind, only_offstation_roles = 1) || !SSjob.ShouldCreateRecords(H.mind.assigned_role))
242242
continue
243243
CreateModularRecord(H)
244-
data_core.manifest()
245244

246245
CHECK_TICK
247246

0 commit comments

Comments
 (0)