CPTANT 086dd558f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire ...

# Conflicts:
#	code/game/gamemodes/malfunction/Malf_Modules.dm

2016-02-16 03:23:55 +01:00

..

admin

Merge pull request #15499 from neersighted/readmin

2016-02-14 17:08:13 -03:00

assembly

Make it an else instead

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

atmospherics

Merge pull request #15497 from AnturK/scrub

2016-02-14 17:13:05 -03:00

awaymissions

Merge pull request #15300 from Buggy123/patch-16

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

cargo

Fix crate access; fix locker item-to-lock

2016-02-10 17:40:10 -06:00

client

Fixes old species conversion code being incorrect

2016-02-13 02:06:03 +00:00

clothing

Adds russian officer uniform

2016-02-13 20:11:58 +00:00

crafting

Merge pull request #15362 from lzimann/table

2016-02-10 19:18:32 -03:00

detectivework

Get the code running on 510

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

emoji

Fixes emoji issues to do with adminPM and OOC formatting

2016-01-31 12:57:43 -05:00

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

Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.

2016-02-11 09:59:23 +02:00

games

Merge conflict fix

2016-01-17 19:15:30 +02:00

holiday

Merge Conflict Fix

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

holodeck

Holodeck fixes

2016-02-12 14:03:36 +01:00

html_interface

Fixed 'in' precedence errors.

2015-12-29 17:16:09 -07:00

hydroponics

Carrot fix

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

jobs

You can now select whether to start with a dufflebag. Also, you have the option to choose between generic or departmental bags.

2016-02-11 16:48:08 -07:00

library

Sneaks in a new book sprite that's totally white colored, no blue dot.

2015-12-29 16:01:14 -05:00

lighting

Entirely area based

2015-12-24 03:50:27 -06:00

mining

Unanchor gibtonite, fix up some pull code

2016-02-13 00:26:28 -06:00

mob

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

2016-02-16 03:23:55 +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

Fixes the tesla going nuts if deleted at the wrong moment.

2016-02-12 18:49:38 -08:00

procedural mapping

Get the code running on 510

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

projectiles

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

2016-02-16 03:23:55 +01:00

reagents

Merge pull request #15546 from octareenroon91/patch-31

2016-02-15 05:23:46 -06:00

recycling

Fixes revive() not properly removing the blind overlay. (fixes staff of healing)

2016-02-14 15:26:46 +01:00

research

Bit more flat

2016-02-14 17:39:44 +01:00

ruins

Random Ruins

2015-12-19 06:55:50 -06:00

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

Shaves off 1568 iterations

2015-11-13 10:57:42 +03:00

spells

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

2016-02-16 03:23:55 +01:00

surgery

Merge pull request #15374 from neersighted/put_it_in_me

2016-02-10 23:50:23 -06:00

telesci

Adds in-hand sprites for tracking beacon, pizza box and carp plushie.

2015-11-29 16:43:52 +02:00

tgui

Rename get_ui_data -> ui_data, remove useless shuffle from wires

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

tooltip

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

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

uplink

lowers cost of traitor surgery bag

2016-02-13 17:24:24 -08:00

vehicles

Formalises Path Compatibility

2015-12-28 22:20:33 +00:00