ayyy merge conflicts fix

This commit is contained in:
Aurorablade
2016-02-02 20:46:38 -05:00
parent 25876fd036
commit 6001f3d80c
12 changed files with 134 additions and 121 deletions
@@ -236,7 +236,7 @@
if (germ_level > INFECTION_LEVEL_ONE)
if(prob(1))
owner << "\red Your skin itches."
owner << "<span class='warning'> Your skin itches.</span>"
if (germ_level > INFECTION_LEVEL_TWO)
if(prob(1))
spawn owner.vomit()