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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	config/custom_items.txt

2016-12-07 12:22:48 -05:00

..

appearance

Adds Synthetic Zeng-Hu brand Tajaran tail as a custom tail.

2016-10-11 15:28:48 -03:00

eating

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

2016-12-07 12:22:48 -05:00

fluffstuff

Actually working fluff for the gloves, zippo, jacket and beret

2016-11-27 19:46:03 +01:00

resizing

Fixed borg resize and added Generals and Dragons Limbs

2016-12-04 02:43:52 +01: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

…