Merge branch 'master' into development

# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	html/changelogs/.all_changelog.yml
This commit is contained in:
skull132
2017-01-07 13:55:12 +02:00
16 changed files with 231 additions and 21 deletions
@@ -1101,6 +1101,7 @@
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(C, pick(NORTH,SOUTH,EAST,WEST))
..()
//Silver
/datum/chemical_reaction/slime/bork