Ling 2e730491f0 Merge pull request #2115 from yogstation13/upstream-merge-39009 ...

[MIRROR] Key instead of ckey for user facing logs and ui

2018-08-12 14:05:03 +02:00

..

admin

Merge pull request #2115 from yogstation13/upstream-merge-39009

2018-08-12 14:05:03 +02:00

antagonists

Fixes cult pylons destroying plating and cult floors deconstructing into (#39624)

2018-08-10 20:33:49 +01:00

assembly

Key instead of ckey for user facing logs and ui (#39009)

2018-08-10 20:33:24 +01:00

atmospherics

Mapping changes to BoxStation's science (#39318)

2018-08-09 04:28:29 +01:00

awaymissions

Merge pull request #2126 from yogstation13/upstream-merge-39615

2018-08-11 15:12:42 +02:00

bsql

…

cargo

Adds mining and engineering cargo bounties (#39568)

2018-08-09 05:12:32 +01:00

chatter

…

client

Merge pull request #2115 from yogstation13/upstream-merge-39009

2018-08-12 14:05:03 +02:00

clothing

Removes an unneccessary subtype (#39604)

2018-08-08 19:03:28 +01:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #39481 from AutomaticFrenzy/patch/syntax

2018-08-04 22:49:35 +02:00

fields

…

flufftext

…

food_and_drinks

…

games

…

goonchat

henk

2018-08-10 09:47:54 +01:00

holiday

Add holidays, fix beer day date (#39572)

2018-08-10 20:34:15 +01:00

holodeck

…

hydroponics

…

integrated_electronics

Merge pull request #1937 from yogstation13/upstream-merge-39376

2018-08-04 11:11:12 -06:00

jobs

Merge pull request #2114 from yogstation13/upstream-merge-39181

2018-08-12 10:50:10 +02:00

keybindings

…

language

…

library

Key instead of ckey for user facing logs and ui (#39009)

2018-08-10 20:33:24 +01:00

lighting

…

mapping

Fix conflicts

2018-08-11 10:23:14 +02:00

mining

Removes the shuttle timid var (#39445)

2018-08-02 05:19:08 +01:00

mob

Merge pull request #2115 from yogstation13/upstream-merge-39009

2018-08-12 14:05:03 +02:00

modular_computers

…

ninja

…

NTNet

…

orbit

…

paperwork

Fixes AI photo taking and printing (#39623)

2018-08-10 20:33:41 +01:00

photography

Fixes AI photo taking and printing (#39623)

2018-08-10 20:33:41 +01:00

power

Merge pull request #2104 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/supermatter-pull-request-closed

2018-08-10 23:28:11 +02:00

procedural_mapping

Refactor the map loader (#39567)

2018-08-10 20:34:31 +01:00

projectiles

Merge pull request #2115 from yogstation13/upstream-merge-39009

2018-08-12 14:05:03 +02:00

reagents

Key instead of ckey for user facing logs and ui (#39009)

2018-08-10 20:33:24 +01:00

recycling

…

research

Adds mini-extinguishers to autolathe (#39599)

2018-08-08 19:03:36 +01:00

ruins

Fixes var set lists on maps (#39615)

2018-08-10 20:35:11 +01:00

security_levels

…

shuttle

Fixes var set lists on maps (#39615)

2018-08-10 20:35:11 +01:00

spells

…

station_goals

…

surgery

Merge pull request #2096 from yogstation13/upstream-merge-39513

2018-08-08 23:11:07 +02:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

Moves the Stealth Implant from Cybernetic Implants to Normal Implants (#39564)

2018-08-08 08:17:45 +01:00

vehicles

Fix errors

2018-08-11 10:32:34 +02:00

vending

Fixes var set lists on maps (#39615)

2018-08-10 20:35:11 +01:00

VR

…

zombie

Simple zombie for WJ (#39563)

2018-08-10 20:34:23 +01:00