PsiOmegaDelta 405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm

2015-06-20 20:40:06 +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

All the span-corrected dm files.

2015-06-14 22:08:14 +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

Merge pull request #9694 from PsiOmegaDelta/150605-Meteors

2015-06-08 14:17:57 +03:00