Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 ...

# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme

2018-02-17 00:35:29 -05:00

..

__defines

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

_compatibility/509

…

_helpers

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

2018-02-17 00:35:29 -05:00

_onclick

POLARIS: Player-controlled SA QOL

2018-02-15 01:49:53 -06:00

ATMOSPHERICS

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

controllers

Port Bay-style attack animations (#4827)

2018-02-15 22:02:04 -06:00

datums

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

2018-02-17 00:35:29 -05:00

defines

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

game

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

2018-02-17 00:35:29 -05:00

js

…

modules

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

2018-02-17 00:35:29 -05:00

unit_tests

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00

ZAS

Convert ZAS "Airflow" into a subsystem plus fixes

2018-01-30 12:28:45 -05:00

_away_mission_tests.dm

Make Travis run a build matrix, add new test

2018-01-27 15:17:26 -05:00

_macros.dm

Multiple loadout slots (#4530)

2018-01-14 14:47:47 -06:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00