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

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm

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

..

antagonist

Cleanup.

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

area

new object-based lighting system

2015-05-10 20:54:25 +01: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/dev-freeze' into dev

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

jobs

Crayons are now children of pens.

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

machinery

mood lighting for computers

2015-05-10 20:54:29 +01:00

magic

…

mecha

mood lighting for computers

2015-05-10 20:54:29 +01:00

objects

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

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

turfs

new object-based lighting system

2015-05-10 20:54:25 +01: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

new object-based lighting system

2015-05-10 20:54:25 +01:00

atoms.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

json.dm

…

periodic_news.dm

…

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

…

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

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

new object-based lighting system

2015-05-10 20:54:25 +01:00