Arokha Sieyes 1ad97486d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-030217sync ...

# Conflicts:
#	code/modules/organs/organ_icon.dm

2017-03-03 19:39:56 -05: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

Force having OOC notes set to spawn

2016-10-17 23:25:07 -07:00

new_player.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

poll.dm

…

preferences_setup.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

skill.dm

Polaris Sync October 9th (#633)

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

sprite_accessories_vr.dm

Github client didn't save this.

2017-01-22 10:47:53 -05:00

sprite_accessories.dm

Revert "BlockHeadHair doesn't make players bald."

2017-03-03 17:19:07 -06:00