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

..

admin

Cleanup

2016-02-10 16:30:43 +01:00

assembly

Make it an else instead

2016-02-08 20:31:15 -02:00

atmospherics

Merge pull request #15361 from neersighted/always_null_yourself

2016-02-10 16:49:30 -03:00

awaymissions

Merge pull request #15300 from Buggy123/patch-16

2016-02-10 13:18:05 -03:00

cargo

Address feedback

2016-02-08 07:22:18 -06:00

client

Cleanup

2016-02-10 16:30:43 +01:00

clothing

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

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

crafting

halves most tablecrafting times

2016-02-06 17:55:07 -08:00

detectivework

Get the code running on 510

2016-02-04 17:19:40 -06:00

emoji

…

events

Rewrite supply packs/cargo orders

2016-02-07 04:45:55 -06:00

flufftext

- 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

food&drinks

Merge pull request #15253 from bgobandit/cravenoaf

2016-02-07 23:02:46 -03:00

games

…

holiday

…

holodeck

Fix bad checks in holodeck

2016-02-04 16:29:23 -06:00

html_interface

…

hydroponics

Carrot fix

2016-02-07 15:36:37 -06:00

jobs

Merge pull request #15191 from KorPhaeron/chaplain

2016-02-05 14:54:15 -03:00

library

…

lighting

…

mining

Fix two small errors

2016-02-08 00:01:54 -06:00

mob

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

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

ninja

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

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

paperwork

Fix up crates

2016-02-07 01:20:37 -06:00

power

Merge pull request #14851 from MrStonedOne/patch-130

2016-02-10 11:36:32 +01:00

procedural mapping

Get the code running on 510

2016-02-04 17:19:40 -06:00

projectiles

Merge pull request #15148 from KazeEspada/gunfixes2theelectricboogaloo

2016-02-10 01:27:34 -03:00

reagents

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

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

recycling

Made changes to adjust with neersighted's fullscreen overlays pr.

2016-02-06 20:35:15 +01:00

research

Merge pull request #15349 from octareenroon91/autolathe-buff

2016-02-10 16:39:31 -03:00

ruins

…

security levels

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

shuttle

Address feedback

2016-02-08 07:22:18 -06:00

space transition

…

spells

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

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

surgery

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

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

telesci

…

tgui

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

tooltip

…

uplink

Adds C4 bag to uplink

2016-02-08 16:10:34 +01:00

vehicles

…