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

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm

2015-06-07 10:30:27 +02: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

Merge branch 'dev' into ofChemistryAndStuff

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

gamemodes

RSC paths for ai_help command

2015-06-06 14:55:33 +02: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 remote-tracking branch 'upstream/master' into dev-freeze

2015-06-07 10:30:27 +02:00

turfs

Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks

2015-05-31 23:55:08 +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-06-05 10:23:23 +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

Garbage/qdel changes.

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

atoms.dm

Fixes #9352

2015-06-05 14:30:01 +03:00

json.dm

…

periodic_news.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

response_team.dm

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

2015-05-11 09:28:59 +02:00

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Areas can now set their sound environments. Default is still 2 (room). For now only hallways and asteroid areas have different ones (hallway and stoneroom respectively)

2015-03-23 03:31:22 +03:00

supplyshuttle.dm

Supply shuttle and crate fixes

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