PsiOmegaDelta 185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm

2015-12-08 08:23:10 +01:00

..

__defines

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

2015-12-06 11:48:20 +01:00

_helpers

Merge pull request #11507 from Zuhayr/dev

2015-11-30 16:55:14 +01:00

_onclick

Merge pull request #11602 from PsiOmegaDelta/151205-AIClickRuntime

2015-12-07 19:56:04 +03:00

ATMOSPHERICS

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

2015-12-06 11:48:20 +01:00

controllers

Sparks now qdel() cleanly.

2015-12-07 09:19:06 +01:00

datums

Infinite recursion radio hacking fix.

2015-12-07 11:34:42 +01:00

defines

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

2015-12-06 11:34:36 +01:00

FEA

…

game

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

2015-12-08 08:23:10 +01:00

js

…

modules

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

2015-12-08 08:23:10 +01:00

ZAS

Fixes #11594

2015-12-06 02:24:37 -05:00

_macros.dm

Adds hacking tool.

2015-11-13 21:59:56 +01:00

global.dm

Merge pull request #11364 from PsiOmegaDelta/151024-Btime

2015-11-19 10:14:03 +03:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Merge pull request #11531 from Baystation12/dev-freeze

2015-11-28 11:56:08 +01:00