Leshana 4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24 ...

# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm

2018-02-24 13:19:10 -05:00

..

01_ui.dm

…

02_settings.dm

Two bugfixes

2017-01-17 04:11:57 -05:00

03_pai.dm

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

04_communicators.dm

…

05_ooc.dm

Comments out ignore and unignoring in character setup, properly removes ability to ignore yourself

2016-05-13 01:16:44 +01:00

06_media.dm

Implements browser streaming media jukeboxes

2017-03-23 21:10:11 -04:00

setting_datums.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24

2018-02-24 13:19:10 -05:00