GinjaNinja32 d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm

2015-04-13 12:49:07 +01:00

..

ammunition

Adjusts ammunition autolathe costs, makes 7.62 mags printable

2015-03-23 00:06:28 -04:00

guns

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

projectile

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

ammunition.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

effects.dm

Projectile effects - Part 1

2015-03-09 22:17:06 +13:00

gun.dm

Nicer formatting of weapon firing text.

2015-04-05 08:29:59 +01:00

projectile.dm

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

targeting.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-13 12:49:07 +01:00