tkdrg ed014be6f2 Merge pull request #15183 from Incoming5643/everybodys_heard_about_the_bird ...

Edict from the bird: "I've run out of jokes"

2016-02-06 22:49:06 -03:00

..

admin

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

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

assembly

Merge conflict fix

2016-01-27 17:38:42 +02:00

atmospherics

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

2016-02-06 20:38:16 +01:00

awaymissions

Get the code running on 510

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

cargo

Fix shuttles not correctly buying/selling

2016-02-06 02:01:38 -06:00

client

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

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

clothing

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

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

crafting

Some assembly requaired

2016-01-26 02:43:08 +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 #15183 from Incoming5643/everybodys_heard_about_the_bird

2016-02-06 22:49:06 -03:00

flufftext

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

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

food&drinks

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

2016-02-04 14:34:45 +01: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

Fix bad checks in holodeck

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

html_interface

Fixed 'in' precedence errors.

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

hydroponics

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

2016-02-04 14:34:45 +01:00

jobs

Merge pull request #15191 from KorPhaeron/chaplain

2016-02-05 14:54:15 -03: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

…

mining

Merge Conflict Fix

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

mob

Merge pull request #15183 from Incoming5643/everybodys_heard_about_the_bird

2016-02-06 22:49:06 -03:00

ninja

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

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

paperwork

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

2016-02-04 14:34:45 +01:00

power

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

2016-02-06 15:42:13 +01: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 VisionUpdateRefactor

2016-02-06 20:38:16 +01:00

reagents

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

2016-02-06 20:38:16 +01:00

recycling

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

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

research

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

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

ruins

…

security levels

Rename get_ui_data -> ui_data, remove useless shuffle from wires

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

shuttle

Fix shuttles not correctly buying/selling

2016-02-06 02:01:38 -06:00

space transition

…

spells

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

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

surgery

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

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

telesci

…

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

Merge pull request #15216 from KorPhaeron/fixes_bulldogs

2016-02-06 14:19:35 -03:00

vehicles

…