Kelenius 3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes ...

Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm

2015-05-22 19:26:39 +03:00

..

circuitboards

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

grenades

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

implants

Merge branch 'dev' into ofChemistryAndStuff

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

material

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

melee

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

storage

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

tanks

Makes update_action_buttons() work on-demand

2015-05-20 01:28:16 -04:00

AI_modules.dm

Updates to science

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

autopsy.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

candle.dm

Useless lights galore, adding small/colorful lights:

2015-05-12 10:23:24 +03:00

cards_ids.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

cigs_lighters.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

clown_items.dm

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

2015-04-24 17:13:37 +02:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173.

2015-05-15 23:19:57 +09:30

explosives.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

extinguisher.dm

Fixes #9380

2015-05-20 16:44:47 +01:00

flamethrower.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

game_kit.dm

…

gift_wrappaper.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

handcuffs.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

hydroponics.dm

…

improvised_components.dm

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

kitchen.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

manuals.dm

Minor fixes to supermatter manual text

2015-04-05 22:40:19 +10:00

mop.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

paint.dm

Merge branch 'dev' into ofChemistryAndStuff

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

paiwire.dm

…

policetape.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

power_cells.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

RCD.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

RSF.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

scrolls.dm

Updates to science

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

shields.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

stunbaton.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

surgery_limbattachment.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

surgery_tools.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

swords_axes_etc.dm

…

syndie.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

tape.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

teleportation.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

tools.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

trays.dm

Renamed kitchen utensils.

2015-05-16 21:24:36 +09:30

weaponry.dm

Restructuring a bunch of files in prep for widespread path changes.

2015-05-16 20:09:28 +09:30

weldbackpack.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

wires.dm

…