Jordan Brown 9a1dfefb97 Merge pull request #37810 from 81Denton/techweb-electronics ...

Adds basic electronics to techwebs

2018-05-14 15:17:00 -05:00

..

admin

Fixes possession funtime (#37737)

2018-05-12 19:26:55 -05:00

antagonists

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

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

assembly

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

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

atmospherics

Merge branch 'master' into upstream-merge-37406

2018-05-13 03:28:37 -05:00

awaymissions

…

cargo

Bring gender equality to Corgi crates (#37748)

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

chatter

…

client

Merge branch 'master' into upstream-merge-37406

2018-05-13 03:28:37 -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

…

fields

…

flufftext

…

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 #6714 from Citadel-Station-13/upstream-merge-37760

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

integrated_electronics

Integrated Circuits: String parsing update (#37571)

2018-05-09 00:44:59 -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 #6714 from Citadel-Station-13/upstream-merge-37760

2018-05-14 12:28:41 -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

Fixed stacks sometimes having the wrong amount if created on another stack

2018-05-11 17:30:32 -05:00

procedural_mapping

…

projectiles

Fixes defibs/watertanks/gatling lasers (#37792)

2018-05-13 06:13:45 -05:00

reagents

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

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

recycling

…

research

Merge pull request #37810 from 81Denton/techweb-electronics

2018-05-14 15:17:00 -05:00

ruins

…

security_levels

…

server_tools

…

shuttle

…

spells

…

station_goals

…

stock_market

Removes stock market

2018-05-02 17:48:55 -05:00

surgery

Plasmamen organs GET sprites! (#37595)

2018-05-02 21:21:11 -05:00

tgui

…

tooltip

Merge pull request #37641 from AutomaticFrenzy/patch/tooltip-jquery

2018-05-05 08:10:54 -05:00

unit_tests

…

uplink

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

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

vehicles

…

vending

Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589

2018-05-13 11:52:12 -05:00

VR

…

zombie

…