Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit e252711

Browse files
committed
f
1 parent f590cf2 commit e252711

File tree

3 files changed

+53
-7
lines changed

3 files changed

+53
-7
lines changed

code/modules/psionics/mob/mob_assay.dm

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,34 @@
8989

9090
/datum/psi_complexus/ui_data(mob/user)
9191
var/list/data = list()
92+
var/use_rating
93+
var/effective_rating = rating
94+
if(effective_rating > 1 && suppressed)
95+
effective_rating = max(0, rating-2)
96+
var/rating_descriptor
97+
if(!use_rating)
98+
switch(effective_rating)
99+
if(1)
100+
use_rating = "[effective_rating]-Epsilon"
101+
rating_descriptor = "This indicates the presence of minor latent psi potential with little or no operant capabilities."
102+
if(2)
103+
use_rating = "[effective_rating]-Delta"
104+
rating_descriptor = "This indicates the presence of minor psi capabilities of the Operant rank or higher."
105+
if(3)
106+
use_rating = "[effective_rating]-Gamma"
107+
rating_descriptor = "This indicates the presence of psi capabilities of the Master rank or higher."
108+
if(4)
109+
use_rating = "[effective_rating]-Beta"
110+
rating_descriptor = "This indicates the presence of significant psi capabilities of the Grandmaster rank or higher."
111+
if(5)
112+
use_rating = "[effective_rating]-Alpha"
113+
rating_descriptor = "This indicates the presence of major psi capabilities of the Paramount rank or higher."
114+
else
115+
use_rating = "[effective_rating]-Lambda"
116+
rating_descriptor = "This indicates the presence of trace latent psi capabilities."
117+
118+
data["use_rating"] = use_rating
119+
data["rating_descriptor"] = rating_descriptor
92120
data["faculties"] = list()
93121
for(var/faculty_id in ranks)
94122
var/list/check_powers = get_powers_by_faculty(faculty_id)

tgui/packages/tgui/interfaces/PsionicComplexus.tsx

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ type Data = {
77
antag_name: string;
88
loud: boolean;
99
faculties: Psi_Faculty[];
10+
use_rating: string;
11+
rating_descriptor: string;
1012
};
1113

1214
type User = {
@@ -32,11 +34,24 @@ type Psi_Faculty = {
3234

3335
export const PsionicComplexus = (props, context) => {
3436
const { data } = useBackend<Data>(context);
35-
const { faculties = [] } = data;
37+
const { faculties = [], use_rating, rating_descriptor } = data;
3638
return (
3739
<Window width={620} height={500}>
3840
<Window.Content scrollable>
39-
{faculties.map(faculty => (
41+
<Stack vertical>
42+
<Stack.Item>
43+
<Section>
44+
<h1>
45+
{
46+
"Psi-Rating: " + use_rating
47+
}
48+
</h1>
49+
50+
</Section>
51+
52+
</Stack.Item>
53+
<Stack.Item>
54+
{faculties.map(faculty => (
4055
<Section title={faculty.name} key={faculty.name}>
4156
{faculty.powers.map(power => (
4257
<Collapsible
@@ -49,7 +64,10 @@ export const PsionicComplexus = (props, context) => {
4964
))}
5065
</Section>
5166

52-
))}
67+
))}
68+
</Stack.Item>
69+
</Stack>
70+
5371
</Window.Content >
5472
</Window >
5573
);

yogstation/code/game/objects/items/stacks/sheets/nullspace_crystals.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "null skull"
33
desc = "a skull of an ancient psionic user, grants a small amount of nulldust when ground up."
44
icon = 'icons/obj/telescience.dmi'
5-
icon_state = "nullskull"
5+
icon_state = "null_skull"
66
///how much nullspace dust does each skull give when used on the psionic awakener
77
var/dust = 5
88
w_class = WEIGHT_CLASS_TINY
@@ -20,21 +20,21 @@
2020
name = "fresh null skull"
2121
desc = "a fresh skull of a weak psionic user, grants a fair amount of nulldust when ground up."
2222
dust = 10
23-
icon_state = "fresh_nullskull"
23+
icon_state = "fresh_null_skull"
2424
w_class = WEIGHT_CLASS_TINY
2525

2626
/obj/item/nullspace_crystal/prismatic
2727
name = "aged null skull"
2828
desc = "an older skull of an adept psionic user, grants a lot of nulldust when ground up."
2929
dust = 20
30-
icon_state = "aged_nullskull"
30+
icon_state = "aged_null_skull"
3131
w_class = WEIGHT_CLASS_SMALL
3232

3333
/obj/item/nullspace_crystal/true
3434
name = "living null skull"
3535
desc = "a pitch black skull of a powerful psionic user, looking into it's eye sockets make your cerebellum burn. Grants a huge boon of nulldust when ground up."
3636
dust = 50
37-
icon_state = "nullskull"
37+
icon_state = "psionic_null_skull"
3838
w_class = WEIGHT_CLASS_NORMAL
3939

4040
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner

0 commit comments

Comments
 (0)