Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 ...

# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm

2018-04-06 15:40:06 -04:00

..

__defines

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

_compatibility/509

…

_helpers

Initial cleanup/changes

2018-04-02 16:36:04 -04:00

_onclick

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

ATMOSPHERICS

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

controllers

Don't kick admin observers for inactivity. They might be waiting for ahelps.

2018-04-02 22:48:00 -04:00

datums

More optimizations for character joins

2018-04-02 16:49:44 -04:00

defines

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

game

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

js

…

modules

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

unit_tests

VS: Rewrites basically all of how bellies work

2018-02-27 13:29:45 -05:00

ZAS

Port SSoverlays & Convert turfs to use it (#5004)

2018-03-05 19:43:23 -06:00

_away_mission_tests.dm

…

_macros_vr.dm

Make syringe reuse a bad idea

2018-02-28 20:03:18 -05:00

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Initial cleanup/changes

2018-04-02 16:36:04 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

world.dm

POLARIS: Move Topic() log to debug_log

2018-03-13 18:57:38 -04:00