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

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml

2017-04-10 20:41:18 -04:00

..

air_traffic.dm

…

loremaster.dm

…

organizations_vr.dm

One more busy_space change

2017-03-18 01:16:45 -04:00

organizations.dm

Fix the runtime on server boot caused by uninitialized using_map

2017-04-09 16:12:47 -04:00