LetterJay 41bae055ba Merge pull request #4524 from Citadel-Station-13/upstream-merge-33816 ...

[MIRROR] gives medical some medical boards, but not their own circuit imprinter yet

2017-12-25 21:30:31 -06:00

..

admin

Merge pull request #4493 from Citadel-Station-13/upstream-merge-33714

2017-12-24 23:05:36 +00:00

assembly

Update mousetrap.dm

2017-12-18 17:24:42 -06:00

atmospherics

Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636

2017-12-21 03:44:57 +00:00

awaymissions

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

cargo

Defines math, take 2

2017-12-17 10:02:43 -06:00

chatter

…

client

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

clothing

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

crafting

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

detectivework

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

emoji

…

error_handler

…

events

Update disease_outbreak.dm

2017-12-25 05:23:37 -06:00

fields

…

flufftext

[Ready]Brain Trauma additions

2017-12-17 11:11:10 -06:00

food_and_drinks

Gibber rebalance (#33737)

2017-12-22 18:03:38 -06:00

games

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

goonchat

Merge pull request #33709 from uraniummeltdown/linespacing

2017-12-21 14:25:21 -06:00

holiday

[MIRROR] Christmas (#4491)

2017-12-22 13:14:25 -08:00

holodeck

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

html_interface

…

hydroponics

[READY]Circuitry upgrades

2017-12-24 15:03:45 -06:00

integrated_electronics

Update reagents.dm

2017-12-24 18:02:13 -05:00

jobs

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

keybindings

Non movement keys pressed while moving no longer stop movement

2017-12-18 15:31:35 -06:00

language

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00:00

library

adds world.realtime to soapstone

2017-12-24 15:03:22 -06:00

lighting

Defines math, take 2

2017-12-17 10:02:43 -06:00

mapping

Defines math, take 2

2017-12-17 10:02:43 -06:00

mentor

…

mining

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

mob

Merge pull request #4441 from Citadel-Station-13/upstream-merge-33661

2017-12-25 07:28:52 -06:00

modular_computers

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

ninja

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

NTNet

…

orbit

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

paperwork

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

power

Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246

2017-12-21 03:22:31 -06:00

procedural_mapping

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

projectiles

Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433

2017-12-25 21:26:17 -06:00

reagents

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

recycling

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

research

gives medical some medical boards, but not their own circuit imprinter yet (#33816)

2017-12-25 16:42:18 -06:00

ruins

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

security_levels

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

server_tools

Update st_interface.dm

2017-12-18 15:24:23 -06:00

shuttle

Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731)

2017-12-22 10:35:47 -06:00

space_transition

Merge pull request #32433 from kevinz000/vector_projectiles

2017-12-21 19:33:42 -06:00

spells

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

station_goals

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

stock_market

…

surgery

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

telesci

…

tgui

…

tooltip

…

uplink

Codespeak manual rebalance/recost (#33638)

2017-12-18 21:22:29 -06:00

vehicles

Merge pull request #33306 from coiax/replace-clean-flag-with-component

2017-12-23 08:36:37 -06:00

vore

…

VR

…

zombie

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00