shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529

Browse Source 
[MIRROR] changes the null rod's description to reflect its use against clockwork cults
This commit is contained in:
deathride58
2018-01-19 00:32:26 +00:00
committed by GitHub
parent 66c9281b17 a2d7f2064d
commit ca9ce2058e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/holy_weapons.dm
+3 -3
View File
@@ -1,6 +1,6 @@
/obj/item/nullrod /obj/item/nullrod
name = "null rod" 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" icon_state = "nullrod"
item_state = "nullrod" item_state = "nullrod"
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
@@ -300,7 +300,7 @@
hitsound = 'sound/items/bikehorn.ogg' hitsound = 'sound/items/bikehorn.ogg'
sharpness = IS_SHARP sharpness = IS_SHARP
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/nullrod/pride_hammer /obj/item/nullrod/pride_hammer
icon_state = "pride" icon_state = "pride"
name = "Pride-struck Hammer" name = "Pride-struck Hammer"
@@ -311,7 +311,7 @@
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked") attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
hitsound = 'sound/weapons/blade1.ogg' hitsound = 'sound/weapons/blade1.ogg'
/obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) /obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
if(!proximity) if(!proximity)
return return