PsiOmegaDelta 1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml

2015-06-19 10:19:08 +02:00

..

__defines

Compilation fixes.

2015-06-17 09:41:13 +02:00

_helpers

Merge pull request #9694 from PsiOmegaDelta/150605-Meteors

2015-06-08 14:17:57 +03:00

_onclick

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

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

ATMOSPHERICS

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

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

controllers

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

2015-06-19 10:19:08 +02:00

datums

Span correction.

2015-06-16 10:59:45 +02: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 remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-19 10:19:08 +02:00

js

…

modules

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

2015-06-19 10:19:08 +02:00

TriDimension

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

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

ZAS

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

2015-06-16 10:52:33 +02:00

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