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

..

admin

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

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

alarm

…

assembly

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

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

awaymissions

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

2015-03-05 08:05:44 +01:00

client

Merged with dev.

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

clothing

Merge pull request #8604 from Zuhayr/limbs

2015-03-31 08:38:54 +03:00

customitems

Merge branch 'dev' into ofChemistryAndStuff

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

detectivework

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

economy

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

events

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

examine

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

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

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

holodeck

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

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

hydroponics

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

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

icon generation

…

library

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

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

liquid

…

maps

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

2015-03-05 08:05:44 +01:00

mining

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

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

mob

Merge branch 'dev' into ofChemistryAndStuff

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

nano

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

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

organs

Merge branch 'dev' into ofChemistryAndStuff

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

overmap

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

2015-03-13 09:31:03 +01:00

paperwork

Merge branch 'dev' into ofChemistryAndStuff

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

power

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

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

projectiles

Merge branch 'dev' into ofChemistryAndStuff

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

random_map

…

reagents

Merge branch 'dev' into ofChemistryAndStuff

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

recycling

sanitize() refactor: first pass (sanitize)

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

research

Merge branch 'dev' into ofChemistryAndStuff

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

scripting

…

security levels

…

shieldgen

…

shuttles

First pass on making heist a pirate mode (human based)

2015-03-21 11:13:05 +10:30

spells

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

2015-03-31 00:16:56 -04:00

supermatter

…

surgery

Merge branch 'dev' into ofChemistryAndStuff

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

vehicles

…

virus2

Merge branch 'dev' into ofChemistryAndStuff

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