Repede 123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm

2018-07-08 11:38:06 -04:00

..

appearance

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

2018-06-29 09:58:53 -04:00

eating

Use rust-g to optimize saving of vore persistent settings if available.

2018-06-17 19:11:17 -04:00

fluffstuff

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

2018-07-08 11:38:06 -04:00

persist

…

resizing

Added highlight to crushing/grabbing/disarming with feet

2018-05-14 11:58:15 +10:00

weight

…

hook-defs_vr.dm

…

trycatch_vr.dm

…