bgobandit 899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear ...

Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm

2015-11-18 19:55:06 -05:00

..

beams.dm

Fixes your shield blocking the bullets when committing suicide with a gun.

2015-11-12 19:45:50 +01:00

bullets.dm

NewChanges

2015-09-16 17:53:04 +08:00

energy.dm

Makes the decloner once more do cloneloss damage

2015-10-28 01:04:04 +02:00

magic.dm

Merge pull request #12567 from phil235/EffectSystemTweak

2015-10-22 21:00:10 -05:00

reusable.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

special.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear

2015-11-18 19:55:06 -05:00