Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet ...

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

2015-06-22 22:57:53 -05:00

..

energy

DRAGnet lives!

2015-06-15 23:55:28 -05:00

magic

Merge pull request #9701 from Cuboos/SoundsEp2_WizardBoogaloo

2015-05-31 15:51:59 -05:00

projectile

Pray pray pray

2015-06-18 18:07:57 +01:00

energy.dm

caps horrid icon operation to 100

2015-05-10 15:12:23 +10:00

grenade_launcher.dm

Pray pray pray

2015-06-18 18:07:57 +01:00

magic.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

projectile.dm

Pray pray pray

2015-06-18 18:07:57 +01:00

syringe_gun.dm

Pray pray pray

2015-06-18 18:07:57 +01:00