mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/modules/organs/organ_external.dm

2015-03-31 02:13:22 -04:00

..

crossbow.dm

More work on adjusting/tweaking/fixing the limb port to make it functional.

2015-03-25 00:59:17 +10:30

grenade_launcher.dm

…

pneumatic.dm

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

2015-03-31 01:37:55 -04:00

rocket.dm

…

syringe_gun.dm

Adds Skowron's inhand icons for various guns

2015-03-28 02:10:09 -04:00