phil235 0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges ...

Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm

2016-02-10 22:35:19 +01:00

..

camera

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

2016-02-04 14:34:45 +01:00

dead

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

2016-02-04 14:34:45 +01:00

living

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

2016-02-10 22:35:19 +01:00

new_player

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

2016-02-04 14:34:45 +01:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00

interactive.dm

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

2016-02-04 14:34:45 +01:00

inventory.dm

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

2016-02-04 14:34:45 +01:00

login.dm

Fixes vision not being correctly updated in some cases when ghosting.

2016-02-07 19:01:09 +01:00

logout.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01: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

- I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)

2016-02-07 18:50:18 +01:00

mob_grab.dm

Fixes unconscious mob standing still when removed from cryo cell, closet, containers.

2016-02-08 19:22:45 +01:00

mob_helpers.dm

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

2016-02-04 14:34:45 +01:00

mob_movement.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

mob_transformation_simple.dm

Fixes rudimentary transformation not using the client's preferences for human bodies.

2015-09-26 18:49:54 +02:00

mob.dm

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

2016-02-10 22:35:19 +01:00

say_readme.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

say.dm

FIXES DEAD CHAT QUICK MERGE PLS

2015-11-30 17:26:58 -08:00

transform_procs.dm

Fixes unconscious mob standing still when removed from cryo cell, closet, containers.

2016-02-08 19:22:45 +01:00

update_icons.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00