PsiOmegaDelta 8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-07-14 08:11:11 +02:00

..

effects

Fixes #10150

2015-07-13 11:44:47 +03:00

items

Fixes #10146

2015-07-14 05:18:57 +09:30

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

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

2015-07-14 08:11:11 +02:00

buckling.dm

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

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

empulse.dm

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

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

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

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

2015-07-10 12:57:46 +02:00

items.dm

Destroyed items now use drop_from_inventory instead of unEquip. Reduces the risk of references being kept in case of held items.

2015-07-13 10:20:46 +02:00

objs.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

structures.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

weapons.dm

…