PsiOmega 3866fda394 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm

2015-05-02 21:50:11 +02:00

..

effects

Merge pull request #9015 from Kelenius/ofChemAndOne

2015-04-28 08:39:27 +02:00

items

Merge pull request #9042 from PsiOmegaDelta/Buttons

2015-05-02 19:50:24 +03:00

random

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

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

structures

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

2015-05-02 21:50: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

…

explosion.dm

…

items.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04: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 remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

weapons.dm

…