Arokha Sieyes 17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix ...

# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme

2016-05-12 13:02:51 -04:00

..

__defines

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

2016-05-12 13:02:51 -04:00

_compatibility/509

…

_helpers

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

2016-05-12 13:02:51 -04:00

_onclick

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

2016-05-12 13:02:51 -04:00

ATMOSPHERICS

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

controllers

Round start timer now remains at 0 until the round actually starts.

2016-04-20 15:27:59 +01:00

datums

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

2016-05-12 13:02:51 -04:00

defines

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

game

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

2016-05-12 13:02:51 -04:00

js

…

modules

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

2016-05-12 13:02:51 -04:00

unit_tests

Adds color to unit tests

2016-04-04 11:46:39 +03:00

ZAS

Construction Update

2016-03-25 16:02:36 -04:00

_macros.dm

…

_unit_tests.dm

Adds unit tests

2016-03-29 17:42:22 +03:00

global_vr.dm

Fixes

2016-05-08 14:34:59 -04:00

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Language css

2016-05-10 22:27:03 -04:00

world.dm

Don't nag me, game.

2016-05-12 12:29:28 -04:00