cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Proper custom job name support [MDB IGNORE] (#9547)

Browse Source 
* Proper custom job name support

* merge (#9552)

Co-authored-by: Tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2021-11-20 22:52:42 +01:00
committed by GitHub
co-authored by Tastyfish
parent 3c58964eb3
commit 532ce4e9ef
8 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/crew.dm
+3 -1
View File
@@ -235,7 +235,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
if (id_card)
entry["name"] = id_card.registered_name
entry["assignment"] = id_card.assignment
entry["ijob"] = jobs[id_card.assignment] //SKYRAT EDIT - ALTERNATE JOB TITLES
var/trim_assignment = id_card.get_trim_assignment()
if (jobs[trim_assignment])
entry["ijob"] = jobs[trim_assignment]
// Binary living/dead status
if (sensor_mode >= SENSOR_LIVING)
code/game/machinery/computer/security.dm
+4 -2
View File
@@ -341,6 +341,7 @@
<tr><td>Age:</td><td><A href='?src=[REF(src)];choice=Edit Field;field=age'>&nbsp;[active1.fields["age"]]&nbsp;</A></td></tr>"}
dat += "<tr><td>Species:</td><td><A href ='?src=[REF(src)];choice=Edit Field;field=species'>&nbsp;[active1.fields["species"]]&nbsp;</A></td></tr>"
dat += {"<tr><td>Rank:</td><td><A href='?src=[REF(src)];choice=Edit Field;field=rank'>&nbsp;[active1.fields["rank"]]&nbsp;</A></td></tr>
<tr><td>Initial Rank:</td><td>[active1.fields["initial_rank"]]</td>
<tr><td>Fingerprint:</td><td><A href='?src=[REF(src)];choice=Edit Field;field=fingerprint'>&nbsp;[active1.fields["fingerprint"]]&nbsp;</A></td></tr>
<tr><td>Physical Status:</td><td>&nbsp;[active1.fields["p_stat"]]&nbsp;</td></tr>
<tr><td>Mental Status:</td><td>&nbsp;[active1.fields["m_stat"]]&nbsp;</td></tr>
@@ -711,6 +712,8 @@ What a mess.*/
G.fields["name"] = "New Record"
G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]"
G.fields["rank"] = "Unassigned"
G.fields["trim"] = "Unassigned"
G.fields["initial_rank"] = "Unassigned"
G.fields["gender"] = "Male"
G.fields["age"] = "Unknown"
G.fields["species"] = "Human"
@@ -947,8 +950,7 @@ What a mess.*/
if("Change Rank")
if(active1)
active1.fields["rank"] = strip_html(href_list["rank"])
if(href_list["rank"] in SSjob.station_jobs)
active1.fields["real_rank"] = href_list["real_rank"]
active1.fields["trim"] = active1.fields["rank"]
if("Change Criminal Status")
if(active2)
code/game/objects/items/cards_ids.dm
+13
View File
@@ -613,6 +613,10 @@
name = "[name_string][assignment_string]"
/// Returns the trim assignment name.
/obj/item/card/id/proc/get_trim_assignment()
return trim?.assignment || assignment
/obj/item/card/id/away
name = "\proper a perfectly generic identification card"
desc = "A perfectly generic identification card. Looks like it could use some flavor."
@@ -805,6 +809,15 @@
. += mutable_appearance(trim_icon_file, trim_icon_state)
/obj/item/card/id/advanced/get_trim_assignment()
if(trim_assignment_override)
return trim_assignment_override
else if(ispath(trim))
var/datum/id_trim/trim_singleton = SSid_access.trim_singletons_by_path[trim]
return trim_singleton.assignment
return ..()
/obj/item/card/id/advanced/silver
name = "silver identification card"
desc = "A silver card which shows honour and dedication."