PsiOmega b38d8495b3 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather ...

Conflicts:
	code/game/gamemodes/game_mode.dm
	code/modules/clothing/spacesuits/rig/suits/merc.dm

2015-02-23 17:38:50 +01:00

..

__HELPERS

Replaces stool structures with stool items

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

_onclick

Keeps zone selection and gun mode toggle HUD elements visible when scoped

2015-02-21 16:01:47 -05:00

ATMOSPHERICS

Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor

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

controllers

Ports /tg/'s starlight luminance.

2015-02-23 10:11:46 +01:00

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 SuppliesOfTheGodfather

2015-02-23 17:38:50 +01:00

js

…

modules

Updates paths after the projectile update. Adds rig modules to the uplink.

2015-02-23 17:33:12 +01:00

TriDimension

…

ZAS

Cleared out my WIP folder.

2015-02-03 03:20:42 -07:00

global.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

hub.dm

…

names.dm

…

setup.dm

NanoUI atmosphere control and remote air alarm support.

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

stylesheet.dm

Update stylesheet.dm

2015-01-25 22:31:25 +01:00

world.dm

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30