mwerezak 5740f52964 Merge branch 'guns' into gun-rewrite ...

Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm

2015-02-11 18:08:43 -05:00

..

alien.dm

Updated body_parts_covered

2014-07-26 17:06:08 -07:00

armor.dm

Merge branch 'guns' into gun-rewrite

2015-02-11 18:08:43 -05:00

bio.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

jobs.dm

Adds inhand sprites for the captain's tunic and jacket

2014-11-21 08:14:57 -05:00

labcoat.dm

Fixed typo that broke everything

2014-11-16 03:31:22 -05:00

miscellaneous.dm

Gun cleanup and rewrite

2015-02-11 15:46:09 -05:00

storage.dm

Noise emotes

2014-12-07 12:09:02 +00:00

utility.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

wiz_robe.dm

Updated body_parts_covered

2014-07-26 17:06:08 -07:00