PsiOmega 0731badf87 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm

2014-11-30 10:54:15 +01:00

..

__HELPERS

Added toggleable 'chat tags' that can mark different channels in chat.

2014-11-28 11:15:22 +01:00

_onclick

Merge pull request #7008 from Zuhayr/spaceninjas

2014-11-22 09:30:54 +01:00

ATMOSPHERICS

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

2014-11-19 14:40:18 +01:00

controllers

Nukeops shuttle docking

2014-11-29 03:51:45 +01:00

datums

Radio wires - Take 2. Can now also cut wiring.

2014-11-24 15:23:06 +01:00

defines

Plastique wiring.

2014-11-24 11:21:31 +01:00

FEA

…

game

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

2014-11-30 10:54:15 +01:00

js

…

modules

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

2014-11-30 10:54:15 +01:00

TriDimension

…

unused

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

WorkInProgress

Merge pull request #7008 from Zuhayr/spaceninjas

2014-11-22 09:30:54 +01:00

ZAS

Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup.

2014-11-28 19:37:31 -05:00

global.dm

AI can now track people with max level sensors.

2014-11-21 08:33:20 +01:00

hub.dm

…

names.dm

…

setup.dm

Separated pAI and posibrain candidacy, fixed their jobbans.

2014-11-29 00:31:27 +01:00

stylesheet.dm

Admin PM cleanup; moved styles to stylesheet.dm, added chattags

2014-11-28 12:05:11 +01:00

world.dm

Merge pull request #7127 from Zuhayr/lathe

2014-11-25 10:43:03 +01:00