Neerti 5b0b639377 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi ...

# Conflicts resolved:
#	maps/submaps/cave_submaps/cave_areas.dm

2017-11-26 12:09:55 -05:00

..

__defines

Adds Submap (PoI) Seeding Procedure

2017-11-21 19:21:39 -05:00

_compatibility/509

…

_helpers

…

_onclick

…

ATMOSPHERICS

…

controllers

Adds Submap (PoI) Seeding Procedure

2017-11-21 19:21:39 -05:00

datums

Merge pull request #4335 from Neerti/11/22/2017_explorer_gear

2017-11-25 14:39:12 -06:00

defines

weapon.dm fixes

2017-10-27 11:27:13 -04:00

game

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi

2017-11-26 12:09:55 -05:00

js

…

modules

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi

2017-11-26 12:09:55 -05:00

unit_tests

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/19/2017_submap_validation

2017-11-19 06:09:01 -05:00

ZAS

Revert "Switches us to the Southern Cross for testing"

2017-11-18 14:26:28 -06:00

_macros.dm

…

_map_tests.dm

Allows Travis to Validate PoI Maps

2017-11-19 06:07:41 -05:00

_unit_tests.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Makes it pink

2017-11-06 19:09:11 -06:00

world.dm

…