Ccomp5950 c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm

2014-01-23 00:05:53 -06:00

..

dead

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

living

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

new_player

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

2014-01-09 17:42:30 +00:00

abilities.dm

Removed some commented ability code.

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

death.dm

…

emote.dm

fix for muting deadme as well.

2014-01-20 22:42:56 -08:00

inventory.dm

Massive click code rework by SuperSayu, ported from TG.

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

language.dm

Tradeband and Gutterspeak now have a different font than Tradeband.

2014-01-08 22:15:47 -07:00

login.dm

Added skeleton code for mob abilities.

2013-11-30 00:02:05 +10:30

logout.dm

Nano UI Framework

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

mob_cleanup.dm

…

mob_defines.dm

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

2014-01-11 10:45:57 +10:30

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

Merge pull request #4270 from Baystation12/master

2014-01-11 18:18:03 -08:00

say.dm

Admin requested addition of a global dsay toggle.

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

transform_procs.dm

DNA2 - A recode of DNA

2013-12-01 00:04:27 -08:00

update_icons.dm

…