Incoming5643 c620bc93e9 Cleanup pull ...

Requests heeded.
Holodeck loophole somewhat hamfistedly fixed.
Bonus: One stealth homestuck reference removed.

2016-02-26 18:42:54 -05:00

..

admin

Set bomb epicenter after chosing splosion size

2016-02-19 11:32:42 +13:00

assembly

Splits beds and chairs

2016-02-18 17:55:38 +01:00

atmospherics

Merge pull request #15497 from AnturK/scrub

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

awaymissions

Merge pull request #15418 from MMMiracles/spaceman

2016-02-18 01:30:13 -06:00

cargo

Fix crate access; fix locker item-to-lock

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

client

Merge branch 'Shadowlight213-Soundflip' into HEAD

2016-02-20 16:00:11 -03:00

clothing

Fixes internals not being turned off immediately when adjusting your mask off.

2016-02-19 17:49:38 +01: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

Merge pull request #15640 from tkdrg/kinder_egg_coding

2016-02-20 11:32:05 -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

Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.

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

holodeck

Splits beds and chairs

2016-02-18 17:55:38 +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

Bag tweaks.

2016-02-16 14:03:35 -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

Merge pull request #15589 from KorPhaeron/weather2

2016-02-20 09:31:12 -03:00

mob

Cleanup pull

2016-02-26 18:42:54 -05: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 #15588 from AnturK/isbuffingthisactuallygoodidea

2016-02-18 18:35:26 -03:00

procedural mapping

Splits beds and chairs

2016-02-18 17:55:38 +01:00

projectiles

Merge pull request #15151 from CPTANT/laserfire

2016-02-20 19:19:22 -03:00

reagents

Merge pull request #15605 from phil235/StreamSpray

2016-02-20 11:56:33 -03: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

Another map

2016-02-15 13:45:16 -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

Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.

2016-02-14 00:03:07 +01: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