Merge pull request #36863 from AnturK/unconciousdefine

Prefixes apply_effect flags, fixes unconcious define conflict
This commit is contained in:
Jordan Brown
2018-04-01 01:15:35 -04:00
committed by yogstation13-bot
parent 43f1af6e3a
commit b64a0b0dfd
19 changed files with 48 additions and 48 deletions

View File

@@ -23,7 +23,7 @@
user.do_attack_animation(M)
M.Knockdown(100)
M.apply_effect(STUTTER, 5)
M.apply_effect(EFFECT_STUTTER, 5)
M.visible_message("<span class='danger'>[user] has prodded [M] with [src]!</span>", \
"<span class='userdanger'>[user] has prodded you with [src]!</span>")