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

..

effects

Merge pull request #15250 from ChangelingRain/blobtooweak

2016-02-09 18:04:55 +01:00

items

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

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

structures

Add spacecat

2016-02-10 09:15:03 -06:00

buckling.dm

…

empulse.dm

…

explosion.dm

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

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

items.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

objs.dm

Merge remote-tracking branch 'upstream/master' into patch-130

2016-02-07 17:41:42 -08:00

radiation.dm

…

structures.dm

Chairs

2016-01-27 14:03:19 -06:00

weapons.dm

…