Zuhayr 56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate ...

Conflicts:
	code/modules/clothing/clothing.dm

2015-08-22 03:17:16 +09:30

..

energy

Adjusts projectile values

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

launcher

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

projectile

Merge pull request #10200 from mwerezak/gun-desc

2015-08-14 03:55:43 +03:00

alien.dm

Added get_bodytype() species proc as groundwork for subspecies.

2015-08-22 02:53:16 +09:30

energy.dm

Streamlines gun firemodes

2015-08-10 14:38:08 -04:00

launcher.dm

Muzzle-flash lighting effect for guns

2015-05-03 12:19:11 +10:00

projectile.dm

Merge branch 'dev' into ofResearchAndPrototypes

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