Mloc-Argent b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	html/changelog.html

2013-12-13 19:13:43 +00:00

..

ammunition

Grammar fix and fix to c45 being declared twice in boxes.dm

2013-12-08 12:25:00 -08:00

guns

Commiting SueTheCake's detective things.

2013-11-27 04:10:06 +04:00

projectile

Changed the embed check to use its own var instead of checking damagetype

2013-10-31 22:05:58 -04:00

ammunition.dm

…

gun.dm

Merge branch 'master' into dev-freeze

2013-11-30 05:16:49 +04:00

projectile.dm

Fix to fix a fix that needs fixing.

2013-11-20 16:00:07 -08:00

targeting.dm

Runtime fix: N00k agents on spawn were causing a runtime here.

2013-12-07 05:18:27 -06:00