Merge pull request #15995 from SandPoot/orbit-jobs
Shows people's jobs on the orbit menu
This commit is contained in:
@@ -587,3 +587,10 @@
|
||||
// blended_color = "#2eeb9a"
|
||||
// pre_asset.Blend(blended_color, ICON_MULTIPLY)
|
||||
// return pre_asset
|
||||
|
||||
/datum/asset/spritesheet/jobs
|
||||
name = "jobs"
|
||||
|
||||
/datum/asset/spritesheet/jobs/register()
|
||||
InsertAll("", 'icons/UI_Icons/tgui/jobs.dmi')
|
||||
..()
|
||||
|
||||
@@ -90,6 +90,14 @@
|
||||
antagonists += list(serialized)
|
||||
break
|
||||
|
||||
var/assignment = "no_id"
|
||||
|
||||
var/obj/item/card/id/card = M.get_idcard()
|
||||
if(card)
|
||||
assignment = "[ckey(card.GetJobName())]"
|
||||
|
||||
serialized["assignment"] = assignment
|
||||
|
||||
if (!was_antagonist)
|
||||
alive += list(serialized)
|
||||
else
|
||||
@@ -107,4 +115,4 @@
|
||||
/datum/orbit_menu/ui_assets()
|
||||
. = ..() || list()
|
||||
. += get_asset_datum(/datum/asset/simple/orbit)
|
||||
|
||||
. += get_asset_datum(/datum/asset/spritesheet/jobs)
|
||||
|
||||
Reference in New Issue
Block a user