PsiOmega 5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm

2015-05-30 15:59:54 +02:00

..

effects

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

items

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

2015-05-30 15:59:54 +02:00

random

Final tweaks to recipe availability and material inheritance.

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

structures

Fixes #9076

2015-05-30 05:24:44 +09:30

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

new object-based lighting system

2015-05-10 20:54:25 +01:00

items.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into rolling-brownouts

2015-05-12 17:19:36 +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

…