Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

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

..

dead

Mentor permissions fixes and such.

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

living

Merge branch 'master' into dev

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

new_player

overeye

2014-06-14 21:04:05 -07:00

abilities.dm

…

death.dm

…

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

…

language.dm

Reverted verb, adjusted color

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

login.dm

…

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

…

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

…

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

…