Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 ...

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

2015-10-10 23:17:26 -04:00

..

laser.dm

Adjusts projectile values

2015-08-13 22:37:47 -04:00

nuclear.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

pulse.dm

Fixes #10850

2015-09-27 14:13:37 -04:00

special.dm

Merge pull request #11208 from mwerezak/firemode-cleanup

2015-09-28 11:41:03 +01:00

stun.dm

Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful.

2015-07-15 22:08:21 -04:00

temperature.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00