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

..

ano_device_battery.dm

…

artifact_analyser.dm

…

artifact_harvester.dm

…

artifact_scanner.dm

…

coolant_tank.dm

…

equipment.dm

Revert "BlockHeadHair doesn't make players bald."

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

geosample_scanner.dm

…

suspension_generator.dm

…

tools_pickaxe_vr.dm

Update tools_pickaxe_vr.dm

2016-11-13 19:44:52 -05:00

tools_pickaxe.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

tools_vr.dm

Update tools_vr.dm

2016-11-13 20:05:04 -05:00

tools.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00