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

..

devices

Rewrite supply packs/cargo orders

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

robot

More merge conflict fixes.

2016-02-04 15:48:33 +01:00

stacks

Remove dupe file, remove colon cancer and add prespawned stacks

2016-02-08 01:16:30 -06:00

weapons

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

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

apc_frame.dm

…

blueprints.dm

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

2016-01-30 01:29:26 +00:00

body_egg.dm

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

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

bodybag.dm

…

candle.dm

- Refactor the visible_message() proc to be much faster.

2016-01-04 22:49:27 +01:00

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

dehy_carp.dm

…

documents.dm

…

holotape.dm

…

latexballoon.dm

…

nuke_tools.dm

…

shooting_range.dm

…

toys.dm

Fixes crayon/spraycan buffer mode.

2016-02-07 13:18:10 +01:00

trash.dm

…