There's something wrong with this function, when you moved out of the core's code. The 'skip' variable is created (as global), but not used back in the function's caller. Not sure if this will break anything, but maybe you can take a look Jiyambi, since that was a function your changed recently.

Edit: in cataclysm branch

Yes indeed, I will fix that. But tomorrow, not tonight - had homework due two hours ago and still not done with it!

I fixed it, I think.