LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

2017-12-26 08:24:20 -06:00

..

admin

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

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

assembly

…

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

…

chatter

…

client

Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485

2017-12-26 07:38:17 -06:00

clothing

Merge pull request #4447 from Citadel-Station-13/upstream-merge-33639

2017-12-26 07:38:06 -06:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Update disease_outbreak.dm

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

fields

…

flufftext

…

food_and_drinks

Merge branch 'master' into upstream-merge-33590

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

games

…

goonchat

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

2017-12-26 08:24:20 -06:00

holiday

[MIRROR] Christmas (#4491)

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

holodeck

…

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

…

keybindings

…

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

…

mapping

…

mentor

…

mining

Merge branch 'master' into upstream-merge-33055

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

mob

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

2017-12-26 08:24:20 -06:00

modular_computers

…

ninja

Merge branch 'master' into upstream-merge-33246

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

NTNet

…

orbit

…

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

…

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-33590

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

recycling

…

research

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

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

ruins

…

security_levels

…

server_tools

…

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

…

stock_market

…

surgery

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

2017-12-26 08:24:20 -06:00

telesci

…

tgui

…

tooltip

…

uplink

…

vehicles

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

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

vore

…

VR

…

zombie

…