Perakp 7ca06565b5 Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind ...

Conflicts (Resolved):
	code/datums/spells/mind_transfer.dm
	code/game/gamemodes/wizard/artefact.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm

2014-02-14 20:57:11 +02:00

..

ammunition

mag name fixed

2014-01-31 16:22:49 -08:00

guns

Merge pull request #2583 from Incoming5643/bugfixenfeb

2014-02-03 22:05:18 -08:00

projectile

Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind

2014-02-14 20:57:11 +02:00

ammunition.dm

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

2014-01-06 17:59:15 -08:00

firing.dm

Fixes #2456 by moving the code which transfers the reagents to ready_proj()

2014-01-20 14:20:54 +00:00

gun.dm

Many changes

2014-02-04 22:49:38 -08:00

projectile.dm

Fixes merge conflicts and removes excess message

2014-02-06 20:30:43 +13:00