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

# Conflicts:
#	config/custom_items.txt

2017-11-25 11:35:10 -05:00

..

login.dm

Fluff fix and changed one thing that triggers me

2017-06-12 17:29:20 +02:00

logout.dm

…

new_player_vr.dm

Fixes neutral traits.

2017-10-03 15:28:01 -04:00

new_player.dm

Fixes a game breaking conflict related to disabled polaris trait system

2017-10-17 13:27:20 +03:00

poll.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

preferences_setup.dm

Polaris Sync

2017-11-04 13:37:13 -04:00

skill.dm

…

sprite_accessories_vr.dm

More edits

2017-11-04 13:45:26 -04:00

sprite_accessories.dm

Polaris Sync

2017-11-10 11:37:41 -05:00