Kelenius 2ba5fd6af2 Merge branch 'dev-freeze' into ofPuffsAndCleaner ...

Conflicts:
	code/game/objects/effects/chem/water.dm

2015-06-05 14:36:15 +03:00

..

chem

Merge branch 'dev-freeze' into ofPuffsAndCleaner

2015-06-05 14:36:15 +03:00

decals

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

spawners

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

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

aliens.dm

new object-based lighting system

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

bump_teleporter.dm

Adds Destroys.

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

effect_system.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

explosion_particles.dm

Another pass at WIP folder

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

gibs.dm

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

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

glowshroom.dm

Renamed some files, did some path replacements

2015-02-04 10:48:18 +10:30

landmarks.dm

Adds Destroys.

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

manifest.dm

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

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

mines.dm

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

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

misc.dm

…

overlays.dm

Dev merge.

2015-05-11 18:45:14 +09:30

portals.dm

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

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

spiders.dm

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

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

step_triggers.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00