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

..

rig

Merge large polaris changes

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

void

Polaris December Sync

2016-12-10 09:51:11 -05:00

alien.dm

Further tweaks to Vox and their toys

2017-02-01 21:43:21 -06:00

breaches.dm

…

miscellaneous.dm

Revert "BlockHeadHair doesn't make players bald."

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

spacesuits.dm

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

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

syndi.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00