PsiOmega 5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm

2015-05-10 10:43:46 +02:00

..

antagonist

Cleanup.

2015-05-07 09:09:12 +02:00

area

Cloning vats and DNA scanners are again located by cloning computers.

2015-05-06 09:27:11 +02:00

dna

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

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

gamemodes

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

2015-05-05 08:11:28 +02:00

jobs

Crayons are now children of pens.

2015-05-05 08:41:24 +02:00

machinery

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

2015-05-10 10:43:46 +02:00

magic

…

mecha

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

2015-05-06 12:19:50 +02:00

objects

Station alarm monitor changes.

2015-05-08 11:22:29 +02:00

turfs

Merge pull request #9072 from PsiOmegaDelta/BrokenGrills

2015-05-04 21:25:24 +03:00

vehicles

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

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

verbs

Admins can now toggle LOOC separately from OOC.

2015-04-30 09:52:29 +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

initialize() should now always be called, be it on game starting up or object being created after game start.

2015-04-30 19:28:35 +02:00

atoms.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

json.dm

…

periodic_news.dm

…

response_team.dm

Fixes #9065.

2015-05-06 15:23:44 +02:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

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

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

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00