Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +04:00

..

dead

Merge pull request #3940 from Ccomp5950/ghost_buff

2013-11-20 10:32:18 -08:00

living

Merge branch 'dev-freeze' into dev

2013-11-30 05:15:22 +04:00

new_player

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

2013-11-25 11:59:57 +00:00

death.dm

…

emote.dm

Fixes #3555

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

inventory.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +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

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

2013-11-25 11:59:57 +00:00

mob_grab.dm

Massive click code rework by SuperSayu, ported from TG.

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

mob_helpers.dm

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

2013-11-25 11:59:57 +00:00

mob_movement.dm

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

2013-11-25 11:59:57 +00:00

mob_transformation_simple.dm

…

mob.dm

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

2013-11-25 11:59:57 +00:00

say.dm

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

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

transform_procs.dm

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

2013-11-25 11:59:57 +00:00

update_icons.dm

…