Jordan Brown 4d110d9b70 Merge pull request #31661 from ninjanomnom/custom-docker ...

Fixes custom shuttle docker display

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

..

admin

Merge pull request #3387

2017-10-14 13:35:04 -07:00

assembly

Update bomb.dm (#31557)

2017-10-12 12:36:48 -05:00

atmospherics

Radiation rework and subsystem

2017-10-13 09:22:23 -05:00

awaymissions

Merge branch 'master' into upstream-merge-31601

2017-10-14 10:17:16 -04:00

cargo

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -05:00

chatter

…

client

Fixes client vv not working. (#31556)

2017-10-12 10:39:28 -05:00

clothing

Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570

2017-10-14 15:37:17 -04:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528

2017-10-12 07:19:30 -04:00

fields

Fix many instances of "the the"

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

flufftext

…

food_and_drinks

Fix many instances of "the the"

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

games

…

goonchat

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

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

holiday

Fix many instances of "the the"

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

holodeck

Merge pull request #3218 from Citadel-Station-13/upstream-merge-31306

2017-10-08 16:20:11 -04:00

html_interface

…

hydroponics

Fix many instances of "the the"

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

jobs

…

language

…

library

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

lighting

Merge pull request #3374 from Citadel-Station-13/upstream-merge-31635

2017-10-14 10:20:36 -04:00

mapping

Update ruins.dm

2017-10-13 02:58:26 -05:00

mentor

…

mining

Fix many instances of "the the"

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

mob

Merge pull request #3389

2017-10-14 13:36:22 -07:00

modular_computers

Fix many instances of "the the"

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

ninja

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -05:00

orbit

…

paperwork

Fix many instances of "the the"

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

power

Merge branch 'master' into upstream-merge-31601

2017-10-14 10:17:16 -04:00

procedural_mapping

…

projectiles

Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601

2017-10-14 15:37:00 -04:00

reagents

Merge pull request #3381 from Citadel-Station-13/upstream-merge-31693

2017-10-14 15:38:10 -04:00

recycling

Radiation rework and subsystem

2017-10-13 09:22:23 -05:00

research

Merge branch 'master' into upstream-merge-31601

2017-10-14 10:17:16 -04:00

ruins

Refactors away mission & space ruin area code.

2017-10-12 12:46:52 -05:00

security_levels

…

server_tools

Update server tools API to 3.1.0.2 (#31451)

2017-10-09 19:02:47 -05:00

shuttle

Merge pull request #31661 from ninjanomnom/custom-docker

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

space_transition

…

spells

Update rightandwrong.dm

2017-10-12 02:55:28 -05:00

station_goals

Fix many instances of "the the"

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

stock_market

…

surgery

Minor refactor of how gas IDs are handled

2017-10-12 00:30:09 -05:00

telesci

…

tgui

…

tooltip

…

uplink

Update uplink_item.dm (#31448)

2017-10-09 14:25:30 -05:00

vehicles

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

vore

…

VR

…

zombie

…