Nerd Lord d6b7ed4c06 Merge pull request #15277 from KorPhaeron/lusty_xeno ...

Adds a missing \ to xenomaid attack message

2016-02-08 17:27:06 -05: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 pull request #15245 from neersighted/portamos

2016-02-07 17:50:10 -06:00

awaymissions

New CTF gear

2016-02-06 19:38:47 -06:00

cargo

Address feedback

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

client

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

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

clothing

Merge pull request #15238 from KorPhaeron/instagib

2016-02-07 21:17:33 -03: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

Rewrite supply packs/cargo orders

2016-02-07 04:45:55 -06: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 pull request #15253 from bgobandit/cravenoaf

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

games

…

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

…

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 pull request #15277 from KorPhaeron/lusty_xeno

2016-02-08 17:27:06 -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

Rewrite supply packs/cargo orders

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

procedural mapping

Get the code running on 510

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

projectiles

Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want

2016-02-08 08:50:44 -06: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 remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want

2016-02-08 08:50:44 -06: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 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

…

uplink

Merge pull request #15216 from KorPhaeron/fixes_bulldogs

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

vehicles

…