PsiOmegaDelta 7b3759c1f3 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt

2015-07-12 14:49:31 +02:00

..

antagonist

Should fix #9895, hopefully.

2015-07-10 01:21:12 +09:30

area

Fixes #9394

2015-07-10 00:21:17 +09:30

dna

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

gamemodes

Reduced Hell Universe Lag

2015-07-07 12:55:39 +02:00

jobs

Re-adds extended oxygen tanks to relevant jobs.

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

machinery

Fixed turrets accidentally killing the AI

2015-07-11 13:31:28 +12:00

magic

…

mecha

Merge resolution with master.

2015-06-28 06:02:52 +09:30

objects

Fixes #10062 and #10061

2015-07-12 07:04:35 +09:30

turfs

Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations

2015-07-09 20:45:51 +03:00

vehicles

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

verbs

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

2015-07-12 14:49:31 +02:00

asteroid.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

atoms_movable.dm

Wrenching times no longer runtime.

2015-06-28 18:17:53 +02:00

atoms.dm

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

2015-06-30 08:24:43 +02:00

json.dm

…

periodic_news.dm

…

response_team.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

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