From a38dc60466a2fb05baeba9a441e01fa9c3a3a45a Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 18 Jan 2018 17:55:29 -0500 Subject: [PATCH 1/2] Merge pull request #34529 from Xhuis/nullroddesc changes the null rod's description to reflect its use against clockwork cults --- code/game/objects/items/holy_weapons.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index d31d37ee96..4a83a62dac 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -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