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

Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm

2015-10-16 11:04:43 +02:00

..

backpack.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

bags.dm

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

2015-08-08 15:34:51 +02: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/master' into dev-freeze

2015-10-16 11:04:43 +02:00

briefcase.dm

Entirely removes briefcase instastun and pointless New() definition

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

fancy.dm

qdel(reagent) adjustments.

2015-08-13 10:26:31 +02:00

firstaid.dm

Surgical kits can now contain their equipment.

2015-10-15 10:20:49 +02:00

internal.dm

…

lockbox.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

misc.dm

Major sheet and material refactor.

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

secure.dm

Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon

2015-09-09 19:49:46 -04:00

storage.dm

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

2015-10-16 11:04:43 +02:00

toolbox.dm

…

uplink_kits.dm

Mostly removes creation of throwaway objects from chameleon items

2015-06-06 18:19:23 -04:00

wallets.dm

Crayons are now children of pens.

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