Kelenius b7a628d53d Merge branch 'dev' into ofBotsAndMobs ...

Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/robot/robot_parts.dm

2015-04-26 17:18:20 +03:00

..

dead

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

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

freelook

Adds Destroys.

2015-04-24 17:11:14 +02: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 ofBotsAndMobs

2015-04-26 17:18:20 +03:00

new_player

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

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

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

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

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

Adds Destroys.

2015-04-24 17:11:14 +02:00

mob_helpers.dm

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

2015-04-23 13:15:43 +02:00

mob_movement.dm

Ensures new players cannot ghost by moving, really breaks things.

2015-04-20 08:37:57 +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

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