Mloc-Argent e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm

2014-05-14 22:42:03 +01:00

..

dead

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 22:13:48 -07:00

living

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

2014-05-14 22:42:03 +01:00

new_player

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

2014-05-11 13:19:09 +00:00

abilities.dm

…

death.dm

Fixes #4744

2014-05-10 00:40:20 +09:30

emote.dm

This reverts commit all the say code changes over the last couple of days.

2014-02-22 03:46:10 -06:00

hear_say.dm

mob: fix #4955

2014-05-10 22:33:33 +00:00

inventory.dm

…

language.dm

…

login.dm

Crash fix attempt: Moving NanoUI resource file sending away from client/New()

2014-04-25 17:47:27 -05:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

mob_grab.dm

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

mob_helpers.dm

…

mob_movement.dm

Sniper Rifle fix.

2014-01-22 22:40:21 -06:00

mob_transformation_simple.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

mob.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

say.dm

Admin requested addition of a global dsay toggle.

2014-01-20 18:27:12 -08:00

transform_procs.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

update_icons.dm

…