Jordan Brown f91dc76e1a Merge pull request #31310 from ShizCalev/lobby-timer-fix ...

Fixes lobby timer showing as delayed when it's just waiting for more players

2017-10-05 09:21:43 -05:00

..

admin

Merge pull request #31296 from ShizCalev/landmark-cleanup

2017-10-05 03:05:40 -05:00

assembly

…

atmospherics

Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA

2017-10-03 18:14:10 -05:00

awaymissions

Merge pull request #31302 from ninjanomnom/shuttle-rotation

2017-10-05 03:05:32 -05:00

cargo

…

chatter

…

client

Update preferences_savefile.dm

2017-10-05 05:18:04 -05:00

clothing

Merge pull request #31269 from Firecage/doublehardsuitrebalance

2017-10-05 03:02:11 -05:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Fixes/tweaks wormholes event and portals (#30846)

2017-10-03 04:37:35 -05:00

fields

…

flufftext

…

food_and_drinks

Merge pull request #31284 from tgstation/Cyberboss-patch-1

2017-10-04 19:27:47 -05:00

games

…

goonchat

Moved admin music volume slider to its own menu (#31277)

2017-10-05 02:59:52 -05:00

holiday

…

holodeck

Merge pull request #31286 from KorPhaeron/ismachinery

2017-10-04 19:26:38 -05:00

html_interface

…

hydroponics

Update growninedible.dm

2017-10-01 22:38:55 -05:00

jobs

…

language

…

library

Merge pull request #31275 from kingofkosmos/moredeconhints

2017-10-04 16:33:51 -05:00

lighting

…

mapping

…

mentor

…

mining

Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302

2017-10-05 09:13:41 -04:00

mob

Merge pull request #31310 from ShizCalev/lobby-timer-fix

2017-10-05 09:21:43 -05:00

modular_computers

Merge pull request #31286 from KorPhaeron/ismachinery

2017-10-04 19:26:38 -05:00

ninja

Merge branch 'master' into upstream-merge-31289

2017-10-05 06:15:44 -04:00

orbit

…

paperwork

…

power

Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302

2017-10-05 09:13:41 -04:00

procedural_mapping

…

projectiles

Merge pull request #3132 from Citadel-Station-13/upstream-merge-31264

2017-10-04 18:44:38 -04:00

reagents

Merge pull request #3135 from Citadel-Station-13/upstream-merge-31281

2017-10-05 08:31:23 -04:00

recycling

Merge pull request #31302 from ninjanomnom/shuttle-rotation

2017-10-05 03:05:32 -05:00

research

Shock Collars Are Now A Thing.

2017-10-03 08:03:03 -07:00

ruins

Ashwalker tendrils now drop everything on victims before consuming (#31177)

2017-10-01 15:22:26 -05:00

security_levels

…

server_tools

Merge pull request #31237 from Cyberboss/STAPIUpdate

2017-10-03 18:47:51 -05:00

shuttle

Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302

2017-10-05 09:13:41 -04:00

space_transition

…

spells

Nightmare organs

2017-10-03 18:22:01 -05:00

station_goals

…

stock_market

Fixes station name in cargo stock displays (#31155)

2017-10-01 09:26:37 -05:00

surgery

Merge pull request #31238 from AnturK/specialeyes

2017-10-04 15:14:07 -05:00

telesci

…

tgui

…

tooltip

…

uplink

Brings 10mm Soporific Description in-line with its nerfed stats

2017-10-03 17:24:36 +08:00

vehicles

…

vore

…

VR

…

zombie

…