killer653 4c4c85a742 Fixes Conflicts

2017-07-26 00:00:51 -04:00

..

login.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

logout.dm

…

new_player_vr.dm

Adds 'Quit This Round' verb for ghosts

2017-06-09 23:05:48 -04:00

new_player.dm

Basically initial working traits

2017-05-29 05:08:25 -04:00

poll.dm

…

preferences_setup.dm

Fixes Runtime in preferences_setup.dm,230: Cannot read null.title

2017-05-25 15:37:43 -04:00

skill.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

sprite_accessories_vr.dm

Fixes Conflicts

2017-07-26 00:00:51 -04:00

sprite_accessories.dm

Merge pull request #3423 from Belsima/ftm

2017-05-29 18:31:18 -05:00