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

Commit 88f91db

Browse files
committed
changes
1 parent 401a319 commit 88f91db

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

icons/obj/telescience.dmi

-1.66 KB
Binary file not shown.

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@
33
desc = "a skull of an ancient psionic user, grants a small amount of nulldust when ground up."
44
icon = 'icons/obj/telescience.dmi'
55
icon_state = "null_skull"
6+
w_class = WEIGHT_CLASS_TINY
67
///how much nullspace dust does each skull give when used on the psionic awakener
78
var/dust = 5
8-
w_class = WEIGHT_CLASS_TINY
99

10-
11-
/obj/item/nullspace_crystal/afterattack(obj/machinery/I, mob/user, proximity)
12-
. = ..()
13-
if(istype(I, /obj/machinery/psionic_awakener))
14-
var/obj/machinery/psionic_awakener/cart = I
10+
/obj/item/nullspace_crystal/attack_atom(atom/attacked_atom, mob/living/user, params)
11+
if(istype(attacked_atom, /obj/machinery/psionic_awakener))
12+
var/obj/machinery/psionic_awakener/cart = attacked_atom
1513
cart.nullspace_dust += dust
1614
to_chat(user, span_notice("You force the [name] into the psionic awakener's grinding port, crushing it to microscopic pieces."))
1715
qdel(src)
16+
return
17+
. = ..()
1818

1919
/obj/item/nullspace_crystal/brilliant
2020
name = "fresh null skull"
2121
desc = "a fresh skull of a weak psionic user, grants a fair amount of nulldust when ground up."
22-
dust = 10
2322
icon_state = "fresh_null_skull"
2423
w_class = WEIGHT_CLASS_TINY
24+
dust = 10
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."
29-
dust = 15
3029
icon_state = "aged_null_skull"
3130
w_class = WEIGHT_CLASS_SMALL
31+
dust = 15
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."
36-
dust = 50
3736
icon_state = "psionic_null_skull"
3837
w_class = WEIGHT_CLASS_NORMAL
38+
dust = 50
3939

4040
/obj/effect/spawner/lootdrop/nullspace_crystal_spawner
4141
name = "nullskull spawner"

0 commit comments

Comments
 (0)