Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

backpack.dm

Removed broken backpack unequipping sound

2014-04-29 09:20:21 -07:00

bags.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

belt.dm

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

2014-05-31 00:17:56 +01:00

bible.dm

Storage sound is now controlled by var

2014-04-24 20:28:50 -07:00

boxes.dm

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

2014-06-20 22:02:40 +01:00

briefcase.dm

Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed.

2014-03-30 21:41:13 +08:00

fancy.dm

Tiny fix.

2014-02-22 06:56:51 +03:00

firstaid.dm

Added storage/misc for objs that don't fit in

2014-05-04 00:40:08 +03:00

internal.dm

Fixes internal storage on ground

2014-05-10 23:41:48 -04:00

lockbox.dm

correct paint can names and plural status, corrected pill box names, corrected lockbox names.

2014-01-08 19:56:03 +00:00

misc.dm

Added storage/misc for objs that don't fit in

2014-05-04 00:40:08 +03:00

secure.dm

Updated subtypes of storage to use the new open() proc

2014-04-24 12:51:23 -04:00

storage.dm

Fixes internal storage on ground

2014-05-10 23:41:48 -04:00

toolbox.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

uplink_kits.dm

Adds 9 new Chameleon items.

2014-03-23 14:08:23 -07:00

wallets.dm

Wallets and cards.

2013-10-21 05:10:33 +03:00