Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529
[MIRROR] changes the null rod's description to reflect its use against clockwork cults
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/obj/item/nullrod
|
||||
name = "null rod"
|
||||
desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of Nar-Sie's followers."
|
||||
desc = "A rod of pure obsidian; its very presence disrupts and dampens the powers of Nar-Sie and Ratvar's followers."
|
||||
icon_state = "nullrod"
|
||||
item_state = "nullrod"
|
||||
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
|
||||
@@ -300,7 +300,7 @@
|
||||
hitsound = 'sound/items/bikehorn.ogg'
|
||||
sharpness = IS_SHARP
|
||||
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
|
||||
|
||||
/obj/item/nullrod/pride_hammer
|
||||
icon_state = "pride"
|
||||
name = "Pride-struck Hammer"
|
||||
@@ -311,7 +311,7 @@
|
||||
slot_flags = SLOT_BACK
|
||||
attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
|
||||
hitsound = 'sound/weapons/blade1.ogg'
|
||||
|
||||
|
||||
/obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
|
||||
if(!proximity)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user