Skip to content

Commit 5977e61

Browse files
author
Ava
committed
Return null rod functionality and make it compile
1 parent cf5b3f6 commit 5977e61

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

code/game/gamemodes/cult/runes/_rune.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
return
138138

139139
/// Applies unique effects to a talisman created by this rune before the rune is destroyed.
140-
/obj/effect/rune/proc/apply_to_talisman(obj/item/paper/newtalisman/T)
140+
/obj/effect/rune/proc/apply_to_talisman(obj/item/paper/talisman/T)
141141
return
142142

143143
/// "Random" rune with no function, used for generating spooky runes in mapgen.

code/game/gamemodes/cult/runes/teleport.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
visible_message(SPAN_DANGER("\The [src] emit\s a burst of red light!"))
5151
T.visible_message(SPAN_DANGER("\The [src] emit\s a burst of red light!"))
5252

53-
/obj/effect/rune/teleport/apply_to_talisman(obj/item/paper/newtalisman/T)
53+
/obj/effect/rune/teleport/apply_to_talisman(obj/item/paper/talisman/T)
5454
var/obj/item/paper/talisman/teleport/TP = T
5555
TP.key_word = key_word

code/game/objects/items/weapons/weaponry.dm

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,21 @@
4444
M.visible_message("<span class='danger'>\The [user] waves \the [src] over \the [M]'s head.</span>")
4545
return
4646

47+
/obj/item/nullrod/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
48+
if (!proximity_flag)
49+
return
50+
if (isfloor(target))
51+
user.visible_message(
52+
SPAN_NOTICE("\The [user] taps \the [src] against \the [target]."),
53+
SPAN_NOTICE("You tap \the [src] against \the [target].")
54+
)
55+
for (var/obj/effect/rune/R in range(4, get_turf(target)))
56+
if (R.invisibility == SEE_INVISIBLE_CULT)
57+
R.invisibility = 0
58+
R.alpha = 255
59+
R.visible_message(SPAN_WARNING("\A [src] appears to the [dir2text(get_dir(R, target))]!"))
60+
user.setClickCooldown(2 SECONDS)
61+
4762
/obj/item/energy_net
4863
name = "energy net"
4964
desc = "It's a net made of green energy."

code/modules/antagonist/station/cultist.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ var/global/datum/antagonist/cultist/cult
4848
var/list/english_words = list(CULT_WORD_BLOOD, CULT_WORD_DESTROY, CULT_WORD_HELL, CULT_WORD_HIDE, CULT_WORD_JOIN, CULT_WORD_OTHER, CULT_WORD_SELF, CULT_WORD_SEE, CULT_WORD_TECHNOLOGY, CULT_WORD_TRAVEL)
4949
var/list/cult_words = list(CULT_WORD_BALAQ, CULT_WORD_CERTUM, CULT_WORD_EGO, CULT_WORD_GEERI, CULT_WORD_IRE, CULT_WORD_KARAZET, CULT_WORD_JATKAA, CULT_WORD_MGAR, CULT_WORD_NAHLIZET, CULT_WORD_VERI)
5050

51+
/// A list of all runes in the game world.
52+
var/list/all_runes
53+
5154
/datum/antagonist/cultist/New()
5255
..()
5356
cult = src

0 commit comments

Comments
 (0)