Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

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

..

devices

Merge with dev.

2015-03-30 08:36:52 +10:30

robot

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

2015-03-31 02:13:22 -04:00

stacks

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

2015-03-31 02:13:22 -04:00

weapons

Merge branch 'dev' into ofChemistryAndStuff

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

apc_frame.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

ashtray.dm

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

2015-03-31 01:37:55 -04:00

blueprints.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

bodybag.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

contraband.dm

Now possible to order a kit with a random toxin and syringe - 4TC

2015-02-20 21:13:34 +01:00

crayons.dm

Eating crayons

2015-01-25 17:11:06 +01:00

latexballoon.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

shooting_range.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

toys.dm

Merge branch 'dev' into ofChemistryAndStuff

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

trash.dm

Adds bread tube trash item

2015-03-24 04:03:06 -04:00