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

Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml

2015-12-06 11:48:20 +01:00

..

ammunition

Merge branch 'capgun' into russian_roulette

2015-08-14 06:03:33 +03:00

guns

Fixes switching firemodes not generating any messages

2015-12-06 01:45:15 -05:00

projectile

Security Gear II

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

ammunition.dm

Porting forensics from Aurora.

2015-10-24 02:15:06 +10:30

effects.dm

…

gun.dm

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

2015-12-06 11:48:20 +01:00

projectile.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

targeting.dm

…