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

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -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 pull request #2015 from Neerti/12/16/2015_newwizard

2016-07-10 03:43:35 +01:00

_onclick

Technomancer Additions/Fixes

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

ATMOSPHERICS

…

controllers

- Adds Serena's Trade Ship along with all the odds and ends required to have it work properly.

2016-07-04 14:07:14 -07:00

datums

Merge pull request #2168 from Yoshax/telecrystals

2016-07-22 19:34:08 +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 item_state

2016-07-22 23:39:19 -04:00

js

…

modules

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

2016-07-22 23:39:19 -04:00

unit_tests

…

ZAS

…

_macros.dm

…

_unit_tests.dm

…

global.dm

…

hub.dm

Does the old in 'n out

2016-07-22 16:11:45 +01:00

names.dm

…

stylesheet.dm

…

world.dm

Fixes #1915

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