Kelenius 3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes ...

Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm

2015-05-22 19:26:39 +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

…

living

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

new_player

Fixes #9336

2015-05-18 07:58:41 +03:00

animations.dm

Clean up world print

2015-05-20 00:35:26 -04:00

death.dm

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

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

emote.dm

…

hear_say.dm

…

holder.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

inventory.dm

Items again have their loc set just before dropped() is called.

2015-05-21 17:55:31 +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

…

mob_defines.dm

Moves mob animations to a new source file, adds attack animation

2015-05-16 12:44:49 -04:00

mob_grab.dm

Missed one baddie

2015-05-21 03:22:20 +03: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 pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

say.dm

…

transform_procs.dm

Fixes #9244.

2015-05-18 19:15:28 +02:00

typing_indicator.dm

…

update_icons.dm

Updates clothing/under to use item_state_slots.

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