Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm

2015-02-22 19:12:11 +01:00

..

ammunition

Merge pull request #380 from Markolie/master

2015-02-22 08:30:11 -05:00

guns

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-02-22 19:12:11 +01:00

projectile

Merge pull request #380 from Markolie/master

2015-02-22 08:30:11 -05:00

ammunition.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

gun.dm

Standardize mutations

2015-02-22 19:04:43 +01:00

projectile.dm

Dart and Syringegun

2015-02-21 09:54:02 -05:00

targeting.dm

Updates to gun targeting UI. Fixes #5710

2014-07-24 18:36:52 -04:00