Kelenius 6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic ...

Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm

2015-08-21 16:59:57 +03:00

..

circuitboards

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

grenades

Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery

2015-08-13 08:11:32 +02:00

implants

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

2015-08-11 18:47:05 +01:00

material

Removes unused obj flags and fixes overlapping flags

2015-08-18 17:08:41 -04:00

melee

Removes unused obj flags and fixes overlapping flags

2015-08-18 17:08:41 -04:00

storage

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

tanks

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

AI_modules.dm

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

2015-08-12 21:18:18 +02:00

autopsy.dm

…

candle.dm

…

cards_ids_syndicate.dm

One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.

2015-08-15 15:22:37 +02:00

cards_ids.dm

One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.

2015-08-15 15:22:37 +02:00

cigs_lighters.dm

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

2015-08-14 08:34:42 +02:00

clown_items.dm

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

2015-08-12 21:18:18 +02:00

cosmetics.dm

Merge with dev-freeze.

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

dice.dm

…

dna_injector.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

explosives.dm

…

extinguisher.dm

Makes fire extinguishers effective at putting out mob fires

2015-06-21 00:43:15 -04:00

flamethrower.dm

Refactors gas analyize.

2015-07-02 15:32:21 +02:00

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

…

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

…

mop.dm

Fixes #10548

2015-08-12 12:21:28 -04:00

paint.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

paiwire.dm

…

policetape.dm

…

power_cells.dm

Finalizes mechfab

2015-08-12 21:46:11 +03:00

RCD.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

RSF.dm

…

scrolls.dm

Merge with dev-freeze.

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

shields.dm

…

stunbaton.dm

…

surgery_limbattachment.dm

…

surgery_tools.dm

Merge with dev-freeze.

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

swords_axes_etc.dm

…

syndie.dm

…

tape.dm

…

teleportation.dm

…

tools.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

traps.dm

Fixes #9785

2015-06-20 22:12:38 +09:30

trays.dm

Removes *COVERSEYES

2015-08-18 17:06:49 -04:00

weaponry.dm

…

weldbackpack.dm

…

wires.dm

…