Jordie0608 4a82ff1564 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() ...

Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-01-21 16:54:40 +11:00

..

backpack.dm

fixes singulo bombing

2014-12-17 02:25:33 -08:00

bags.dm

Merge pull request #5427 from paprka/littlejanitorthings

2014-11-03 17:19:37 -08:00

belt.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()

2015-01-21 16:54:40 +11:00

book.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

boxes.dm

Mutadone and Mannitol, tweaks and changes.

2015-01-16 19:28:13 -08:00

briefcase.dm

Fixing some message and sound.

2014-09-13 00:46:57 +02:00

fancy.dm

Food and drinks refactor

2015-01-19 18:06:15 +11:00

firstaid.dm

adds reserve tanks of the 4 basic chems, brute medkits, and brute medbots.

2015-01-20 23:16:21 -06:00

lockbox.dm

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

2014-12-09 16:03:45 -08:00

secure.dm

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

storage.dm

crossbow, speargun, and grenade updates

2015-01-13 20:00:58 -08:00

toolbox.dm

Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.

2014-12-26 17:04:09 +01:00

uplink_kits.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess

2015-01-15 21:56:23 -08:00

wallets.dm

…