kevinz000 cc8d113c0f Merge branch 'master' into upstream-merge-26928

2017-05-06 14:05:16 -07:00

..

admin

woo

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

assembly

…

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

…

chatter

…

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

…

detectivework

…

emoji

…

error_handler

…

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

…

holiday

…

holodeck

rej cleanup

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

html_interface

…

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

…

lighting

…

mapping

Fixes templates/ruins not updating area list

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

mentor

…

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

…

ninja

…

orbit

…

paperwork

…

power

Tesla light

2017-05-05 10:27:18 -05:00

procedural_mapping

…

projectiles

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

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

reagents

Replaces stun/weaken from Miner's salve

2017-05-06 10:48:07 -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 #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

…

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

…

surgery

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

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

telesci

…

tgui

…

tooltip

…

uplink

woo

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

vehicles

rej cleanup

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

vore

…

VR

…

zombie

…