Merge remote-tracking branch 'upstream/master' into hit-reactions

This commit is contained in:
Fox-McCloud
2016-07-07 22:50:53 -04:00
899 changed files with 8338 additions and 8181 deletions
@@ -19,7 +19,7 @@
to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
user.take_organ_damage(5,5)
active = !active
if (active)
if(active)
force = force_on
throwforce = throwforce_on
hitsound = 'sound/weapons/blade1.ogg'