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

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

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

dead

Mentor permissions fixes and such.

2014-06-10 19:48:41 -05:00

living

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

2014-06-20 22:02:40 +01:00

new_player

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

2014-06-20 22:02:40 +01:00

abilities.dm

Removed some commented ability code.

2013-12-04 12:30:37 +10:30

death.dm

Fixes #4744

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

emote.dm

Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.

2014-05-18 10:59:47 +09:30

hear_say.dm

Removed verb assignment from hear_say()

2014-05-17 08:51:13 -04:00

holder.dm

Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.

2014-05-18 10:59:47 +09:30

inventory.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

language.dm

Reverted verb, adjusted color

2014-05-22 16:34:45 -04:00

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

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01: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

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

mob_movement.dm

Fixes compile error

2014-06-05 23:05:35 -04:00

mob_transformation_simple.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

mob.dm

Merge branch 'dev' into mutiny

2014-06-03 21:27:42 -05:00

say.dm

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

2014-06-12 18:56:26 +01:00

transform_procs.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

update_icons.dm

…