LetterJay 822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 ...

[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again

2017-10-10 22:32:52 -04:00

..

admin

Adds walk and step SDQL2 wrappers (#31447)

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

assembly

Gets rid of spawns in buttons (#31468)

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

atmospherics

Cleans up atmos unary machinery code (#31356)

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

awaymissions

Remove drop_item, drop_item_v, put_in_hands_or_del

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

cargo

Improve extended examination text for many objects (#31381)

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

chatter

…

client

Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

2017-10-10 13:28:38 -05:00

clothing

Merge pull request #3270 from Citadel-Station-13/upstream-merge-31437

2017-10-10 05:54:44 -04:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Makes the santa event properly poll ghosts (#31437)

2017-10-10 03:16:23 -05:00

fields

…

flufftext

…

food_and_drinks

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -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 #3218 from Citadel-Station-13/upstream-merge-31306

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

html_interface

…

hydroponics

Merge pull request #31497 from AnturK/cyberboss-pls

2017-10-10 07:10:35 -05:00

jobs

…

language

here we go again (#2456)

2017-08-24 19:24:25 -07:00

library

Remove drop_item, drop_item_v, put_in_hands_or_del

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

lighting

…

mapping

Makes the noop turf less eyerapey

2017-10-08 13:48:53 -05:00

mentor

April sync (#360)

2017-04-13 23:37:00 -05:00

mining

Improve extended examination text for many objects (#31381)

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

mob

Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494

2017-10-10 22:32:52 -04:00

modular_computers

Improve extended examination text for many objects (#31381)

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

ninja

Improve extended examination text for many objects (#31381)

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

orbit

…

paperwork

Improve extended examination text for many objects (#31381)

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

power

Merge pull request #31497 from AnturK/cyberboss-pls

2017-10-10 07:10:35 -05:00

procedural_mapping

…

projectiles

Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

2017-10-10 13:28:38 -05:00

reagents

Adds the Chemistry Smoke Machine (#30920)

2017-10-10 13:13:38 -05:00

recycling

Improve extended examination text for many objects (#31381)

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

research

Adds the Chemistry Smoke Machine (#30920)

2017-10-10 13:13:38 -05:00

ruins

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

2017-10-01 15:22:26 -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

Makes cameras work on shuttles

2017-10-10 03:15:13 -05:00

space_transition

…

spells

Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

2017-10-10 13:28:38 -05:00

station_goals

…

stock_market

Fixes station name in cargo stock displays (#31155)

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

surgery

Fixes invalid arg runtime with drop_if_replaced (#31439)

2017-10-09 19:05:18 -05:00

telesci

…

tgui

…

tooltip

Strip propriety macros from tooltips (#31113)

2017-09-30 08:03:28 -05:00

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

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

zombie

…