SinTwo 0086d61d56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/modules/client/client procs.dm
	nano/templates/robot_control.tmpl

2016-07-27 16:11:55 -04:00

..

__defines

Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting

2016-07-22 17:35:20 +01:00

_compatibility/509

…

_helpers

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

2016-07-27 16:11:55 -04:00

_onclick

Technomancer Additions/Fixes

2016-07-21 18:22:15 -04:00

ATMOSPHERICS

…

controllers

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

2016-07-27 16:11:55 -04:00

datums

Blacklists teleporter board in uplinks for random item

2016-07-26 20:22:05 +01:00

defines

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

2016-07-13 17:07:52 -04:00

game

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

2016-07-27 16:11:55 -04:00

js

…

modules

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

2016-07-27 16:11:55 -04:00

unit_tests

…

ZAS

…

_macros.dm

Ports /vg/ get_turf

2016-07-23 18:00:50 +01:00

_unit_tests.dm

…

global.dm

…

hub.dm

Revert "Does the standard greytide welcoming"

2016-07-25 01:49:29 +01:00

names.dm

…

stylesheet.dm

…

world.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00