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

Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-03-31 00:16:56 -04:00

..

__HELPERS

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

_onclick

Mob refactoring.

2015-03-29 10:44:31 +02:00

ATMOSPHERICS

#define CONNECT_TYPE_HE 8

2015-03-26 16:31:13 +02:00

controllers

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

datums

Merge pull request #8560 from PsiOmegaDelta/PCAILaws

2015-03-30 21:23:34 +03:00

defines

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

2015-03-29 16:23:06 +02:00

FEA

…

game

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

2015-03-31 00:16:56 -04:00

js

…

modules

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

2015-03-31 00:16:56 -04:00

TriDimension

…

ZAS

Fixes #8450

2015-03-25 02:17:02 +00:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

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

2015-03-31 00:16:56 -04:00

stylesheet.dm

…

world.dm

Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation.

2015-03-21 11:13:53 +10:30