Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactors crew records #72725

Merged
merged 76 commits into from Jan 24, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
457e757
initial
jlsnow301 Jan 15, 2023
20c2db0
defaults
jlsnow301 Jan 15, 2023
22cb219
commas
jlsnow301 Jan 15, 2023
fadd72e
crimecounter
jlsnow301 Jan 15, 2023
034bdda
ninjad
jlsnow301 Jan 15, 2023
e047a93
crimes
jlsnow301 Jan 15, 2023
2b2666c
filing cabinets
jlsnow301 Jan 15, 2023
5fe57df
stopping for now
jlsnow301 Jan 15, 2023
de84e6a
oop
jlsnow301 Jan 15, 2023
87e3f85
medical records ui
jlsnow301 Jan 15, 2023
c53ad69
note keeper
jlsnow301 Jan 16, 2023
a8c3ffb
Update code/datums/records/record.dm
jlsnow301 Jan 16, 2023
5e5a079
Update code/datums/records/record.dm
jlsnow301 Jan 16, 2023
e007e2c
Update code/datums/records/record.dm
jlsnow301 Jan 16, 2023
e464ad4
Update code/datums/records/record.dm
jlsnow301 Jan 16, 2023
be06672
Update code/datums/records/crime.dm
jlsnow301 Jan 16, 2023
4495755
note keeper
jlsnow301 Jan 16, 2023
3e3e4f2
sec ui begin
jlsnow301 Jan 16, 2023
53ee345
security
jlsnow301 Jan 18, 2023
166f7ef
printing
jlsnow301 Jan 18, 2023
3d88980
access
jlsnow301 Jan 18, 2023
a4e1603
access
jlsnow301 Jan 18, 2023
93c87a5
false
jlsnow301 Jan 18, 2023
99f6884
bugs
jlsnow301 Jan 18, 2023
ef01766
printing
jlsnow301 Jan 18, 2023
0ec0b56
printing works
jlsnow301 Jan 19, 2023
fbeedc6
warrants
jlsnow301 Jan 19, 2023
7460017
Merge remote-tracking branch 'upstream' into records-pr
jlsnow301 Jan 19, 2023
c138845
auth med
jlsnow301 Jan 19, 2023
6cc07bc
note
jlsnow301 Jan 19, 2023
f74874d
var proc argument
jlsnow301 Jan 19, 2023
0c3670a
locked for
jlsnow301 Jan 19, 2023
bfa6765
silicon sec
jlsnow301 Jan 19, 2023
e36f964
station time
jlsnow301 Jan 19, 2023
2eca94a
cleanup
jlsnow301 Jan 19, 2023
20cc602
Merge branch 'master' into records-pr
jlsnow301 Jan 19, 2023
60f6157
better appearance handling?
jlsnow301 Jan 20, 2023
1646a61
paroled
jlsnow301 Jan 20, 2023
5e966f3
name searching + error messages
jlsnow301 Jan 20, 2023
08fd76f
better icons
jlsnow301 Jan 20, 2023
ae71d8f
Merge remote-tracking branch 'upstream' into records-pr
jlsnow301 Jan 20, 2023
500f362
job
jlsnow301 Jan 20, 2023
f3aeaf8
cleaner search
jlsnow301 Jan 20, 2023
6c1fe11
thematic previews + logging
jlsnow301 Jan 20, 2023
048d283
unused
jlsnow301 Jan 20, 2023
f5f7a7f
Merge branch 'master' into records-pr
jlsnow301 Jan 20, 2023
4f9c7af
better security printing
jlsnow301 Jan 21, 2023
a9885b6
"wanted for"
jlsnow301 Jan 21, 2023
01b188a
fixes hud issue
jlsnow301 Jan 21, 2023
fe7b396
Merge branch 'master' into records-pr
jlsnow301 Jan 21, 2023
aabe026
cleans up huds
jlsnow301 Jan 22, 2023
24bf0a8
Merge branch 'records-pr' of https://github.com/jlsnow301/tgstation i…
jlsnow301 Jan 22, 2023
34228f1
fixes security icons
jlsnow301 Jan 22, 2023
94c94e9
Merge branch 'master' into records-pr
jlsnow301 Jan 22, 2023
711fc74
cc cdr
jlsnow301 Jan 22, 2023
d5fd2db
Merge branch 'master' into records-pr
jlsnow301 Jan 22, 2023
418926b
new note handling
jlsnow301 Jan 22, 2023
7b2a1ab
Merge branch 'master' into records-pr
jlsnow301 Jan 22, 2023
46dc33a
cleanup
jlsnow301 Jan 22, 2023
c3676a1
cleanup
jlsnow301 Jan 22, 2023
a81eb1d
editing, deleting
jlsnow301 Jan 23, 2023
9026ed6
Merge branch 'master' into records-pr
jlsnow301 Jan 23, 2023
a3a97ba
photo upload. what could go wrong
jlsnow301 Jan 23, 2023
41ecc6d
bugfix
jlsnow301 Jan 23, 2023
c96293f
no lock search
jlsnow301 Jan 23, 2023
6d42bb6
stopping point
jlsnow301 Jan 23, 2023
b4550b3
create new record
jlsnow301 Jan 23, 2023
8e8da40
Merge branch 'master' into records-pr
jlsnow301 Jan 23, 2023
2e6a6fa
fixes buttons on tabs
jlsnow301 Jan 23, 2023
5f1b342
bugfix - preview refs
jlsnow301 Jan 24, 2023
4895562
individual views - fixes multiple viewers
jlsnow301 Jan 24, 2023
6262ec5
Merge branch 'master' into records-pr
jlsnow301 Jan 24, 2023
8b3c184
filing cabinets, cleanup
jlsnow301 Jan 24, 2023
5034094
naming
jlsnow301 Jan 24, 2023
472c210
Merge branch 'master' into records-pr
jlsnow301 Jan 24, 2023
3af1ff4
undocced var?
jlsnow301 Jan 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/__HELPERS/_lists.dm
Expand Up @@ -639,10 +639,10 @@
i++
return i

/// Returns datum/data/record
/// Returns datum/record
/proc/find_record(field, value, list/inserted_list)
for(var/datum/data/record/record_to_check in inserted_list)
if(record_to_check.fields[field] == value)
for(var/datum/record/crew/record_to_check in inserted_list)
if(record_to_check[field] == value)
return record_to_check
return null

Expand Down
8 changes: 4 additions & 4 deletions code/__HELPERS/cmp.dm
Expand Up @@ -17,11 +17,11 @@
return sorttext(a.name, b.name)

GLOBAL_VAR_INIT(cmp_field, "name")
/proc/cmp_records_asc(datum/data/record/a, datum/data/record/b)
return sorttext(b.fields[GLOB.cmp_field], a.fields[GLOB.cmp_field])
/proc/cmp_records_asc(datum/record/a, datum/record/b)
return sorttext(b[GLOB.cmp_field], a[GLOB.cmp_field])

/proc/cmp_records_dsc(datum/data/record/a, datum/data/record/b)
return sorttext(a.fields[GLOB.cmp_field], b.fields[GLOB.cmp_field])
/proc/cmp_records_dsc(datum/record/a, datum/record/b)
return sorttext(a[GLOB.cmp_field], b[GLOB.cmp_field])

// Datum cmp with vars is always slower than a specialist cmp proc, use your judgement.
/proc/cmp_datum_numeric_asc(datum/a, datum/b, variable)
Expand Down
4 changes: 2 additions & 2 deletions code/__HELPERS/names.dm
Expand Up @@ -176,8 +176,8 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex)
var/locations = strings(LOCATIONS_FILE, "locations")

var/list/names = list()
for(var/datum/data/record/t in GLOB.data_core.general)//Picks from crew manifest.
names += t.fields["name"]
for(var/datum/record/crew/target in GLOB.data_core.general)//Picks from crew manifest.
names += target.name

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

Expand Down
6 changes: 3 additions & 3 deletions code/__HELPERS/records.dm
@@ -1,6 +1,6 @@

/proc/overwrite_field_if_available(datum/data/record/base, datum/data/record/other, field_name)
if(other.fields[field_name])
base.fields[field_name] = other.fields[field_name]
/proc/overwrite_field_if_available(datum/record/base, datum/record/other, field_name)
if(other[field_name])
base[field_name] = other[field_name]


5 changes: 2 additions & 3 deletions code/_globalvars/lists/mobs.dm
Expand Up @@ -110,9 +110,8 @@ GLOBAL_LIST_INIT(construct_radial_images, list(

/proc/get_crewmember_minds()
var/list/minds = list()
for(var/data in GLOB.data_core.locked)
var/datum/data/record/record = data
var/datum/mind/mind = record.fields["mindref"]
for(var/datum/record/locked/record as anything in GLOB.data_core.locked)
var/datum/mind/mind = record.mindref
if(mind)
minds += mind
return minds