LetterJay 3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 ...

[MIRROR] Unorphans the blackbox

2017-05-02 05:13:49 -05:00

..

admin

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

assembly

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

atmospherics

Changes some << to to_chat

2017-04-28 06:14:47 -05:00

awaymissions

…

cargo

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

chatter

…

client

Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00

clothing

Merge pull request #678 from Citadel-Station-13/upstream-merge-26663

2017-05-01 08:10:23 -05:00

crafting

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

detectivework

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

emoji

…

error_handler

…

events

manual merge

2017-04-29 11:42:28 -05:00

flufftext

Adds death checks to two hallucinations, preventing the dead from spasming

2017-04-28 21:04:00 -05:00

food_and_drinks

Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00

games

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

holiday

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

holodeck

rej cleanup

2017-05-02 04:56:46 -05:00

html_interface

…

hydroponics

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

jobs

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

language

Language icons

2017-04-28 09:59:07 -05:00

library

…

lighting

…

mapping

Fixes templates/ruins not updating area list

2017-04-27 17:02:33 -05:00

mentor

…

mining

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

mob

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

modular_computers

Changes ID card program to only require head of staff access to download

2017-04-27 06:36:48 -05:00

ninja

Removes a few spawns

2017-04-25 14:36:18 -05:00

orbit

…

paperwork

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

power

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

procedural_mapping

Removes a few spawns

2017-04-25 14:36:18 -05:00

projectiles

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

reagents

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

recycling

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

research

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

ruins

Merge branch 'master' into upstream-merge-26386

2017-05-01 15:27:25 -05:00

security_levels

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

shuttle

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

space_transition

…

spells

Merge branch 'master' into upstream-merge-26386

2017-05-01 15:27:25 -05:00

station_goals

rej cleanup

2017-05-02 04:56:46 -05:00

stock_market

…

surgery

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

telesci

New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00

tgui

…

tooltip

…

uplink

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

vehicles

rej cleanup

2017-05-02 04:56:46 -05:00

vore

…

VR

New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00

zombie

New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00