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

Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm

2015-08-14 08:34:42 +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/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

qdel(reagent) adjustments.

2015-08-13 10:26:31 +02: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

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

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

storage.dm

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

2015-07-24 10:53:57 +02:00

toolbox.dm

Updates to science

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

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