PsiOmega f760d44127 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm

2015-04-28 08:43:31 +02:00

..

backpack.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

bags.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02: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

Merge pull request #8982 from PsiOmegaDelta/Bullets

2015-04-26 20:06:37 +03:00

briefcase.dm

Updates storage costs

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

fancy.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

firstaid.dm

Fixes antag surgery kit

2015-04-27 16:41:47 +01:00

internal.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

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 pull request #8973 from mwerezak/inventory2

2015-04-26 20:13:21 +03: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