Arokha Sieyes f8fe9994e5 Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update ...

# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.

2016-05-15 12:39:30 -04:00

..

__defines

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

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

_compatibility/509

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

_helpers

Work on satisfying travis

2016-05-14 13:38:24 -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

Hacktool (#1607)

2016-05-15 09:38:10 -04:00

datums

Fixes Loyalty Implants

2016-05-14 18:08:35 -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/VOREStation/Polaris into polaris-update

2016-05-15 12:39:30 -04:00

js

…

modules

Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

2016-05-15 12:39:30 -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

Hacktool (#1607)

2016-05-15 09:38:10 -04:00

_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

Fixes #755

2016-01-13 23:51:45 +10:30

hub.dm

…

names.dm

…

stylesheet.dm

Language css

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

world.dm

Prevent Unexpected SQL Errors (#1628)

2016-05-14 21:09:21 -04:00