mwerezak 6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary ...

Conflicts:
	code/game/objects/items/devices/uplinks.dm

2015-02-22 20:44:43 -05:00

..

__HELPERS

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

_onclick

Merge pull request #8140 from comma/undies

2015-02-17 03:03:45 +10:30

ATMOSPHERICS

Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor

2015-02-22 11:32:32 +03:00

controllers

Merge master into dev.

2015-02-12 23:01:08 +10:30

datums

Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.

2015-02-20 08:04:17 -05:00

defines

Merge pull request #8099 from mwerezak/gun-rewrite

2015-02-16 11:54:52 +03:00

FEA

…

game

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

2015-02-22 20:44:43 -05:00

js

…

modules

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

2015-02-22 20:44:43 -05:00

TriDimension

…

ZAS

…

global.dm

…

hub.dm

…

names.dm

…

setup.dm

NanoUI atmosphere control and remote air alarm support.

2015-02-20 17:39:55 +01:00

stylesheet.dm

…

world.dm

…