Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

login_vr.dm

Changed the logon splash screen to be V.O.R.E. logo.

2016-05-20 19:33:39 -04:00

login.dm

Adds Mockingjay00's title screen.

2015-11-26 11:33:16 -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

Force having OOC notes set to spawn

2016-10-17 23:25:07 -07: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

Adds Floorlength Braid back (#519)

2016-08-26 18:59:40 -04:00

sprite_accessories.dm

Adds shaved short hair and five o'clock shadow beard

2016-10-21 18:41:39 -05:00