Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 ...

# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#

2018-01-09 14:40:09 -05:00

..

01_basic.dm

Polaris sync

2017-10-27 15:30:24 -04:00

02_language.dm

Fix exploit allowing choosing unlimited languages on character setup.

2018-01-04 20:52:35 -05:00

03_body.dm

Polaris Sync

2017-11-04 13:37:13 -04:00

04_equipment.dm

Adds rugged style PDAs

2017-02-04 22:42:06 -06:00

05_background.dm

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

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

06_flavor.dm

Make OOC notes persistant

2017-02-19 17:48:17 -05:00