PsiOmegaDelta 12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm

2015-12-13 10:47:33 +01:00

..

animate.dm

…

beams.dm

More descriptive variable name

2015-08-13 22:38:28 -04:00

bullets.dm

Security Gear II

2015-12-02 13:42:41 -05:00

change.dm

…

energy.dm

Sparks now qdel() cleanly.

2015-12-07 09:19:06 +01:00

force.dm

…

special.dm

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

2015-12-13 10:15:29 +01:00