Cuboos 0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 ...

Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt

2014-12-15 18:12:14 -08:00

..

ammunition

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

guns

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

projectile

Movin' house

2014-12-11 21:23:15 +00:00

ammunition.dm

commit for grenade launcher moving

2014-12-08 00:30:10 -08:00

firing.dm

Removes the spawn() in the Bump() proc of projectiles.

2014-11-04 15:21:48 -03:00

gun.dm

second commit for c90gls

2014-12-05 18:13:04 -08:00

projectile.dm

Removes the spawn() in the Bump() proc of projectiles.

2014-11-04 15:21:48 -03:00