From 403c49afab591cac232048410fd1d24a36a23d72 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Fri, 4 Aug 2023 00:11:08 -0300 Subject: [PATCH] push --- code/modules/asset_cache/asset_list_items.dm | 7 +++++++ code/modules/mob/dead/observer/orbit.dm | 10 +++++++++- icons/UI_Icons/tgui/jobs.dmi | Bin 0 -> 1115 bytes tgui/packages/tgui/interfaces/Orbit.js | 13 +++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 icons/UI_Icons/tgui/jobs.dmi diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 631f0c3e4f..be6850a7f7 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -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') + ..() diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index b799c5e592..ea70227864 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -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.get_job_name())]" + + 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) diff --git a/icons/UI_Icons/tgui/jobs.dmi b/icons/UI_Icons/tgui/jobs.dmi new file mode 100644 index 0000000000000000000000000000000000000000..207f11afed1faccd981fe0c5f66948d0edc59029 GIT binary patch literal 1115 zcmV-h1f=_kP)TaYe9XYTbI0?*!_b5 z0D4?6$^gpC006OuME@`U{{a6}Q&SHQ4*&oFhlhs~Np&eHDKj%ONv3>*00001bW%=J z06^y0W&i*IV|r9rbVOxyV{&P5bZKvH004NLl~ucL!!Qh-?XNJBy=Z|BUAhzriVV#! z6pTb$Y%I~G=otC?Di3rk#BQ{3KJj=*d)>Wl-*@|N^Ra7BD495Quif**W7{m`HI#>! zwh2f>&}*F)6ic;oFey-4wT&mq<>aYtdVz?y`WF`vJoi)K=9F-(;$0x@F%6UurHU5J z2;xFPp;NBEaHWsv$-&5dPtI`3O+rRD3+cHE|DHh_EKZ%QYuA{P*kb#EQW!2iiY zfL>$Cfx&~3mpWmjSQi61m$^eSY<)?d<5;&ysC-}zD&}-d79EK{$^V5~cia8u`qTIU z-O<@Ozu?ge0006yNkl9K#?$dd3Uxykr$-o0flwXb< z?`z$OhD7EJX&)mSFsbxlksBAWjlHzKhbed1vH{wAZKun>0C2#Dml^w2)}#<(swXm=>S)n zE49q<)btZz8K(LE?^xenbhNB1n%rw^embyHx;3y~ue(lOvglTQ5A^-Y0G&>rk^wNs zj^Y6(K#Xj2e+4iD6dx=C_|<7?Qrr`;jHS3Q%pQLK={g{lq*ef_Y3N@>n-xZZbp+FBCJiesy~hl&1-1^*Q(%)b*oSj~Ik-S-1fb)}fRE@) zN`MvwSCUpfz?HP6qc6!awzZsM;zt1+Z{!y&}X+l(f0e3 zR495lNalqG?Y_a`n2AZ8Ff7C_8^ z69MrS#`Qq|835Lc^dNRVd_LAN(y}(R5H7TQex=F&rm1dY(&kQUE`OoVWxUbG>qGB_ z7$KfFjHA47q787rV+H^o!YDu+lQwrD6tKO^@Q6SvDP<6E%w { onClick={() => act("orbit", { ref: thing.ref, })}> + {thing.assignment && ( + + + + )} {thing.name} {thing.orbiters && (