PsiOmegaDelta c346b99371 Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess ...

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm

2015-08-20 12:42:51 +02:00

..

atmospherics.dm

…

datum_pool.dm

…

files.dm

…

game.dm

…

global_lists.dm

Synth access and icon update changes.

2015-08-20 12:40:08 +02:00

icons.dm

…

lists.dm

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

logging.dm

Merge with master.

2015-08-18 11:31:10 -07:00

maths.dm

…

matrices.dm

…

mobs.dm

…

names.dm

…

sanitize_values.dm

…

text.dm

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

time.dm

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

2015-08-17 09:44:21 +02:00

turfs.dm

…

type2type.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00

unsorted.dm

Adds more decals. Moving turfs now includes under/overlays.

2015-08-19 10:44:42 +02:00

vector.dm

…