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

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm

2015-06-07 10:51:41 +02:00

..

energy

Makes special wizard projectile staffs only usable by wizards.

2015-06-04 19:42:06 +01:00

launcher

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

2015-06-07 10:51:41 +02:00

projectile

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

alien.dm

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

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

energy.dm

Mostly removes creation of throwaway objects from chameleon items

2015-06-06 18:19:23 -04:00

launcher.dm

Muzzle-flash lighting effect for guns

2015-05-03 12:19:11 +10:00

projectile.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00