LetterJay 52fa1f314f Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04: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

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04: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

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

Unorphans the blackbox

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

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

Persistent investigate and game logs separated by round ID

2017-05-02 18:47:58 -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 branch 'master' into upstream-merge-26140

2017-05-13 01:28:34 -04:00

games

…

holiday

…

holodeck

rej cleanup

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

html_interface

…

hydroponics

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04: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

Language icons

2017-04-28 09:59:07 -05:00

library

Curator Update

2017-05-03 22:22:12 -05:00

lighting

More /vg/lighting tweaks (#884)

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

mapping

Fixes templates/ruins not updating area list

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

mentor

…

mining

Merge branch 'master' into upstream-merge-26760

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

mob

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

2017-05-13 01:24:55 -04: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

…

orbit

…

paperwork

…

power

Merge branch 'master' into upstream-merge-26760

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

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-26760

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

reagents

Merge branch 'master' into upstream-merge-26760

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

recycling

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

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

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

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

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

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

rej cleanup

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

stock_market

…

surgery

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

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

telesci

New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00

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

rej cleanup

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

vore

…

VR

Changes /obj/machinery to have atom/movable occupants

2017-05-01 15:58:52 -05:00

zombie

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

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