mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 16:07:40 +00:00
push
This commit is contained in:
@@ -587,3 +587,10 @@
|
|||||||
// blended_color = "#2eeb9a"
|
// blended_color = "#2eeb9a"
|
||||||
// pre_asset.Blend(blended_color, ICON_MULTIPLY)
|
// pre_asset.Blend(blended_color, ICON_MULTIPLY)
|
||||||
// return pre_asset
|
// 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)
|
antagonists += list(serialized)
|
||||||
break
|
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)
|
if (!was_antagonist)
|
||||||
alive += list(serialized)
|
alive += list(serialized)
|
||||||
else
|
else
|
||||||
@@ -107,4 +115,4 @@
|
|||||||
/datum/orbit_menu/ui_assets()
|
/datum/orbit_menu/ui_assets()
|
||||||
. = ..() || list()
|
. = ..() || list()
|
||||||
. += get_asset_datum(/datum/asset/simple/orbit)
|
. += get_asset_datum(/datum/asset/simple/orbit)
|
||||||
|
. += get_asset_datum(/datum/asset/spritesheet/jobs)
|
||||||
|
|||||||
BIN
icons/UI_Icons/tgui/jobs.dmi
Normal file
BIN
icons/UI_Icons/tgui/jobs.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
@@ -1,3 +1,4 @@
|
|||||||
|
import { classes } from 'common/react';
|
||||||
import { createSearch } from 'common/string';
|
import { createSearch } from 'common/string';
|
||||||
import { multiline } from 'common/string';
|
import { multiline } from 'common/string';
|
||||||
import { resolveAsset } from '../assets';
|
import { resolveAsset } from '../assets';
|
||||||
@@ -62,6 +63,18 @@ const OrbitedButton = (props, context) => {
|
|||||||
onClick={() => act("orbit", {
|
onClick={() => act("orbit", {
|
||||||
ref: thing.ref,
|
ref: thing.ref,
|
||||||
})}>
|
})}>
|
||||||
|
{thing.assignment && (
|
||||||
|
<Box inline ml={1}>
|
||||||
|
<Box
|
||||||
|
className={classes([
|
||||||
|
'jobs8x8',
|
||||||
|
thing.assignment,
|
||||||
|
])}
|
||||||
|
style={{
|
||||||
|
transform: 'scale(1.5) translate(-50%, 0)',
|
||||||
|
}} />
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
{thing.name}
|
{thing.name}
|
||||||
{thing.orbiters && (
|
{thing.orbiters && (
|
||||||
<Box inline ml={1}>
|
<Box inline ml={1}>
|
||||||
|
|||||||
Reference in New Issue
Block a user