Kelenius 2ba5fd6af2 Merge branch 'dev-freeze' into ofPuffsAndCleaner ...

Conflicts:
	code/game/objects/effects/chem/water.dm

2015-06-05 14:36:15 +03:00

..

__HELPERS

Fixes #9664.

2015-06-04 14:42:39 +02:00

_defines

…

_onclick

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-22 21:01:26 +02:00

ATMOSPHERICS

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

2015-06-04 08:10:49 +02:00

controllers

Garbage/qdel changes.

2015-06-04 19:32:05 +02:00

datums

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

2015-05-30 15:59:54 +02:00

defines

More consistent logging via admin_inject_log proc

2015-05-29 16:57:42 +01:00

FEA

…

game

Merge branch 'dev-freeze' into ofPuffsAndCleaner

2015-06-05 14:36:15 +03:00

js

…

modules

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

2015-06-05 10:23:23 +02:00

TriDimension

Endgame tweaks.

2015-05-26 12:29:50 +02:00

ZAS

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

2015-05-30 15:59:54 +02:00

global.dm

Merge pull request #9202 from Zuhayr/customitems

2015-05-14 21:47:04 +03:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks

2015-05-31 23:55:08 +03:00

stylesheet.dm

…

world.dm

Inactivity process tweaks.

2015-05-26 09:04:26 +02:00