LetterJay 55720bd218 Merge pull request #6978 from Citadel-Station-13/upstream-merge-38170 ...

[MIRROR] Fixed the clockwork helmet not dropping to the ground when used by a non-clock cultist like the other clock armor pieces do.

2018-06-02 07:32:31 -05:00

..

admin

Merge pull request #6970 from Citadel-Station-13/upstream-merge-38172

2018-06-02 07:28:31 -05:00

antagonists

Merge pull request #6978 from Citadel-Station-13/upstream-merge-38170

2018-06-02 07:32:31 -05:00

assembly

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

atmospherics

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

awaymissions

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

cargo

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

chatter

…

client

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

clothing

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

fields

…

flufftext

…

food_and_drinks

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

games

…

goonchat

Merge pull request #37934 from AutomaticFrenzy/patch/ssping

2018-05-21 16:40:29 -05:00

holiday

…

holodeck

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

hydroponics

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

integrated_electronics

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

jobs

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

keybindings

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00

language

Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

library

Fix infinite soapstone uses exploit (#38195)

2018-06-01 08:13:54 -05:00

lighting

AI Multicamera mode (#37695)

2018-05-31 22:41:48 -05:00

mapping

…

mining

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

mob

Merge pull request #6977 from Citadel-Station-13/upstream-merge-38091

2018-06-02 07:32:11 -05:00

modular_computers

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

ninja

Merge branch 'master' into upstream-merge-37486

2018-05-21 11:59:57 -05:00

NTNet

…

orbit

…

paperwork

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

power

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

procedural_mapping

…

projectiles

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

reagents

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

recycling

…

research

Stock parts sorter now use get_parts_rating (#38191)

2018-06-01 04:15:02 -05:00

ruins

…

security_levels

…

shuttle

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

spells

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

station_goals

…

surgery

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

tgs

…

tgui

…

tooltip

Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2

2018-05-14 16:51:20 -05:00

unit_tests

…

uplink

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

vehicles

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

vending

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

VR

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

zombie

…