PsiOmega 151c5204ee Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml

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

..

antagonist

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

2015-04-24 17:13:37 +02:00

area

Makes it possible to define custom ambiance music for holodeck programs.

2015-04-25 10:53:14 +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

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

2015-04-24 17:13:37 +02:00

machinery

Merge pull request #9072 from PsiOmegaDelta/BrokenGrills

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

magic

…

mecha

Fixes a few log-destroying lines

2015-05-04 21:33:30 +03:00

objects

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

2015-05-05 08:11:28 +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

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

2015-04-24 09:59:05 +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