Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm

2015-06-07 14:05:54 +03:00

..

__defines

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

_helpers

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-07 10:51:41 +02:00

_onclick

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

ATMOSPHERICS

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

controllers

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

datums

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

defines

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-07 10:51:41 +02:00

FEA

Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS

2015-05-29 20:36:48 +01:00

game

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

js

…

modules

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

TriDimension

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

ZAS

Merge pull request #9718 from mwerezak/zonemerge

2015-06-07 15:13:09 +09:30

global.dm

Actually renames 'going' var.

2015-06-05 11:07:24 +03:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03:00