PsiOmegaDelta 1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml

2015-06-19 10:19:08 +02:00

..

chem

Adjusts usages of reagent transfer procs

2015-06-10 00:03:08 -04:00

decals

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

2015-06-17 09:33:34 +02:00

spawners

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

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

aliens.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

bump_teleporter.dm

Adds Destroys.

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

effect_system.dm

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

2015-06-07 10:51:41 +02:00

explosion_particles.dm

Another pass at WIP folder

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

gibs.dm

objects/effects, objects/structures

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

glowshroom.dm

Renamed some files, did some path replacements

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

landmarks.dm

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03: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/dev' into span_class=notice

2015-06-05 08:52:44 +01:00

step_triggers.dm

refactor 'dir = ' into 'set_dir()'

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