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

Merge remote-tracking branch 'origin/just-in-case'

Browse Source 
# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.
This commit is contained in:
skull132
2016-01-28 01:32:20 +02:00
parent a37f6c05f4 30ecef95ed
commit 205ed7ed42
19 changed files with 997 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/weaponry.dm
+5
View File
@@ -65,6 +65,11 @@
else
user.visible_message("\red [user]'s concentration is broken!", "\red Your concentration is broken! You and your target need to stay uninterrupted for longer!")
return
else if(M.mind && M.mind.vampire)
if(!(VAMP_FULL in M.mind.vampire.powers))
user << "\red The rod burns cold in your hand, filling you with grim determination. You feel the creature's power weaken."
M << "<span class='warning'>The nullrod's power interferes with your own! They are on to you!</span>"
M.mind.vampire.nullified = max(8, M.mind.vampire.nullified + 8)
else if(prob(10))
user << "<span class='danger'>The rod slips in your hand.</span>"
..()