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

..

antagonist

Merge with dev.

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

area

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

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

dna

Merge branch 'dev' into ofChemistryAndStuff

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

gamemodes

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

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

jobs

Merge pull request #8604 from Zuhayr/limbs

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

machinery

Merge branch 'dev' into ofChemistryAndStuff

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

magic

…

mecha

Merge branch 'dev' into ofChemistryAndStuff

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

objects

Merge branch 'dev' into ofChemistryAndStuff

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

turfs

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

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

vehicles

…

verbs

Merge pull request #8380 from volas/sanitize_procs

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

asteroid.dm

…

atoms_movable.dm

Mob refactoring.

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

atoms.dm

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

2015-03-13 09:23:26 +01:00

json.dm

…

periodic_news.dm

…

response_team.dm

sanitize() refactor: third pass (misc)

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

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30