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

Conflicts:
	code/modules/clothing/clothing.dm

2016-07-19 17:37:14 -04:00

..

__defines

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

2016-07-08 21:00:12 -04:00

_compatibility/509

…

_helpers

Merge pull request #2015 from Neerti/12/16/2015_newwizard

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

_onclick

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

2016-07-08 21:00:12 -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

Removes Assault Carbine from uplink

2016-07-10 04:14:42 -05: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-19 17:37:14 -04:00

js

…

modules

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

2016-07-19 17:37:14 -04:00

unit_tests

…

ZAS

…

_macros.dm

…

_unit_tests.dm

…

global.dm

…

hub.dm

Removing hub password for delisting.

2016-07-18 01:24:53 +01:00

names.dm

…

stylesheet.dm

…

world.dm

Fixes #1915

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