PsiOmegaDelta c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml

2015-06-05 10:39:41 +02:00

..

backpack.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

bags.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

belt.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

bible.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

boxes.dm

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

2015-06-04 08:20:00 +02:00

briefcase.dm

Entirely removes briefcase instastun and pointless New() definition

2015-06-05 09:00:19 +01:00

fancy.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

firstaid.dm

First pass on custom item cleanup/refactor.

2015-05-12 10:53:16 +09:30

internal.dm

Adds Destroys.

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

lockbox.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

misc.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

secure.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

storage.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

toolbox.dm

Updates to science

2015-04-04 13:38:03 +03:00

uplink_kits.dm

Fixes #5945, de-copy-pastes parapens and sleepypens

2015-05-28 22:23:37 +01:00

wallets.dm

Crayons are now children of pens.

2015-05-05 08:41:24 +02:00