Kelenius 2ba5fd6af2 Merge branch 'dev-freeze' into ofPuffsAndCleaner ...

Conflicts:
	code/game/objects/effects/chem/water.dm

2015-06-05 14:36:15 +03:00

..

antagonist

Fixes #9498

2015-05-30 02:56:01 +09:30

area

Refactors get_apc()

2015-05-28 17:11:26 +02:00

dna

…

gamemodes

Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks

2015-05-31 23:55:08 +03:00

jobs

Re-adds extended oxygen tanks to relevant jobs.

2015-05-31 14:08:46 -04:00

machinery

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

2015-06-04 08:10:49 +02:00

magic

…

mecha

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

objects

Merge branch 'dev-freeze' into ofPuffsAndCleaner

2015-06-05 14:36:15 +03:00

turfs

Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks

2015-05-31 23:55:08 +03:00

vehicles

…

verbs

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

2015-06-05 10:23:23 +02:00

asteroid.dm

…

atoms_movable.dm

Garbage/qdel changes.

2015-06-04 19:32:05 +02:00

atoms.dm

Garbage/qdel changes.

2015-06-04 19:32:05 +02:00

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Supply shuttle and crate fixes

2015-05-23 16:15:04 +01:00