Kelenius a2cea5c49c Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm

2015-04-28 19:22:35 +03:00

..

circuitboards

Area/Camera network refactor - Part 3

2015-04-10 15:17:05 +02:00

grenades

Merge branch 'dev' into ofChemistryAndStuff

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

implants

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +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-04-28 19:22:35 +03:00

tanks

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

2015-04-24 09:59:05 +02: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

Build fixes.

2015-04-28 09:04:00 +02:00

cards_ids.dm

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

cigs_lighters.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +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-04-28 10:49:26 +03:00

flamethrower.dm

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

2015-04-24 09:59:05 +02: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

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

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

hydroponics.dm

…

kitchen.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +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

Chemistry commit

2015-03-25 19:09:10 +03:00

paiwire.dm

…

policetape.dm

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

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

power_cells.dm

…

RCD.dm

Adds Destroys.

2015-04-24 17:11:14 +02: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

…

shards.dm

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

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

shields.dm

…

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

…

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

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

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

tools.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

twohanded.dm

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

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

weaponry.dm

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

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

weldbackpack.dm

Merge branch 'dev' into ofChemistryAndStuff

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

wires.dm

…