PsiOmega 6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm

2015-03-20 08:26:34 +01:00

..

__HELPERS

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

2015-03-12 10:30:16 +01:00

_onclick

…

ATMOSPHERICS

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

controllers

Makes it possible to debug the NanoUI manager.

2015-03-16 22:27:31 +01:00

datums

Robot code clean up and fixes.

2015-03-10 13:37:20 +01:00

defines

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

FEA

…

game

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

2015-03-20 08:26:34 +01:00

js

…

modules

Adds Andrewmeythaler's custom item.

2015-03-17 22:19:13 -05:00

TriDimension

…

ZAS

That should be it for procs there.

2015-02-27 13:09:40 +03:00

global.dm

Camera coverage fixes.

2015-02-26 11:39:41 +01:00

hub.dm

…

names.dm

…

setup.dm

Fixes damage multiplier mixup, bumped var not being reset

2015-03-14 02:56:05 -04:00

stylesheet.dm

Improves cult conversion

2015-03-05 23:58:56 -05:00

world.dm

…