LetterJay 0714d25f57 Merge pull request #6801 from Citadel-Station-13/upstream-merge-37881 ...

[MIRROR] Fixes mindswap book runtime

2018-05-19 09:15:16 -05:00

..

admin

Fixes mulligan for mutants (#37895)

2018-05-18 19:52:19 -05:00

antagonists

Merge pull request #6800 from Citadel-Station-13/upstream-merge-37892

2018-05-19 09:15:03 -05:00

assembly

Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558

2018-05-12 21:36:51 -05:00

atmospherics

[Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping

2018-05-16 12:18:36 -05:00

awaymissions

…

cargo

Bring gender equality to Corgi crates (#37748)

2018-05-10 19:57:20 -05:00

chatter

…

client

Capitalized Current Quirks (#37877)

2018-05-17 20:54:23 -05:00

clothing

Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525

2018-05-13 20:38:49 -05:00

crafting

…

detectivework

…

emoji

Use spritesheets to reduce time spent sending PNG assets by 90+%

2018-05-09 22:44:57 -05:00

error_handler

…

events

Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423

2018-05-17 18:12:57 +00:00

fields

…

flufftext

[s] Hallucinations 4.0

2018-05-09 16:15:58 -05:00

food_and_drinks

Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760

2018-05-14 12:28:41 -05:00

games

…

goonchat

Use spritesheets to reduce time spent sending PNG assets by 90+%

2018-05-09 22:44:57 -05:00

holiday

drone masks for holidays

2018-05-09 13:42:54 -05:00

holodeck

…

hydroponics

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05:00

integrated_electronics

Circuit gun inhands and grabber fix (#37836)

2018-05-17 10:27:25 -05:00

jobs

Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396

2018-05-11 03:45:11 +00:00

keybindings

…

language

Use spritesheets to reduce time spent sending PNG assets by 90+%

2018-05-09 22:44:57 -05:00

library

…

lighting

…

mapping

…

mining

Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760

2018-05-14 12:28:41 -05:00

mob

Merge pull request #6795 from Citadel-Station-13/upstream-merge-37911

2018-05-19 09:13:46 -05:00

modular_computers

…

ninja

…

NTNet

…

orbit

…

paperwork

Use spritesheets to reduce time spent sending PNG assets by 90+%

2018-05-09 22:44:57 -05:00

power

[Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping

2018-05-16 12:18:36 -05:00

procedural_mapping

…

projectiles

Fixes oversight with foam (#37898)

2018-05-18 08:29:48 -05:00

reagents

Merge pull request #6799 from Citadel-Station-13/upstream-merge-37894

2018-05-19 09:14:46 -05:00

recycling

…

research

Fixes experimentor pickweight and goo runtime (#37822)

2018-05-19 04:48:27 -05:00

ruins

…

security_levels

…

shuttle

…

spells

Fixes mindswap book runtime (#37881)

2018-05-19 05:32:45 -05:00

station_goals

…

stock_market

…

surgery

Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423

2018-05-17 18:12:57 +00:00

tgs

Update DMAPI to version 3.2.1.0

2018-05-08 21:33:58 -05:00

tgui

…

tooltip

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

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

unit_tests

…

uplink

fixes some inconsistency in the bulldog shotgun ammo (#37548)

2018-05-09 16:24:17 -05:00

vehicles

…

vending

Fixes wrong circuits (#37853)

2018-05-16 12:04:54 -05:00

VR

…

zombie

…