LetterJay eac5206e51 Merge pull request #6990 from Citadel-Station-13/upstream-merge-38077 ...

[MIRROR] Antag reputation rewards are now configurable

2018-06-05 12:10:07 -05:00

..

admin

Adds a Supplypod-delivery admin smite (#38069)

2018-06-04 00:37:24 -05:00

antagonists

Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220

2018-06-03 16:19:36 -05:00

assembly

Fixes pocket items being deleted when monkeyizing (#38220)

2018-06-03 09:04:08 -05:00

atmospherics

Fixes tritium and plasma fires storing cached_results incorrectly (#38230)

2018-06-03 09:03:33 -05: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

Fixes datediff not returning (#38215)

2018-06-03 09:04:16 -05:00

clothing

Fixes pocket items being deleted when monkeyizing (#38220)

2018-06-03 09:04:08 -05: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

Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device. (#38246)

2018-06-03 12:59:27 -05:00

jobs

Antag reputation rewards are now configurable

2018-06-03 09:03:51 -05: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

Delay smoothing atoms that have not initialized yet (#38173)

2018-06-03 14:25:35 -05:00

mining

Hard upstream sync (#6951)

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

mob

Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220

2018-06-03 16:19:36 -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

Removes drone overlays and the associated code (#38175)

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

spells

Fix mecha mouse pointer issues (#38213)

2018-06-03 09:03:06 -05:00

station_goals

…

surgery

Hard upstream sync (#6951)

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

tgs

…

tgui

…

tooltip

…

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

…