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

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-03-station.dmm

2017-09-18 18:46:15 -04:00

..

appearance

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

2017-09-18 18:46:15 -04:00

eating

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

2017-09-18 18:46:15 -04:00

fluffstuff

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

2017-09-18 18:46:15 -04:00

persist

Persistent size between rounds

2017-06-16 09:41:34 -04:00

resizing

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

2017-09-18 18:46:15 -04:00

weight

…

hook-defs_vr.dm

Enables round-to-round persistence of a few aspects of characters.

2017-04-04 07:33:09 -04:00

trycatch_vr.dm

…