PsiOmega c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2015-05-18 17:50:48 +02:00

..

effects

Merge branch 'dev' into ofChemistryAndStuff

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

items

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

2015-05-18 17:50:48 +02:00

random

First pass on custom item cleanup/refactor.

2015-05-12 10:53:16 +09:30

structures

Merge pull request #9298 from Kelenius/ofInflatablesAndDeflate

2015-05-16 13:51:16 +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

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

new object-based lighting system

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

weapons.dm

…