Verkister 2492e7dbf5 Merge remote-tracking branch 'remotes/origin/master' into blehh2sparkbooger ...

# Conflicts:
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	icons/mob/human_races/markings_vr.dmi

2017-07-27 02:21:53 +03:00

..

appearance

Merge remote-tracking branch 'remotes/origin/master' into blehh2sparkbooger

2017-07-27 02:21:53 +03:00

eating

Merge remote-tracking branch 'remotes/origin/master' into blehh2sparkbooger

2017-07-27 02:21:53 +03:00

fluffstuff

Fixes conflict

2017-07-25 08:58:36 -04:00

persist

Persistent size between rounds

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

resizing

Update resize_vr.dm

2017-07-17 01:12:20 -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

…