Arokha Sieyes 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme

2018-05-27 19:26:12 -04:00

..

integrated_circuits

Even More Circuit Changes

2017-08-01 16:13:27 -04:00

loadout_tests.dm

Unit test fix

2016-11-18 23:41:38 -06:00

map_tests.dm

Active edge canary PR

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

mob_tests.dm

…

research_tests.dm

…

unit_test_vr.dm

Adds a unit test to make sure prey can breathe inside pred bellies.

2017-06-16 16:39:51 -04:00

unit_test.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

vore_tests_vr.dm

VS: Rewrites basically all of how bellies work

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

zas_tests.dm

Travis Appeasement Mark II (#4485)

2018-01-01 22:26:31 -05:00