cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-27 22:57:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Mosley
2024-12-05 16:49:03 -05:00
parent 836b41f997 51b854d788
commit dedc5aef94
8 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/datacore.dm
+6 -11
View File
@@ -142,18 +142,14 @@
var/static/list/show_directions = list(SOUTH, WEST)
if(H.mind && (H.mind.assigned_role != H.mind.special_role) && (H.mind.assigned_role != "Stowaway"))
var/assignment
var/displayed_rank
if(H.mind.assigned_role)
assignment = H.mind.assigned_role
else if(H.job)
assignment = H.job
else
assignment = "Unassigned"
if(C && C.prefs && C.prefs.alt_titles_preferences[assignment])
assignment = C.prefs.alt_titles_preferences[assignment]
if(assignment)
displayed_rank = C.prefs.alt_titles_preferences[assignment]
if(C && C.prefs && C.prefs.alt_titles_preferences[assignment])
assignment = C.prefs.alt_titles_preferences[assignment]
var/static/record_id_num = 1001
var/id = num2hex(record_id_num++,6)
@@ -176,10 +172,8 @@
var/datum/data/record/G = new()
G.fields["id"] = id
G.fields["name"] = H.real_name
if(!displayed_rank)
G.fields["rank"] = assignment
else
G.fields["rank"] = "[displayed_rank], [assignment]"
G.fields["rank"] = assignment
G.fields["real_rank"] = GetJobName(assignment)
G.fields["age"] = H.age
G.fields["species"] = H.dna.species.name
G.fields["fingerprint"] = md5(H.dna.uni_identity)
@@ -226,7 +220,8 @@
var/datum/data/record/L = new()
L.fields["id"] = md5("[H.real_name][H.mind.assigned_role]") //surely this should just be id, like the others?
L.fields["name"] = H.real_name
L.fields["rank"] = displayed_rank
L.fields["rank"] = assignment
L.fields["real_rank"] = GetJobName(assignment)
L.fields["age"] = H.age
if(H.gender == MALE)
G.fields["gender"] = "Male"
code/datums/world_topic.dm
+1 -1
View File
@@ -26,7 +26,7 @@
var/require_comms_key = FALSE
/datum/world_topic/proc/TryRun(list/input, addr)
key_valid = config && (CONFIG_GET(string/comms_key) == input["key"])
key_valid = (CONFIG_GET(string/comms_key) == input["key"]) && CONFIG_GET(string/comms_key) && input["key"]
if(require_comms_key && !key_valid)
return "Bad Key"
input -= "key"