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

..

dead

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

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

freelook

Refactors the AI eye.

2015-03-25 18:53:11 +01:00

language

Merged with dev.

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

living

Merge branch 'dev' into ofChemistryAndStuff

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

new_player

Merge pull request #8604 from Zuhayr/limbs

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

death.dm

…

emote.dm

sanitize() refactor: first pass (sanitize)

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

hear_say.dm

…

holder.dm

Finalized monkey species definitions and icons.

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

inventory.dm

Updates comment

2015-03-30 22:29:15 -04:00

login.dm

Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.

2015-03-13 21:41:23 -04:00

logout.dm

…

mob_cleanup.dm

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

mob_defines.dm

Mob refactoring.

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

mob_grab.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

mob_helpers.dm

Merge pull request #8604 from Zuhayr/limbs

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

mob_movement.dm

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

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

mob_transformation_simple.dm

…

mob.dm

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

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

say.dm

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

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

transform_procs.dm

Mob refactoring.

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

typing_indicator.dm

…

update_icons.dm

Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file

2015-03-29 01:52:26 -04:00