Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

__defines

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

_compatibility/509

…

_helpers

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

_onclick

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

ATMOSPHERICS

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

controllers

Final Initial Implementation of Xenobio2 System.

2016-05-25 14:11:37 -04:00

datums

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

defines

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

game

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

js

…

modules

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

unit_tests

Adds an 'Active Edges' map test

2016-05-20 00:12:27 -04:00

ZAS

…

_macros.dm

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

_unit_tests.dm

…

global_vr.dm

Fixes

2016-05-08 14:34:59 -04:00

global.dm

Updates station name, fixes camera networks

2016-05-16 19:48:54 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

Language css

2016-05-10 22:27:03 -04:00

world.dm

Final Initial Implementation of Xenobio2 System.

2016-05-25 14:11:37 -04:00