Kelshark 36aedc2c82 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/taurs_vr.dmi

2016-10-07 14:24:55 -04:00

..

appearance

Adds tailmaw and feline taur half (#609)

2016-10-01 02:25:06 -04:00

eating

Fix micro vore spacing prey (#615)

2016-10-01 13:25:52 -04:00

fluffstuff

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2016-10-07 14:24:55 -04:00

resizing

Cyborgs can no longer use OOC resize (#566)

2016-09-18 22:56:05 -04:00

weight

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2016-10-07 14:24:55 -04:00

hook-defs_vr.dm

…

trycatch_vr.dm

…