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

Conflicts:
	code/game/objects/items.dm

2015-07-06 18:33:09 +02:00

..

animate.dm

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

beams.dm

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

2015-05-12 13:40:47 +02:00

bullets.dm

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

2015-07-06 18:33:09 +02:00

change.dm

Base Life-addition()

2015-06-13 13:36:08 +02:00

energy.dm

Reverses stunrevolver buff

2015-06-17 09:59:39 -04:00

force.dm

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

special.dm

Corrects two ex_acts.

2015-06-21 13:26:48 +02:00