Anewbe ef1749009a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix ...

# Conflicts:
#	icons/obj/items.dmi

2017-09-28 15:56:53 -05:00

..

__defines

Merge pull request #3950 from Anewbe/radiation_glows

2017-09-27 19:05:09 -04:00

_compatibility/509

…

_helpers

More merging updates

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

_onclick

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

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

ATMOSPHERICS

More merging updates

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

controllers

Adds Farm PoI

2017-09-26 01:44:06 -04:00

datums

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

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

defines

Merge pull request #3821 from Cameron653/LEGCUFF_FUNCTIONALITY

2017-09-23 17:04:06 -05:00

game

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

2017-09-28 15:56:53 -05:00

js

…

modules

Merge pull request #3968 from Anewbe/cham_gun

2017-09-28 16:25:02 -04:00

unit_tests

…

ZAS

More merging updates

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

_macros.dm

More merging updates

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

_unit_tests.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Merge pull request #3892 from MisterLayne/9/19/2017_SkrellLangColorChange

2017-09-24 00:48:14 -05:00

world.dm

More merging updates

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