Hornygranny cc21fd1e70 Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2 ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm

2014-10-28 15:27:46 -07:00

..

ammunition

Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns

2014-10-19 17:30:47 -07:00

guns

Merge pull request #5399 from phil235/LaserGunFix

2014-10-22 10:53:49 -07:00

projectile

makes the singularity's pulling OOP with the magic of atom proc

2014-10-27 16:43:35 -07:00

ammunition.dm

Turret SFX and spawning changes

2014-10-07 16:44:51 -04:00

firing.dm

Space movement rewrite to allow everything to drift

2014-10-25 23:19:46 -07:00

gun.dm

added sawing off to all weapons

2014-10-19 17:49:05 -07:00

projectile.dm

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2

2014-10-28 15:27:46 -07:00