Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm

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

..

circuitboards

Merge pull request #9199 from Techhead0/voidmachine-englishlists

2015-05-12 14:20:37 +09:30

grenades

Merge branch 'dev' into ofChemistryAndStuff

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

implants

Merge branch 'dev' into ofChemistryAndStuff

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

melee

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

storage

Merge branch 'dev' into ofChemistryAndStuff

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

tanks

Moves survival boxes to species datums.

2015-05-13 02:31:17 -04:00

AI_modules.dm

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

2015-03-28 20:26:24 +01:00

autopsy.dm

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

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

candle.dm

Useless lights galore, adding small/colorful lights:

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

cards_ids.dm

First pass on custom item cleanup/refactor.

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

cigs_lighters.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +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

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

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

explosives.dm

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

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

extinguisher.dm

Merge branch 'dev' into ofChemistryAndStuff

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

flamethrower.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

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

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

hydroponics.dm

…

kitchen.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +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 pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03:00

RCD.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

RSF.dm

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

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

scrolls.dm

…

shards.dm

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

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

shields.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

stunbaton.dm

Merged with dev.

2015-03-31 11:17:13 +10:30

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

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

swords_axes_etc.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

syndie.dm

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

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

table_rack_parts.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

tape.dm

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

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

teleportation.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

tools.dm

Merge branch 'dev' into ofChemistryAndStuff

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

twohanded.dm

Grilles and rods.

2015-05-02 21:35:02 +02:00

weaponry.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

weldbackpack.dm

Merge branch 'dev' into ofChemistryAndStuff

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

wires.dm

…