Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

__defines

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

2016-07-03 16:21:21 -04:00

_compatibility/509

…

_helpers

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

2016-06-14 12:01:42 -04:00

_onclick

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

2016-07-03 16:21:21 -04:00

ATMOSPHERICS

Frame Fixes

2016-06-01 14:32:56 -04:00

controllers

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

2016-07-03 16:21:21 -04:00

datums

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

2016-07-03 16:21:21 -04:00

defines

Ports event system from Bay

2016-06-01 22:05:04 +01:00

game

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

2016-07-03 16:21:21 -04:00

js

…

modules

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

2016-07-03 16:21:21 -04:00

unit_tests

Add a unit test which verifies all research designs' materials lists and chemicals lists contain only valid materials and reagents.

2016-06-02 18:37:37 -04:00

ZAS

…

_macros.dm

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

_unit_tests.dm

…

global_vr.dm

…

global.dm

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

2016-06-07 18:37:47 -04:00

hub.dm

Readds hub password (#2018)

2016-07-01 13:10:32 -04:00

names.dm

…

stylesheet.dm

Vulpkanin

2016-05-23 16:08:01 -05:00

world.dm

Fixes #1915

2016-06-29 18:24:30 -04:00