LetterJay 91c58632b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2017-05-12 10:55:10 -05:00

..

admin

Merge pull request #845 from Citadel-Station-13/upstream-merge-27056

2017-05-12 11:08:18 -04:00

assembly

…

atmospherics

Cleans up meter's Initialize (#905)

2017-05-11 18:24:00 -07:00

awaymissions

Fixes wizard academy spawner. (#892)

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

cargo

Wooden planks now sell for 50 instead of 25 cargo points (#897)

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

chatter

…

client

the ride never ends

2017-05-12 10:54:57 -05:00

clothing

t-ray mode on goggles resets lighting (#885)

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

crafting

…

detectivework

…

emoji

…

error_handler

…

events

…

flufftext

…

food_and_drinks

Merge pull request #722 from Citadel-Station-13/upstream-merge-26645

2017-05-10 21:12:08 -04:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Nettles won't pierce PIERCEIMMUNE species (#852)

2017-05-10 16:14:31 -07:00

jobs

Tweaks the curator's access and clothing to improve his treasure hunting ability (#882)

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

language

…

library

…

lighting

More /vg/lighting tweaks (#884)

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

mapping

…

mentor

…

mining

Lavaland Loot: Cursed heart upgraded to wizard version, New loot item that grants omnitongue (#890)

2017-05-10 16:04:21 -07:00

mob

Update ghost.dm

2017-05-10 17:53:27 -07:00

modular_computers

…

ninja

…

orbit

…

paperwork

…

power

Merge pull request #684 from Citadel-Station-13/upstream-merge-26728

2017-05-07 22:41:24 -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

Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#896)

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

recycling

…

research

[MIRROR] Make Lathe Design Names Capitalized Consistently (#860)

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

ruins

[MIRROR] Adamantine golem leadership (#785)

2017-05-08 22:16:09 -07:00

security_levels

…

shuttle

Elevators

2017-05-06 16:29:50 -05: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

[MIRROR] Adamantine golem leadership (#785)

2017-05-08 22:16:09 -07:00

telesci

…

tgui

…

tooltip

…

uplink

You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#891)

2017-05-10 16:04:42 -07:00

vehicles

…

vore

…

VR

…

zombie

…