cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 04:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict fix.

Browse Source
This commit is contained in:
Segrain
2013-10-21 04:37:28 +03:00
parent 398e3c8099 07c4560ded
commit 121b10b16c
13 changed files with 426 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/projectiles/guns/energy/special.dm
View File

@@ -63,6 +63,15 @@ obj/item/weapon/gun/energy/staff
update_icon()
return
click_empty(mob/user = null)
if (user)
user.visible_message("*fizzle*", "\red <b>*fizzle*</b>")
else
src.visible_message("*fizzle*")
playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 1)
/obj/item/weapon/gun/energy/staff/animate
name = "staff of animation"
desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."