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

Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm

2015-06-26 19:22:31 +02:00

..

antagonist

Minor formatting error.

2015-06-22 22:36:00 +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

Grid check now respects critical APC status.

2015-06-25 14:12:05 +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-26 19:22:31 +02:00

magic

…

mecha

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

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

objects

Merge pull request #9936 from mwerezak/fire

2015-06-26 13:34:21 +02:00

turfs

Merge pull request #9936 from mwerezak/fire

2015-06-26 13:34:21 +02: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

Removes CRASH()

2015-06-21 03:00:36 -04:00

atoms.dm

Fixes #9538

2015-06-17 06:57:38 +03: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