PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

animate.dm

Cleanup can_fire(), projectile flag

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

beams.dm

Projectile visual bug fixes

2015-07-11 00:06:44 +12:00

bullets.dm

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

2015-10-11 17:17:41 +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