mwerezak 9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-03-31 00:16:56 -04:00

..

automatic.dm

Adds unloaded item state for the STS-35.

2015-03-29 02:40:57 -04:00

dartgun.dm

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

2015-03-31 00:16:56 -04:00

pistol.dm

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

2015-03-31 00:16:56 -04:00

revolver.dm

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

2015-03-31 00:16:56 -04:00

shotgun.dm

Adds Skowron's inhand icons for various guns

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

sniper.dm

Reduces 14.5mm ammo box cost to 2 TC, slight rename

2015-03-23 00:16:48 -04:00