|
3 | 3 | desc = "a skull of an ancient psionic user, grants a small amount of nulldust when ground up." |
4 | 4 | icon = 'icons/obj/telescience.dmi' |
5 | 5 | icon_state = "null_skull" |
| 6 | + w_class = WEIGHT_CLASS_TINY |
6 | 7 | ///how much nullspace dust does each skull give when used on the psionic awakener |
7 | 8 | var/dust = 5 |
8 | | - w_class = WEIGHT_CLASS_TINY |
9 | 9 |
|
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 |
15 | 13 | cart.nullspace_dust += dust |
16 | 14 | to_chat(user, span_notice("You force the [name] into the psionic awakener's grinding port, crushing it to microscopic pieces.")) |
17 | 15 | qdel(src) |
| 16 | + return |
| 17 | + . = ..() |
18 | 18 |
|
19 | 19 | /obj/item/nullspace_crystal/brilliant |
20 | 20 | name = "fresh null skull" |
21 | 21 | desc = "a fresh skull of a weak psionic user, grants a fair amount of nulldust when ground up." |
22 | | - dust = 10 |
23 | 22 | icon_state = "fresh_null_skull" |
24 | 23 | w_class = WEIGHT_CLASS_TINY |
| 24 | + dust = 10 |
25 | 25 |
|
26 | 26 | /obj/item/nullspace_crystal/prismatic |
27 | 27 | name = "aged null skull" |
28 | 28 | desc = "an older skull of an adept psionic user, grants a lot of nulldust when ground up." |
29 | | - dust = 15 |
30 | 29 | icon_state = "aged_null_skull" |
31 | 30 | w_class = WEIGHT_CLASS_SMALL |
| 31 | + dust = 15 |
32 | 32 |
|
33 | 33 | /obj/item/nullspace_crystal/true |
34 | 34 | name = "living null skull" |
35 | 35 | 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 |
37 | 36 | icon_state = "psionic_null_skull" |
38 | 37 | w_class = WEIGHT_CLASS_NORMAL |
| 38 | + dust = 50 |
39 | 39 |
|
40 | 40 | /obj/effect/spawner/lootdrop/nullspace_crystal_spawner |
41 | 41 | name = "nullskull spawner" |
|
0 commit comments