LetterJay 7b41f8cd55 merge

2017-05-16 16:22:57 -05:00

..

admin

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

assembly

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

atmospherics

cryo pod icon fix

2017-05-16 15:27:30 -05:00

awaymissions

Fixes wizard academy spawner. (#892)

2017-05-10 16:03:03 -07:00

cargo

Fixes engraved messages

2017-05-14 14:50:49 -05:00

chatter

…

client

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

clothing

Merge pull request #898 from LetterJay/master

2017-05-12 16:24:17 -04: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

Goats eat glowshrooms

2017-05-14 07:38:00 -05:00

flufftext

…

food_and_drinks

Merge pull request #938 from Citadel-Station-13/upstream-merge-27169

2017-05-14 16:30:35 -04:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

[MIRROR] Enable Ambrosia Gaia, attempt balance (#962)

2017-05-14 20:34:15 -07:00

jobs

[MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935)

2017-05-14 20:18:02 -07:00

language

…

library

Fixes engraved messages

2017-05-14 14:50:49 -05:00

lighting

More /vg/lighting tweaks (#884)

2017-05-10 16:11:22 -07:00

mapping

Fixes some things not using log_world

2017-05-09 09:44:18 -05:00

mentor

…

mining

Merge pull request #954 from Citadel-Station-13/upstream-merge-27199

2017-05-14 16:27:25 -04:00

mob

Merge pull request #807 from Citadel-Station-13/upstream-merge-26631

2017-05-16 17:13:30 -04:00

modular_computers

…

ninja

…

orbit

…

paperwork

Merge pull request #945 from Citadel-Station-13/upstream-merge-27180

2017-05-14 16:29:01 -04:00

power

SMES units now accept charge even if the available input is less than the input rate. (#969)

2017-05-14 20:07:20 -07:00

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

reagents

Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973)

2017-05-14 20:12:00 -07:00

recycling

…

research

Merge pull request #854 from Citadel-Station-13/upstream-merge-27036

2017-05-14 16:39:28 -04:00

ruins

Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973)

2017-05-14 20:12:00 -07:00

security_levels

…

shuttle

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

space_transition

…

spells

woops I used the wrong operator there (#893)

2017-05-10 16:03:33 -07:00

station_goals

…

stock_market

…

surgery

merge

2017-05-16 16:22:57 -05:00

telesci

…

tgui

…

tooltip

…

uplink

adds the holoparasite box, and adds it to traitor uplinks (#913)

2017-05-14 20:36:22 -07:00

vehicles

…

vore

…

VR

…

zombie

Merge pull request #640 from Citadel-Station-13/upstream-merge-26527

2017-05-13 01:24:55 -04:00