Fixing conflicts

This commit is contained in:
Qustinnus
2017-07-19 11:19:52 +02:00
parent 58e5aa91da
commit 2312ff09be
14 changed files with 110 additions and 4 deletions
@@ -52,6 +52,7 @@
M.SetUnconscious(0, 0)
M.silent = 0
M.dizziness = 0
M.disgust = 0
M.drowsyness = 0
M.stuttering = 0
M.slurring = 0