PsiOmega 48aeefa85a Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm

2014-12-09 09:42:14 +01:00

..

__HELPERS

Poster fixes

2014-12-07 22:30:08 -05:00

_onclick

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

2014-12-03 11:38:54 +01:00

ATMOSPHERICS

Merge pull request #7297 from Amunak/pipez

2014-12-08 20:47:09 -05:00

controllers

Remaps the nuke ops shuttle for station docking

2014-12-05 01:17:17 -05:00

datums

Merge resolution.

2014-12-08 13:01:04 +10:30

defines

Merge resolution.

2014-12-08 13:01:04 +10:30

FEA

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

game

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

2014-12-09 09:42:14 +01:00

js

…

modules

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

2014-12-09 09:42:14 +01:00

TriDimension

fix some misplaced set_dir()s

2014-12-08 10:09:09 +00:00

unused

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

WorkInProgress

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

2014-12-09 09:07:38 +01:00

ZAS

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00: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

Merge resolution.

2014-12-08 13:01:04 +10:30

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