Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge ...

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

2015-11-06 17:41:18 -05:00

..

chem

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

2015-10-27 13:08:33 +01:00

decals

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

spawners

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

2015-10-11 17:37:01 +02:00

aliens.dm

Updates blob

2015-10-05 18:10:16 +03:00

bump_teleporter.dm

Adds Destroys.

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

effect_system.dm

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

explosion_particles.dm

Explosion particle GC.

2015-08-09 12:35:07 +02:00

gibs.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

glowshroom.dm

…

landmarks.dm

Blobs locations are now more random.

2015-10-13 18:49:55 +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

Structures now take damage properly from projectile clouds

2015-08-15 19:08:45 -04:00

step_triggers.dm

…