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

..

collectable.dm

Returns the Vox, who now breath Phoron

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

hardhat.dm

Adds action buttons for hard-hats and goggles

2016-01-22 20:27:58 -05:00

helmet.dm

1.6.4 Port of Baystation head items.

2016-11-26 15:57:15 -08:00

jobs.dm

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

2017-03-03 19:39:56 -05:00

misc_special.dm

1.6.4 Port of Baystation head items.

2016-11-26 15:57:15 -08:00

misc.dm

Revert "BlockHeadHair doesn't make players bald."

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

soft_caps.dm

1.6.4 Port of Baystation head items.

2016-11-26 15:57:15 -08:00

solgov.dm

Renames SCG Expeditionary Corps to Sif Homeguard Corps (SifGuard)

2017-01-14 18:06:31 -06:00