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

…

structures

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

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

buckling.dm

…

empulse.dm

…

explosion_recursive.dm

…

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

…

structures.dm

…

weapons.dm

…