deathride58 b587eb32c0 Merge pull request #5872 from Citadel-Station-13/upstream-merge-36254 ...

[MIRROR] Disables advanced shuttle navigation consoles during nuclear war ops

2018-03-09 22:10:22 +00:00

..

admin

Merge pull request #5869 from Citadel-Station-13/upstream-merge-36288

2018-03-09 18:40:09 +00:00

antagonists

Merge pull request #5872 from Citadel-Station-13/upstream-merge-36254

2018-03-09 22:10:22 +00:00

assembly

[MIRROR] Adds the Ancient Cloning Lab ruin (#5814)

2018-03-05 15:20:49 -06:00

atmospherics

fixes things and mentors.

2018-03-06 23:34:54 -06:00

awaymissions

[MIRROR] Disease antagonist (#5815)

2018-03-05 15:20:59 -06:00

cargo

modules

2018-03-06 21:45:16 -06:00

chatter

…

client

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

clothing

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

crafting

…

detectivework

…

emoji

…

error_handler

[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

2018-03-05 13:23:28 -06:00

events

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

fields

[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

2018-03-05 13:23:28 -06:00

flufftext

Adds minor roundstart traits! (ala CDDA, etc.)

2018-03-02 14:38:18 -06:00

food_and_drinks

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

games

…

goonchat

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

holiday

…

holodeck

Citadel's folder's end (#5828)

2018-03-06 17:40:48 -06:00

hydroponics

Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858

2018-03-09 18:37:29 +00:00

integrated_electronics

[READY] NTNet airlocks

2018-03-08 22:42:46 -06:00

jobs

[READY] NTNet airlocks

2018-03-08 22:42:46 -06:00

keybindings

…

language

Mushroom people, revived!

2018-03-07 21:47:42 -06:00

library

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

lighting

…

mapping

modules

2018-03-06 21:45:16 -06:00

mining

Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070

2018-03-09 18:41:05 +00:00

mob

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

modular_computers

…

ninja

[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

2018-03-05 13:23:28 -06:00

NTNet

[READY] NTNet airlocks

2018-03-08 22:42:46 -06:00

orbit

…

paperwork

Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)

2018-02-25 14:50:29 -06:00

power

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

procedural_mapping

…

projectiles

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

reagents

Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475

2018-03-09 20:36:58 +00:00

recycling

[MIRROR] Ports more operations to "tool_act" (#5718)

2018-02-27 05:04:27 -06:00

research

Pillbottles can now be made (#36083)

2018-03-09 14:24:35 -06:00

ruins

fixes bad mirror

2018-03-09 15:58:25 -05:00

security_levels

compile issues

2018-03-06 22:35:16 -06:00

server_tools

…

shuttle

Merge pull request #5872 from Citadel-Station-13/upstream-merge-36254

2018-03-09 22:10:22 +00:00

spells

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

station_goals

[MIRROR] Converts several species traits into generic traits (#5710)

2018-03-05 12:34:01 -06:00

stock_market

…

surgery

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

telesci

…

tgui

…

tooltip

…

unit_tests

Vore code to json and more (#5789)

2018-03-06 03:59:31 -06:00

uplink

[MIRROR] Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#5672)

2018-02-23 17:42:03 -06:00

vehicles

[MIRROR] Ports more operations to "tool_act" (#5718)

2018-02-27 05:04:27 -06:00

VR

…

zombie

…