Neerti b22f44d560 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again ...

# Conflicts resolved:
#	icons/mob/modifier_effects.dmi

2018-06-15 18:28:00 -04:00

..

__defines

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

2018-06-15 18:28:00 -04:00

_compatibility/509

…

_helpers

Merge pull request #5343 from ReddeyfishVor/slimeChanges

2018-06-11 13:10:24 -05:00

_onclick

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

2018-06-15 18:28:00 -04:00

ATMOSPHERICS

Switch cables and pipes to use define constants instead of literals for layers.

2018-04-02 21:50:03 -04:00

controllers

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

2018-06-15 18:28:00 -04:00

datums

Merge pull request #5300 from Anewbe/more_runtimes

2018-05-26 15:23:03 -07:00

defines

Add \the when practical

2018-05-02 08:58:07 +10:00

game

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

2018-06-15 18:28:00 -04:00

js

…

modules

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

2018-06-15 18:28:00 -04:00

unit_tests

Active edge canary PR

2018-05-26 12:03:35 -04:00

ZAS

…

_away_mission_tests.dm

…

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global.dm

Split and clarify global lists of processing vs non-processing machinery. (#5307)

2018-05-28 12:56:49 -07:00

hub.dm

…

names.dm

…

stylesheet.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

2018-04-03 22:16:16 -04:00

world.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00