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

..

diseases

- 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

helper_datums

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

2016-02-06 15:42:13 +01:00

wires

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

2016-02-06 15:42:13 +01:00

ai_laws.dm

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

beam.dm

Fixes beam loc bug

2016-01-01 15:23:05 +01:00

browser.dm

Some minor ghost popup fixes

2015-12-31 02:23:53 -08:00

datacore.dm

makes manifest entries use get_flat_human_icon

2015-12-30 23:47:37 +01:00

datumvars.dm

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

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

hud.dm

Merge remote-tracking branch 'upstream/master' into fuk

2015-11-07 15:56:39 -03:00

martial.dm

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

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

material_container.dm

Fix material container

2015-09-13 23:35:49 +01:00

mind.dm

Merge Conflict Fix

2016-01-20 14:07:14 +02:00

mutations.dm

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

2016-02-06 15:42:13 +01:00

outfit.dm

Remove side effects from Character Setup

2015-11-25 18:06:05 -05:00

progressbar.dm

Renames appearance flag defines.

2016-01-24 23:26:14 -06:00

recipe.dm

…

votablemap.dm

map rotation base code

2015-09-30 07:13:38 -07:00