Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm

2015-05-15 11:28:05 +03:00

..

dead

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

2015-05-11 09:28:59 +02:00

freelook

new object-based lighting system

2015-05-10 20:54:25 +01:00

language

Adds selectable default languages to all mobs which can speak

2015-04-08 15:18:59 +01:00

living

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

new_player

Dev merge.

2015-05-12 23:33:29 +09:30

death.dm

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

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

emote.dm

sanitize() refactor: first pass (sanitize)

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

hear_say.dm

…

holder.dm

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

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

inventory.dm

Grabs no longer endless loop runtime.

2015-05-10 12:11:52 +02:00

login.dm

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

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

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

mob_grab.dm

Fixes grabs runtiming on qdel()

2015-05-15 00:07:45 +01:00

mob_helpers.dm

Compilation fixes.

2015-05-08 08:33:41 +02:00

mob_movement.dm

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

2015-05-12 14:39:21 +02:00

mob_transformation_simple.dm

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

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

mob.dm

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

2015-04-24 17:13:37 +02:00

say.dm

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

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

transform_procs.dm

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

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

typing_indicator.dm

…

update_icons.dm

Updates clothing/under to use item_state_slots.

2015-04-23 08:03:40 -04:00