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

# Conflicts resolved:
#	code/unit_tests/map_tests.dm

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

..

__defines

Merge pull request #4196 from Anewbe/infection_tweaks

2017-11-10 18:36:42 -08:00

_compatibility/509

…

_helpers

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

_onclick

Merge pull request #3902 from Neerti/9/19/2017_lost_drone

2017-09-22 15:24:05 -05:00

ATMOSPHERICS

Fixes all the other stuff

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

controllers

Removed a file I didn't mean to commit.

2017-11-08 08:37:16 -06:00

datums

Changes the old hyposprays to the new hyposprays. (#4223)

2017-11-15 16:31:50 -06:00

defines

weapon.dm fixes

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

game

I before E (#4287)

2017-11-19 03:00:14 -06:00

js

…

modules

I before E (#4287)

2017-11-19 03:00:14 -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 "Switches us to the Southern Cross for testing"

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

_macros.dm

More merging updates

2017-09-19 23:58:40 -04:00

_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