Hubblenaut 1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm

2015-05-12 14:39:21 +02:00

..

__HELPERS

Added construction drone sprites from Pawn.

2015-05-11 14:46:47 +09:30

_onclick

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

2015-05-12 14:39:21 +02:00

ATMOSPHERICS

remove the sub-area system

2015-05-10 17:06:29 +01:00

controllers

new object-based lighting system

2015-05-10 20:54:25 +01:00

datums

Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart.

2015-05-12 06:42:08 +03:00

defines

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

FEA

…

game

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

2015-05-12 14:39:21 +02:00

js

…

modules

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

2015-05-12 14:39:21 +02:00

TriDimension

Grilles and rods.

2015-05-02 21:35:02 +02:00

ZAS

dynamic fire colours

2015-05-10 20:54:29 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

stylesheet.dm

…

world.dm

Merge resolution.

2015-05-11 11:47:24 +09:30