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

* Proper custom job name support

* merge (#9552)

Co-authored-by: Tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2021-11-20 21:52:42 +00:00
committed by GitHub
parent 3c58964eb3
commit 532ce4e9ef
8 changed files with 33 additions and 24 deletions
+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."