MrPerson 6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r ...

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm

2014-03-08 22:03:03 -08:00

..

ammunition

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

2014-03-07 04:24:51 -08:00

guns

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

2014-03-08 22:03:03 -08:00

projectile

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

2014-03-08 22:03:03 -08:00

ammunition.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

firing.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

gun.dm

Reduces throwspeeds on all items to realistic levels.

2014-02-15 19:58:03 -08:00

projectile.dm

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

2014-02-09 22:37:20 -08:00