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

..

alien.dm

Makes clothing actually hide stuff, fixes a couple odd related bugs.

2016-11-10 18:00:31 -06:00

armor_vr.dm

Requested Tweaking done.

2017-01-26 16:02:05 -03:00

armor.dm

Returns the Vox, who now breath Phoron

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

bio.dm

Returns the Vox, who now breath Phoron

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

jobs.dm

Polaris sync

2017-02-01 15:08:45 -05:00

labcoat.dm

Makes clothing actually hide stuff, fixes a couple odd related bugs.

2016-11-10 18:00:31 -06:00

miscellaneous.dm

Fixes hoods.

2017-02-26 09:17:03 -05:00

solgov.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins

2017-01-17 22:05:38 -06:00

storage.dm

Makes clothing actually hide stuff, fixes a couple odd related bugs.

2016-11-10 18:00:31 -06:00

toggles.dm

Hood tweaks

2017-01-18 17:02:01 -06:00

utility.dm

Revert "BlockHeadHair doesn't make players bald."

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

wiz_robe.dm

Makes clothing actually hide stuff, fixes a couple odd related bugs.

2016-11-10 18:00:31 -06:00