kevinz000 e3f123d5bb Merge pull request #821 from Citadel-Station-13/upstream-merge-26970 ...

[MIRROR] Fixes an inconsistency with the Banana Honk drink

2017-05-07 19:19:44 -07:00

..

admin

Merge pull request #652 from Citadel-Station-13/upstream-merge-26685

2017-05-06 22:03:08 -07:00

assembly

…

atmospherics

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

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

awaymissions

Fixes away gateway

2017-05-07 08:52:57 -05:00

cargo

Merge pull request #658 from Citadel-Station-13/upstream-merge-26670

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

chatter

…

client

Delete suicide.dm.rej

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

clothing

Fixes being able to stand on chasms

2017-05-07 18:06:44 -05:00

crafting

…

detectivework

Fixes detective scanner not being able to ranged scan, adds range/viewcheck vars

2017-05-04 17:54:47 -05:00

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

…

mentor

…

mining

ORM fixes

2017-05-06 16:20:39 -05:00

mob

Merge pull request #823 from Citadel-Station-13/upstream-merge-26959

2017-05-07 19:17:10 -07:00

modular_computers

…

ninja

…

orbit

…

paperwork

…

power

Merge pull request #798 from Citadel-Station-13/upstream-merge-26910

2017-05-06 21:42:22 -07:00

procedural_mapping

…

projectiles

Merge pull request #755 from Citadel-Station-13/upstream-merge-26809

2017-05-06 21:59:40 -07:00

reagents

Merge pull request #821 from Citadel-Station-13/upstream-merge-26970

2017-05-07 19:19:44 -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

Elevators

2017-05-06 16:29:50 -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 #736 from Citadel-Station-13/upstream-merge-26803

2017-05-06 21:24:15 -07: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

…