Iamgoofball 493dd27679 Merge branch 'master' of https://github.com/tgstation/-tg-station into byond ...

Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/reagents/reagent_containers/glass/bottle.dm

2015-01-11 09:53:49 -08:00

..

camera

…

dead

Resolves #6890 - Uses ETA for centcom->station, ETD for station, ESC for station->centcom, RCL for station->centcom(recall)

2015-01-10 01:11:49 +00:00

living

Merge branch 'master' of https://github.com/tgstation/-tg-station into byond

2015-01-11 09:53:49 -08:00

new_player

Merge pull request #6808 from Boggart/readminbugfix

2015-01-10 01:29:01 -03:00

death.dm

…

interactive.dm

Quickfix to conform with the rewrite.

2015-01-07 01:51:39 +11:00

inventory.dm

…

login.dm

Fixes deadmins from being unable to re-admin after disconnecting.

2015-01-05 00:50:49 -07:00

logout.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

mob_cleanup.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

mob_defines.dm

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

mob_grab.dm

Tiny clean up, still lots of work to do

2014-12-12 23:57:11 +03:00

mob_helpers.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

mob_movement.dm

Merge pull request #5641 from MrPerson/autoghosting

2014-12-26 21:35:58 -03:00

mob_transformation_simple.dm

…

mob.dm

Resolves #6890 - Uses ETA for centcom->station, ETD for station, ESC for station->centcom, RCL for station->centcom(recall)

2015-01-10 01:11:49 +00:00

say_readme.dm

…

say.dm

…

transform_procs.dm

Fixes Humanize and Monkeyize producing invisible changelings and never deleting their Animation overlay.

2015-01-04 11:03:10 +00:00

update_icons.dm

General cleanup

2014-12-29 11:36:01 +03:00