Mloc-Argent 65f218ee63 Merge branch 'master' into dev-freeze ...

Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

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

2013-10-08 22:01:16 +01:00

..

dead

A ton of preliminary work condensing say_quote and say_understands down to the basic common procs between mob types.

2013-08-16 17:46:07 -07:00

living

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

new_player

Merge pull request #3644 from DJSnapshot/master

2013-09-03 22:46:39 -07:00

death.dm

…

emote.dm

Fixes #3555

2013-08-25 13:47:45 -07:00

inventory.dm

Added two ears back.

2013-08-27 22:05:27 +01:00

language.dm

Added key to Check Languages.

2013-09-09 21:51:04 -07:00

login.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

logout.dm

Nano UI Framework

2013-08-19 22:52:23 +01:00

mob_cleanup.dm

…

mob_defines.dm

Removed outdated var, fixed failure to show garbled monkey speech.

2013-08-17 19:03:20 -07:00

mob_grab.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

mob_helpers.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

mob_movement.dm

Removed Z-up function from Client/Center()

2013-08-06 10:46:23 -04:00

mob_transformation_simple.dm

…

mob.dm

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

say.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-08-18 02:09:06 -07:00

screen.dm

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

transform_procs.dm

Monkeyize() now gibs the target if they don't have a species.primitive var set.

2013-08-07 10:46:53 -07:00

update_icons.dm

…