Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-03-31 17:44:42 +03:00

..

backpack.dm

Minor storage cleanup

2015-03-05 11:08:22 -05:00

bags.dm

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

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

belt.dm

Tweaks.

2015-03-14 15:52:29 -04:00

bible.dm

More work on severing, improvements to yank-out-object.

2015-03-27 17:51:10 +10:30

boxes.dm

Minor storage cleanup

2015-03-05 11:08:22 -05:00

briefcase.dm

Updates storage costs

2015-03-05 10:40:25 -05:00

fancy.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

firstaid.dm

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

2015-02-21 10:17:17 +01:00

internal.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

lockbox.dm

Updates storage costs

2015-03-05 10:40:25 -05:00

misc.dm

Minor storage cleanup

2015-03-05 11:08:22 -05:00

secure.dm

Updates storage costs

2015-03-05 10:40:25 -05:00

storage.dm

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

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

toolbox.dm

Toolboxes can now hold a limited number of w_class 3 items

2015-03-05 11:10:26 -05:00

uplink_kits.dm

Updates paths after the projectile update. Adds rig modules to the uplink.

2015-02-23 17:33:12 +01:00

wallets.dm

Containers now properly checks types instead of string paths.

2015-02-14 14:16:40 +01:00