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

# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi

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

..

__defines

Moves languages to use more defines. Redoes Diona splitting

2017-01-14 22:47:12 -06:00

_compatibility/509

…

_helpers

Teshari Tweaks

2017-01-15 01:21:48 -06:00

_onclick

Returns the Vox, who now breath Phoron

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

ATMOSPHERICS

Removes an unused gas from the code

2017-01-02 18:41:05 -05:00

controllers

Ports Bay's Antag Player Age blocker

2017-01-14 17:37:46 -06:00

datums

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

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

defines

Removes an unused gas from the code

2017-01-02 18:41:05 -05:00

game

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

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

js

…

modules

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

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

unit_tests

Permanent Revolution Update

2017-01-04 04:41:30 -05:00

ZAS

Returns the Vox, who now breath Phoron

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

_macros.dm

Ports the Port of Circuits

2016-09-24 18:06:11 -04:00

_unit_tests.dm

…

global.dm

Supermatter now uses the global announcer.

2016-11-19 01:08:46 +00:00

hub.dm

Revert "Revert "Revert "Revert "Revert "Revert "Adds hub passwordu""""""

2016-10-07 21:15:43 -04:00

names.dm

…

stylesheet.dm

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

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

world.dm

Makes Circuits Make Their Own Research Designs

2016-12-30 02:41:11 -05:00