Tigercat2000 633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.

2015-10-19 16:13:51 -07:00

..

ammunition

ammo tweak

2015-10-07 14:51:14 -04:00

guns

>FUCKING BAYCODE

2015-10-13 19:58:17 -07:00

projectile

Merge pull request #2321 from Fox-McCloud/another-del-pass

2015-10-09 18:05:00 -04:00

ammunition.dm

Pass I

2015-09-04 05:18:48 -04:00

gun.dm

Syringe gun update, borghydro update

2015-10-01 19:30:42 +02:00

projectile.dm

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

targeting.dm

Another del->qdel pass

2015-10-08 16:49:10 -04:00