PsiOmegaDelta db565ae2ff Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery ...

Conflicts:
	code/datums/datacore.dm
	code/defines/obj.dm

2015-08-13 08:11:32 +02:00

..

anti_photon_grenade.dm

Adds anti-photon grenades.

2015-07-28 09:25:38 +02:00

chem_grenade.dm

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

2015-07-11 10:58:49 +02:00

emgrenade.dm

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

2015-07-11 10:58:49 +02:00

flashbang.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

grenade.dm

Adds inhand sprites for grenades

2015-07-10 11:00:29 -04:00

smokebomb.dm

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

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

spawnergrenade.dm

Merge branch 'dev' into ofResearchAndPrototypes

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