Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04:00

..

__defines

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

2017-04-25 15:04:54 -04:00

_compatibility/509

…

_helpers

Merge pull request #1393 from Cameron653/master

2017-04-23 23:54:15 -04:00

_onclick

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

2017-04-25 15:04:54 -04:00

ATMOSPHERICS

Fixes scrubber Phoron scrubbing

2017-04-13 22:32:40 +01:00

controllers

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

2017-04-25 15:04:54 -04:00

datums

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

2017-04-25 15:04:54 -04:00

defines

Un-scale HUDs for micros and macros.

2017-04-19 23:59:16 -04:00

game

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

2017-04-25 15:04:54 -04:00

js

…

modules

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

2017-04-25 15:04:54 -04:00

unit_tests

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

ZAS

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

_macros.dm

Multi-Z code formatting and utilities.

2017-04-17 11:57:49 -04:00

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge large polaris changes

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

hub.dm

…

names.dm

…

stylesheet.dm

Fixes a bug with some languages

2017-03-31 17:52:15 +01:00

world.dm

Merge large polaris changes

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