Anewbe c2a8afb7c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute ...

# Conflicts:
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

2017-12-01 18:47:06 -06:00

..

__defines

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

2017-11-29 22:43:05 -05:00

_compatibility/509

…

_helpers

Works on New Blob

2017-11-29 22:35:01 -05:00

_onclick

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

2017-11-29 22:43:05 -05:00

ATMOSPHERICS

Fixes all the other stuff

2017-10-15 20:56:13 -04:00

controllers

Adds Submap (PoI) Seeding Procedure

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

datums

Merge pull request #4374 from Anewbe/cargo_clotting

2017-12-01 12:29:12 -05:00

defines

weapon.dm fixes

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

game

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

2017-12-01 18:47:06 -06:00

js

…

modules

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

2017-12-01 18:47:06 -06: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 "Revert "Revert "Revert "Switches us to the Southern Cross for testing""""

2017-12-01 15:59:38 -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

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00