kevinz000 b6231af063 Merge pull request #682 from Citadel-Station-13/upstream-merge-26731 ...

[MIRROR] Buffs mercury and lithium [Travis error unrelated to PR]

2017-05-06 14:08:51 -07:00

..

admin

woo

2017-05-05 10:21:53 -05:00

assembly

Unorphans the blackbox

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

atmospherics

[FUN REMOVAL] Makes fire not able to become ice.

2017-04-30 12:23:29 -05:00

awaymissions

Makes golems able to transfer into empty shells

2017-05-02 10:00:33 -05:00

cargo

Unorphans the blackbox

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

chatter

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

client

Delete suicide.dm.rej

2017-05-06 11:49:26 -07:00

clothing

Hopefully makes flightsuit processing less taxing on the server

2017-05-04 06:01:53 -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

April sync (#360)

2017-04-13 23:37:00 -05:00

error_handler

April sync (#360)

2017-04-13 23:37:00 -05:00

events

woo

2017-05-02 11:19:14 -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 pull request #728 from Citadel-Station-13/upstream-merge-26823

2017-05-05 09:43:17 -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

April sync (#360)

2017-04-13 23:37:00 -05:00

hydroponics

Merge pull request #708 from Citadel-Station-13/upstream-merge-26752

2017-05-05 09:39:17 -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

Refactors dbcon into a subsystem

2017-04-17 09:46:09 -05:00

lighting

Fixes some areas having no lighting

2017-04-23 11:22:17 -05:00

mapping

Fixes templates/ruins not updating area list

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

mentor

April sync (#360)

2017-04-13 23:37:00 -05:00

mining

Merge pull request #694 from Citadel-Station-13/upstream-merge-26708

2017-05-02 12:26:28 -05:00

mob

Merge branch 'master' into upstream-merge-26928

2017-05-06 14:05:16 -07: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

TG sync Sunday (#201)

2017-02-06 00:36:56 -06:00

paperwork

Replaces /image with /mutable_appearance (#556)

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

power

Tesla light

2017-05-05 10:27:18 -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 #682 from Citadel-Station-13/upstream-merge-26731

2017-05-06 14:08:51 -07: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 #705 from Citadel-Station-13/upstream-merge-26743

2017-05-02 18:47:23 -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

April sync (#360)

2017-04-13 23:37:00 -05:00

spells

Removes vestigial list from minds.

2017-05-02 12:47:20 -05:00

station_goals

rej cleanup

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

stock_market

April sync (#360)

2017-04-13 23:37:00 -05:00

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

April sync (#360)

2017-04-13 23:37:00 -05:00

tooltip

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

uplink

woo

2017-05-02 11:19:14 -05:00

vehicles

rej cleanup

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

vore

post-edited sounds (#522)

2017-04-23 02:02:11 -05:00

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