PsiOmegaDelta 5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm

2015-12-20 11:22:08 +01:00

..

antagonist

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

2015-11-06 17:43:05 +01:00

area

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

2015-08-27 08:53:22 +02:00

dna

…

gamemodes

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

2015-11-06 17:43:05 +01:00

jobs

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

2015-12-08 08:09:37 +01:00

machinery

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

2015-12-13 10:15:29 +01:00

magic

…

mecha

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

2015-12-08 08:09:37 +01:00

objects

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

2015-12-20 11:22:08 +01:00

turfs

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

2015-12-08 08:09:37 +01:00

vehicles

…

verbs

Compilation fixes.

2015-12-13 10:21:00 +01:00

atoms_movable.dm

Fixes #10751 Thrown items now use last_move direction isntead of neverchanging dir

2015-12-12 15:29:08 +03:00

atoms.dm

Merge pull request #11134 from Baystation12/master

2015-09-18 08:50:11 +02:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

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

2015-09-05 09:24:30 +02:00

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

fix #10617

2015-08-13 21:01:46 +01:00